diff options
author | doug <> | 2015-07-18 19:41:54 +0000 |
---|---|---|
committer | doug <> | 2015-07-18 19:41:54 +0000 |
commit | 7f2d6dc6af99690299b2a423c25d0d7240957c6f (patch) | |
tree | 36796e4558d127f54a2ea8088a9f89274f442edc /src/lib/libssl/ssl.h | |
parent | cdc6d7e16d216fefca241ecf91490a6ca83d80b8 (diff) | |
download | openbsd-7f2d6dc6af99690299b2a423c25d0d7240957c6f.tar.gz openbsd-7f2d6dc6af99690299b2a423c25d0d7240957c6f.tar.bz2 openbsd-7f2d6dc6af99690299b2a423c25d0d7240957c6f.zip |
Remove SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER workaround.
This was a hack to work around problems on IE 6 with SSLv3.
ok miod@ bcook@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 7d3e3c8171..0a0a711a20 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.90 2015/07/18 01:42:26 doug Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.91 2015/07/18 19:41:54 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -519,7 +519,6 @@ struct ssl_session_st { | |||
519 | /* Allow initial connection to servers that don't support RI */ | 519 | /* Allow initial connection to servers that don't support RI */ |
520 | #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L | 520 | #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L |
521 | #define SSL_OP_TLSEXT_PADDING 0x00000010L | 521 | #define SSL_OP_TLSEXT_PADDING 0x00000010L |
522 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L | ||
523 | 522 | ||
524 | /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added | 523 | /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added |
525 | * in OpenSSL 0.9.6d. Usually (depending on the application protocol) | 524 | * in OpenSSL 0.9.6d. Usually (depending on the application protocol) |
@@ -572,7 +571,6 @@ struct ssl_session_st { | |||
572 | #define SSL_OP_ALL \ | 571 | #define SSL_OP_ALL \ |
573 | (SSL_OP_LEGACY_SERVER_CONNECT | \ | 572 | (SSL_OP_LEGACY_SERVER_CONNECT | \ |
574 | SSL_OP_TLSEXT_PADDING | \ | 573 | SSL_OP_TLSEXT_PADDING | \ |
575 | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | \ | ||
576 | SSL_OP_CRYPTOPRO_TLSEXT_BUG) | 574 | SSL_OP_CRYPTOPRO_TLSEXT_BUG) |
577 | 575 | ||
578 | /* Obsolete flags kept for compatibility. No sane code should use them. */ | 576 | /* Obsolete flags kept for compatibility. No sane code should use them. */ |
@@ -591,6 +589,7 @@ struct ssl_session_st { | |||
591 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 | 589 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 |
592 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 | 590 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 |
593 | #define SSL_OP_TLS_D5_BUG 0x0 | 591 | #define SSL_OP_TLS_D5_BUG 0x0 |
592 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | ||
594 | 593 | ||
595 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success | 594 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success |
596 | * when just a single record has been written): */ | 595 | * when just a single record has been written): */ |