summaryrefslogtreecommitdiffstats
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:00:44 +0000
commit25c9fa6026e6a200a291bc4fd3464718aae9775e (patch)
treeb2aeb221d5ffa03ed8a5ecbbbbc72b659350a8c1
parentd2dc33d57c82b85ff0a33114d04f9ecde3d897bf (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)
-rw-r--r--ssl/ssl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 1c12ddd71f..dece04de01 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -560,6 +560,9 @@ 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