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

ruby-changes:37444

From: nobu <ko1@a...>
Date: Fri, 6 Feb 2015 17:31:05 +0900 (JST)
Subject: [ruby-changes:37444] nobu:r49525 (trunk): test_cipher.rb: OpenSSL 1.0.2

nobu	2015-02-06 17:30:55 +0900 (Fri, 06 Feb 2015)

  New Revision: 49525

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

  Log:
    test_cipher.rb: OpenSSL 1.0.2
    
    * test/openssl/test_cipher.rb (OpenSSL::TestCipher#test_ciphers):
      OpenSSL 1.0.2 does not allow wrap mode.

  Modified files:
    trunk/test/openssl/test_cipher.rb
Index: test/openssl/test_cipher.rb
===================================================================
--- test/openssl/test_cipher.rb	(revision 49524)
+++ test/openssl/test_cipher.rb	(revision 49525)
@@ -104,7 +104,12 @@ class OpenSSL::TestCipher < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/test/openssl/test_cipher.rb#L104
     def test_ciphers
       OpenSSL::Cipher.ciphers.each{|name|
         next if /netbsd/ =~ RUBY_PLATFORM && /idea|rc5/i =~ name
-        assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))
+        begin
+          assert_kind_of(OpenSSL::Cipher::Cipher, OpenSSL::Cipher::Cipher.new(name))
+        rescue OpenSSL::Cipher::CipherError => e
+          next if /wrap\z/ =~ name and e.message == 'wrap mode not allowed'
+          raise
+        end
       }
     end
 

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

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