naruse	2015-02-13 16:18:34 +0900 (Fri, 13 Feb 2015)

  New Revision: 49584

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

  Log:
    merge revision(s) 49525,49575: [Backport #10839]
    
    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 directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/openssl/test_cipher.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49583)
+++ ruby_2_2/version.h	(revision 49584)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-13"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_2/test/openssl/test_cipher.rb
===================================================================
--- ruby_2_2/test/openssl/test_cipher.rb	(revision 49583)
+++ ruby_2_2/test/openssl/test_cipher.rb	(revision 49584)
@@ -104,7 +104,15 @@ class OpenSSL::TestCipher < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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
+          if e.message == 'wrap mode not allowed'
+            assert_match(/wrap\z/, name, e.message)
+            next
+          end
+          raise
+        end
       }
     end
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49525,49575


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