aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-02 06:10:07 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-02 06:10:07 +0000
commitdc599c2cb84e1a7d06e1f03e3ccee4d04dd1e636 (patch)
treed4f3d00e6e2a5dbcae2f41a394ccd2cc6bc41963
parentf5da412c9ea7191a78475182ec95cb3bb7f0b7c4 (diff)
downloadruby-dc599c2cb84e1a7d06e1f03e3ccee4d04dd1e636.tar.gz
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
fix test failure with OpenSSL disabled SSLv3 protocol. [ruby-core:63772] [Bug #10046] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_ssl_session.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5927a06e87..8a68495629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 2 15:10:01 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
+ fix test failure with OpenSSL disabled SSLv3 protocol.
+ [ruby-core:63772] [Bug #10046]
+
Fri Jan 2 09:08:31 2015 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index d4c2220ba3..16432bcbb0 100644
--- a/test/openssl/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
@@ -278,7 +278,7 @@ __EOS__
def test_ctx_client_session_cb
called = {}
- ctx = OpenSSL::SSL::SSLContext.new("SSLv3")
+ ctx = OpenSSL::SSL::SSLContext.new
ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
ctx.session_new_cb = lambda { |ary|