summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2014-04-24 19:54:04 +0000
committermiod <>2014-04-24 19:54:04 +0000
commitdac42e8f29c0c2b2a7cf6aa2a3d9db8a970fdfd6 (patch)
treefe15189a9606222083f64bb6060348c85bbfa527 /src
parentee0e4a89f7bc70ae2e13e3e9780c2ece13f4a328 (diff)
downloadopenbsd-dac42e8f29c0c2b2a7cf6aa2a3d9db8a970fdfd6.tar.gz
openbsd-dac42e8f29c0c2b2a7cf6aa2a3d9db8a970fdfd6.tar.bz2
openbsd-dac42e8f29c0c2b2a7cf6aa2a3d9db8a970fdfd6.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl.h4
-rw-r--r--src/lib/libssl/ssl.h4
2 files changed, 8 insertions, 0 deletions
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 {
599#define SSL_OP_NO_TLSv1_2 0x08000000L 599#define SSL_OP_NO_TLSv1_2 0x08000000L
600#define SSL_OP_NO_TLSv1_1 0x10000000L 600#define SSL_OP_NO_TLSv1_1 0x10000000L
601 601
602/* Obsolete flags kept for compatibility. No sane code should use them. */
603#define SSL_OP_PKCS1_CHECK_1 0x0
604#define SSL_OP_PKCS1_CHECK_2 0x0
605
602#define SSL_OP_NETSCAPE_CA_DN_BUG 0x20000000L 606#define SSL_OP_NETSCAPE_CA_DN_BUG 0x20000000L
603#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x40000000L 607#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x40000000L
604/* Make server add server-hello extension from early version of 608/* 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 {
599#define SSL_OP_NO_TLSv1_2 0x08000000L 599#define SSL_OP_NO_TLSv1_2 0x08000000L
600#define SSL_OP_NO_TLSv1_1 0x10000000L 600#define SSL_OP_NO_TLSv1_1 0x10000000L
601 601
602/* Obsolete flags kept for compatibility. No sane code should use them. */
603#define SSL_OP_PKCS1_CHECK_1 0x0
604#define SSL_OP_PKCS1_CHECK_2 0x0
605
602#define SSL_OP_NETSCAPE_CA_DN_BUG 0x20000000L 606#define SSL_OP_NETSCAPE_CA_DN_BUG 0x20000000L
603#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x40000000L 607#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x40000000L
604/* Make server add server-hello extension from early version of 608/* Make server add server-hello extension from early version of