1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_ssl.rb: test only if necessary option is available.

Browse Source 
* test/openssl/test_ssl.rb (test_forbid_tls_v1_{1,2}_{for_client,from_server}):
  test only if necessary option is available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-05-07 17:18:55 +00:00
parent a135202990
commit 8545d2f4b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/openssl/test_ssl.rb
View File

@ -146,7 +146,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
client_ca_from_server = sslconn.client_ca client_ca_from_server = sslconn.client_ca
[@cli_cert, @cli_key] [@cli_cert, @cli_key]
end end
server_connect(port, ctx) { |ssl| assert_equal([@ca], client_ca_from_server) } server_connect(port, ctx) { |ssl| assert_equal([@ca], client_ca_from_server) }
} }
end end
@ -471,7 +471,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
ctx.ssl_version = :TLSv1_1 ctx.ssl_version = :TLSv1_1
assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) } assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
} }
end end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1)
def test_forbid_tls_v1_1_from_server def test_forbid_tls_v1_1_from_server
start_server_version(:TLSv1_1) { |server, port| start_server_version(:TLSv1_1) { |server, port|
@ -479,7 +479,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1
assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) } assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
} }
end end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1)
def test_forbid_tls_v1_2_for_client def test_forbid_tls_v1_2_for_client
ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 } ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 }
@ -488,7 +488,7 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
ctx.ssl_version = :TLSv1_2 ctx.ssl_version = :TLSv1_2
assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) } assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
} }
end end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2)
def test_forbid_tls_v1_2_from_server def test_forbid_tls_v1_2_from_server
start_server_version(:TLSv1_2) { |server, port| start_server_version(:TLSv1_2) { |server, port|
@ -496,14 +496,14 @@ if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2
assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) } assert_raise(OpenSSL::SSL::SSLError) { server_connect(port, ctx) }
} }
end end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2)
end end
private private
def start_server_version(version, ctx_proc=nil, &blk) def start_server_version(version, ctx_proc=nil, &blk)
ctx_wrap = Proc.new { |ctx| ctx_wrap = Proc.new { |ctx|
ctx.ssl_version = version ctx.ssl_version = version
ctx_proc.call(ctx) if ctx_proc ctx_proc.call(ctx) if ctx_proc
} }