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: OpenSSL_1_0_0l~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b0d48126bd80b0563e3785f9a1855e26a7307e2;p=oweals%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 9d75851606..9791abc454 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -527,6 +527,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