summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-04-25 23:08:44 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-04-25 23:08:44 +0000
commit502dfeb8de3e578295848969b4fe5118ad8f6a16 (patch)
treecbd641d1c559aeeea9c6d19b309e933710f0c8f1 /ssl
parent5bbed29518243edc4b62b452151b9756f057f168 (diff)
Change value of SSL_OP_NO_TLSv1_1 to avoid clash with SSL_OP_ALL and
OpenSSL 1.0.0. Add CHANGES entry noting the consequences.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index ab724734ed..8b0c2a2dac 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -556,7 +556,6 @@ struct ssl_session_st
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
#define SSL_OP_TLS_D5_BUG 0x00000100L
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
-#define SSL_OP_NO_TLSv1_1 0x00000400L
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
@@ -604,6 +603,7 @@ struct ssl_session_st
#define SSL_OP_NO_SSLv3 0x02000000L
#define SSL_OP_NO_TLSv1 0x04000000L
#define SSL_OP_NO_TLSv1_2 0x08000000L
+#define SSL_OP_NO_TLSv1_1 0x10000000L
/* These next two were never actually used for anything since SSLeay
* zap so we have some more flags.