From 831af844ef2d4d716da07eda331c50d1e73005e3 Mon Sep 17 00:00:00 2001 From: emboss Date: Tue, 18 Dec 2012 02:32:28 +0000 Subject: [PATCH] * test/openssl/test_ssl.rb: Use :TLSv1_2_client explicitly in test_tls_v1_2 to prevent upstream bug. [Bug #7197] [ruby-dev:46240] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/openssl/test_ssl.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d886146396..8bb6d9135c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 18 12:28:52 2012 Martin Bosslet + + * test/openssl/test_ssl.rb: Use :TLSv1_2_client explicitly in + test_tls_v1_2 to prevent upstream bug. + [Bug #7197] [ruby-dev:46240] + Tue Dec 18 11:52:34 2012 Martin Bosslet * ext/openssl/lib/ssl.rb: Enable insertion of empty fragments as a diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index d4f578a33e..cb18c1ae51 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -472,7 +472,9 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2 def test_tls_v1_2 start_server_version(:TLSv1_2) { |server, port| - server_connect(port) { |ssl| assert_equal("TLSv1.2", ssl.ssl_version) } + ctx = OpenSSL::SSL::SSLContext.new + ctx.ssl_version = :TLSv1_2_client + server_connect(port, ctx) { |ssl| assert_equal("TLSv1.2", ssl.ssl_version) } } end if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000