[前][次][番号順一覧][スレッド一覧]

ruby-changes:42424

From: nobu <ko1@a...>
Date: Wed, 6 Apr 2016 12:42:13 +0900 (JST)
Subject: [ruby-changes:42424] nobu:r54498 (trunk): test_ssl.rb: skip unavailable pkeys

nobu	2016-04-06 13:38:49 +0900 (Wed, 06 Apr 2016)

  New Revision: 54498

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54498

  Log:
    test_ssl.rb: skip unavailable pkeys
    
    * test/openssl/test_ssl.rb (test_get_ephemeral_key): skip
      unavailable public keys.  [GH-1318]

  Modified files:
    trunk/test/openssl/test_ssl.rb
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 54497)
+++ test/openssl/test_ssl.rb	(revision 54498)
@@ -1171,9 +1171,10 @@ end https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L1171
 
   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' }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]