summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authordoug <>2015-07-18 01:42:26 +0000
committerdoug <>2015-07-18 01:42:26 +0000
commitdd1a8feef3ef54128aab53a720a711d669b98c21 (patch)
tree1a2eafb2edfce20682d1b9504fb22e3bee4c0ab0 /src/lib/libssl/ssl.h
parentba11ff67815e3454d26b4f7a06aea5dd1293acf2 (diff)
downloadopenbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.tar.gz
openbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.tar.bz2
openbsd-dd1a8feef3ef54128aab53a720a711d669b98c21.zip
Remove support for the SSL_OP_TLS_D5_BUG compat hack from SSLeay.
This is a 17 year old workaround from SSLeay 0.9.0b. It was for clients that send RSA client key exchange in TLS using SSLv3 format (no length prefix). ok jsing@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 33aaadcd20..7d3e3c8171 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.89 2015/07/17 15:50:37 doug Exp $ */ 1/* $OpenBSD: ssl.h,v 1.90 2015/07/18 01:42:26 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 *
@@ -520,7 +520,6 @@ struct ssl_session_st {
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 522#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
523#define SSL_OP_TLS_D5_BUG 0x00000100L
524 523
525/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added 524/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
526 * in OpenSSL 0.9.6d. Usually (depending on the application protocol) 525 * in OpenSSL 0.9.6d. Usually (depending on the application protocol)
@@ -574,7 +573,6 @@ struct ssl_session_st {
574 (SSL_OP_LEGACY_SERVER_CONNECT | \ 573 (SSL_OP_LEGACY_SERVER_CONNECT | \
575 SSL_OP_TLSEXT_PADDING | \ 574 SSL_OP_TLSEXT_PADDING | \
576 SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | \ 575 SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | \
577 SSL_OP_TLS_D5_BUG | \
578 SSL_OP_CRYPTOPRO_TLSEXT_BUG) 576 SSL_OP_CRYPTOPRO_TLSEXT_BUG)
579 577
580/* Obsolete flags kept for compatibility. No sane code should use them. */ 578/* Obsolete flags kept for compatibility. No sane code should use them. */
@@ -592,6 +590,7 @@ struct ssl_session_st {
592#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x0 590#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x0
593#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 591#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0
594#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 592#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0
593#define SSL_OP_TLS_D5_BUG 0x0
595 594
596/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success 595/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
597 * when just a single record has been written): */ 596 * when just a single record has been written): */