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:01:05 +0000
commit1b0d48126bd80b0563e3785f9a1855e26a7307e2 (patch)
treea982e721e1ddb8c9d9dbb76e9d2e58acfd98c265
parent7233e209316a681bd4e73dfcff36451ee60fdb54 (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 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