summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-01-04 13:50:52 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-01-04 14:01:25 +0000
commit0da40f0ffc9804f620e86c27eccbf19ac4047cf8 (patch)
tree6bfcdf091988e349b1648b2cef1590777b2347b1 /ssl/ssl.h
parent7f722c95f8745757ea811af5de1d34a71036ef0f (diff)
Restore SSL_OP_MSIE_SSLV2_RSA_PADDING
The flag SSL_OP_MSIE_SSLV2_RSA_PADDING hasn't done anything since OpenSSL 0.9.7h but deleting it will break source compatibility with any software that references it. Restore it but #define to zero. (cherry picked from commit b17d6b8d1d49fa4732deff17cfd1833616af0d9c)
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 2e6ddc728c..eebc99ef49 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -495,6 +495,9 @@ typedef struct ssl_session_st
#define SSL_OP_TLS_D5_BUG 0x00000100L
#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
+/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
+#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
+
/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
* in OpenSSL 0.9.6d. Usually (depending on the application protocol)
* the workaround is not needed. Unfortunately some broken SSL/TLS