aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-07 00:10:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-07 00:10:41 +0000
commitf0cee0c6b8dcd66e0179c1578612f64524f874e1 (patch)
tree83c3d9015d8b5faaecb3e3ec071fc659279ab930
parent4225b29df96182f259289ed32a7ce40128b9a835 (diff)
downloadruby-f0cee0c6b8dcd66e0179c1578612f64524f874e1.tar.gz
test_ssl.rb: skip unsupported ciphers
* test/openssl/test_ssl.rb (test_get_ephemeral_key): skip unsupported ciphers. [GH-1318] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/openssl/test_ssl.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index d1281c116a..6e9078dace 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1181,7 +1181,12 @@ end
start_server(OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => conf_proc) do |server, port|
ciphers.each do |cipher, ephemeral|
ctx = OpenSSL::SSL::SSLContext.new
- ctx.ciphers = cipher
+ begin
+ ctx.ciphers = cipher
+ rescue OpenSSL::SSL::SSLError => e
+ next if /no cipher match/ =~ e.message
+ raise
+ end
server_connect(port, ctx) do |ssl|
if ephemeral
assert_instance_of(ephemeral, ssl.tmp_key)