diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/openssl/test_ssl_session.rb | 6 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Fri Aug 21 06:35:50 2015 Aaron Patterson <tenderlove@ruby-lang.org> + + * test/openssl/test_ssl_session.rb: Fix tests so that they take in to + account OpenSSL installations that have SSLv3 disabled by default. + Thanks Jeremy Evans <code@jeremyevans.net> for the patches. + [Bug #11366] [Bug #11367] + Thu Aug 20 22:19:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_method.c (basic_obj_respond_to): call respond_to_missing? diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 5ce93b52a9..28d268e76b 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -312,13 +312,11 @@ __EOS__ end def test_ctx_server_session_cb - method = "SSLv3" - assert_include(OpenSSL::SSL::SSLContext::METHODS.map(&:to_s), method) - called = {} ctx_proc = Proc.new { |ctx, ssl| ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER + ctx.options = OpenSSL::SSL::OP_NO_TICKET last_server_session = nil # get_cb is called whenever a client proposed to resume a session but @@ -358,7 +356,7 @@ __EOS__ 3.times do sock = TCPSocket.new("127.0.0.1", port) begin - ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new(method)) + ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new()) ssl.sync_close = true ssl.session = last_client_session if last_client_session ssl.connect |