From 5f7be3150f0bffb6a958770c61270302123774c3 Mon Sep 17 00:00:00 2001 From: emboss Date: Mon, 7 May 2012 11:57:01 +0000 Subject: * ext/openssl/ossl_ssl.c: add support for option flags OpenSSL::SSL::OP_NO_TLSv1_1 OpenSSL::SSL::OP_NO_TLSv1_2 to allow blocking specific TLS versions. Thanks to Justin Guyett for pointing this out to me. * test/openssl/test_ssl.rb: add tests to assert correct behavior when blocking certain versions of TLS/SSL both on server and client side. Also refactored tests to reduce boilerplate code a little. * test/openssl/utils.rb: rescue Errno::ECONNRESET for tests where client rejects the connection because a forbidden protocol version was used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/openssl/utils.rb') diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index c4c0a0c040..13989ad272 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -235,7 +235,7 @@ aPgwHyJBiK1/ebK3tYcrSKrOoRyrAgEC server_proc.call(ctx, ssl) end end - rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK + rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET end DHParam = OpenSSL::PKey::DH.new(128) -- cgit v1.2.3