| 1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- 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")
- have_func("TLSv1_1_method")
- have_func("TLSv1_1_server_method")
- have_func("TLSv1_1_client_method")
- 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),
- diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
- index 07e081b..0cbfcba 100644
- --- a/test/openssl/test_ssl.rb
- +++ b/test/openssl/test_ssl.rb
- @@ -912,7 +912,7 @@ def test_unset_OP_ALL
- # that has been marked as forbidden, therefore either of these may be raised
- HANDSHAKE_ERRORS = [OpenSSL::SSL::SSLError, Errno::ECONNRESET]
- -if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1
- +if OpenSSL::SSL::SSLContext::METHODS.include?(:TLSv1) && OpenSSL::SSL::SSLContext::METHODS.include?(:SSLv3)
- def test_forbid_ssl_v3_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 }
|
