Created
December 4, 2015 13:08
-
-
Save mvz/5d13b6a79406a721fb87 to your computer and use it in GitHub Desktop.
Combined patches to get MRI 1.9.3 to build on Debian Sid
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 1e7a929c1d44d7a368fbe379211183ac6c972920 Mon Sep 17 00:00:00 2001 | |
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | |
Date: Wed, 25 Dec 2013 01:42:09 +0000 | |
Subject: [PATCH] ossl_ssl.c: declare OP_MSIE_SSLV2_RSA_PADDING only if defined | |
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant | |
`OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined. The | |
`SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest | |
snapshot of OpenSSL 1.0.1. [Fixes GH-488] | |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |
--- | |
ext/openssl/ossl_ssl.c | 2 ++ | |
1 files changed, 2 insertions(+) | |
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c | |
index ec71350..206470c 100644 | |
--- a/ext/openssl/ossl_ssl.c | |
+++ b/ext/openssl/ossl_ssl.c | |
@@ -2229,7 +2229,9 @@ Init_ossl_ssl() | |
ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG); | |
ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG); | |
ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER); | |
+#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING) | |
ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING); | |
+#endif | |
ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG); | |
ossl_ssl_def_const(OP_TLS_D5_BUG); | |
ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG); | |
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb | |
index 8c04cb5..132d803 100644 | |
--- a/ext/openssl/extconf.rb | |
+++ b/ext/openssl/extconf.rb | |
@@ -104,6 +104,9 @@ | |
have_func("SSLv2_method") | |
have_func("SSLv2_server_method") | |
have_func("SSLv2_client_method") | |
+have_func("SSLv3_method") | |
+have_func("SSLv3_server_method") | |
+have_func("SSLv3_client_method") | |
unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h']) | |
have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME") | |
end | |
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c | |
index f7cb7f0..47111f6 100644 | |
--- a/ext/openssl/ossl_ssl.c | |
+++ b/ext/openssl/ossl_ssl.c | |
@@ -109,9 +109,12 @@ static const struct { | |
OSSL_SSL_METHOD_ENTRY(SSLv2_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv2_client), | |
#endif | |
+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ | |
+ defined(HAVE_SSLV3_CLIENT_METHOD) | |
OSSL_SSL_METHOD_ENTRY(SSLv3), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_client), | |
+#endif | |
OSSL_SSL_METHOD_ENTRY(SSLv23), | |
OSSL_SSL_METHOD_ENTRY(SSLv23_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv23_client), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment