Created
June 22, 2011 02:04
-
-
Save 13k/1039377 to your computer and use it in GitHub Desktop.
Patches Ruby to skip SSLv2 usage if not available (OpenSSL 1.0 ships with SSLv2 disabled)
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
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb | |
index 6554eba..55b01be 100644 | |
--- a/ext/openssl/extconf.rb | |
+++ b/ext/openssl/extconf.rb | |
@@ -44,7 +44,7 @@ if $mingw | |
have_library("gdi32") | |
end | |
result = have_header("openssl/ssl.h") | |
-result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")} | |
+result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests", ["openssl/evp.h"])} | |
result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")} | |
if !result | |
unless pkg_config("openssl") and have_header("openssl/ssl.h") | |
@@ -97,6 +97,9 @@ have_func("X509_STORE_set_ex_data") | |
have_func("OBJ_NAME_do_all_sorted") | |
have_func("SSL_SESSION_get_id") | |
have_func("OPENSSL_cleanse") | |
+have_func("SSLv2_method") | |
+have_func("SSLv2_server_method") | |
+have_func("SSLv2_client_method") | |
if try_compile("#define FOO(...) foo(__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n") | |
$defs.push("-DHAVE_VA_ARGS_MACRO") | |
end | |
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c | |
index 1ee391c..3cc983b 100644 | |
--- a/ext/openssl/ossl_ssl.c | |
+++ b/ext/openssl/ossl_ssl.c | |
@@ -101,9 +101,12 @@ struct { | |
OSSL_SSL_METHOD_ENTRY(TLSv1), | |
OSSL_SSL_METHOD_ENTRY(TLSv1_server), | |
OSSL_SSL_METHOD_ENTRY(TLSv1_client), | |
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ | |
+ defined(HAVE_SSLV2_CLIENT_METHOD) | |
OSSL_SSL_METHOD_ENTRY(SSLv2), | |
OSSL_SSL_METHOD_ENTRY(SSLv2_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv2_client), | |
+#endif | |
OSSL_SSL_METHOD_ENTRY(SSLv3), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_client), |
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
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c | |
index e8d2e86..be62fcc 100644 | |
--- a/ext/openssl/ossl_ssl.c | |
+++ b/ext/openssl/ossl_ssl.c | |
@@ -107,9 +107,12 @@ struct { | |
OSSL_SSL_METHOD_ENTRY(TLSv1), | |
OSSL_SSL_METHOD_ENTRY(TLSv1_server), | |
OSSL_SSL_METHOD_ENTRY(TLSv1_client), | |
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ | |
+ defined(HAVE_SSLV2_CLIENT_METHOD) | |
OSSL_SSL_METHOD_ENTRY(SSLv2), | |
OSSL_SSL_METHOD_ENTRY(SSLv2_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv2_client), | |
+#endif | |
OSSL_SSL_METHOD_ENTRY(SSLv3), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_server), | |
OSSL_SSL_METHOD_ENTRY(SSLv3_client), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment