From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 4 Jan 2014 13:50:52 +0000 (+0000)
Subject: Restore SSL_OP_MSIE_SSLV2_RSA_PADDING
X-Git-Tag: master-pre-reformat~898
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c6c139a07353b9fc4b27feb33a089cca346ce75;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 7d40f562b79..2c3a9a34b70 100644
--- 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