]> granicus.if.org Git - openssl/commitdiff
Restore SSL_OP_MSIE_SSLV2_RSA_PADDING
authorDr. Stephen Henson <steve@openssl.org>
Sat, 4 Jan 2014 13:50:52 +0000 (13:50 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 16 Feb 2014 11:43:46 +0000 (11:43 +0000)
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)

ssl/ssl.h

index 7d40f562b798060131ab92866da81735548ec090..2c3a9a34b70409146f5e0f6ae6a1038e3d71fe8a 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -669,6 +669,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