From 9d31efc6f0753a88de0a82ab40116ada028189bd Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 6 Apr 2016 04:38:49 +0000 Subject: test_ssl.rb: skip unavailable pkeys * test/openssl/test_ssl.rb (test_get_ephemeral_key): skip unavailable public keys. [GH-1318] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_ssl.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/openssl/test_ssl.rb') diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index b539f2498d..d1281c116a 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -1171,9 +1171,10 @@ end def test_get_ephemeral_key return unless OpenSSL::SSL::SSLSocket.method_defined?(:tmp_key) + pkey = OpenSSL::PKey ciphers = { - 'ECDHE-RSA-AES128-SHA' => OpenSSL::PKey::EC, - 'DHE-RSA-AES128-SHA' => OpenSSL::PKey::DH, + 'ECDHE-RSA-AES128-SHA' => (pkey::EC if defined?(pkey::EC)), + 'DHE-RSA-AES128-SHA' => (pkey::DH if defined?(pkey::DH)), 'AES128-SHA' => nil } conf_proc = Proc.new { |ctx| ctx.ciphers = 'ALL' } -- cgit v1.2.3