From dac42e8f29c0c2b2a7cf6aa2a3d9db8a970fdfd6 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Thu, 24 Apr 2014 19:54:04 +0000
Subject: Bring back the SSL_OP_PKCS1_CHECK_* defines (defined to zero, as they
 already were), after stumbling upon code (mis)using them in the wild.

---
 src/lib/libssl/src/ssl/ssl.h | 4 ++++
 src/lib/libssl/ssl.h         | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index d3c7908a26..cc77a8f2bd 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -599,6 +599,10 @@ struct ssl_session_st {
 #define SSL_OP_NO_TLSv1_2				0x08000000L
 #define SSL_OP_NO_TLSv1_1				0x10000000L
 
+/* Obsolete flags kept for compatibility. No sane code should use them. */
+#define SSL_OP_PKCS1_CHECK_1				0x0
+#define SSL_OP_PKCS1_CHECK_2				0x0
+
 #define SSL_OP_NETSCAPE_CA_DN_BUG			0x20000000L
 #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG		0x40000000L
 /* Make server add server-hello extension from early version of
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index d3c7908a26..cc77a8f2bd 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -599,6 +599,10 @@ struct ssl_session_st {
 #define SSL_OP_NO_TLSv1_2				0x08000000L
 #define SSL_OP_NO_TLSv1_1				0x10000000L
 
+/* Obsolete flags kept for compatibility. No sane code should use them. */
+#define SSL_OP_PKCS1_CHECK_1				0x0
+#define SSL_OP_PKCS1_CHECK_2				0x0
+
 #define SSL_OP_NETSCAPE_CA_DN_BUG			0x20000000L
 #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG		0x40000000L
 /* Make server add server-hello extension from early version of
-- 
cgit v1.2.3-55-g6feb