diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/openssl/test_ssl_session.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Wed Nov 18 20:10:31 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] + Wed Nov 18 20:04:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb): diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 5d08e7f780..f291c5d246 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -307,6 +307,7 @@ __EOS__ 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 @@ -345,7 +346,7 @@ __EOS__ last_client_session = nil 3.times do sock = TCPSocket.new("127.0.0.1", port) - ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new("SSLv3")) + 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.8" #define RUBY_RELEASE_DATE "2015-11-18" -#define RUBY_PATCHLEVEL 413 +#define RUBY_PATCHLEVEL 414 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 |