nagachika	2015-02-09 01:50:24 +0900 (Mon, 09 Feb 2015)

  New Revision: 49548

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

  Log:
    merge revision(s) r49525: [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_1/
  Modified files:
    branches/ruby_2_1/test/openssl/test_cipher.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49547)
+++ ruby_2_1/version.h	(revision 49548)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-02"
-#define RUBY_PATCHLEVEL 290
+#define RUBY_RELEASE_DATE "2015-02-09"
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/openssl/test_cipher.rb
===================================================================
--- ruby_2_1/test/openssl/test_cipher.rb	(revision 49547)
+++ ruby_2_1/test/openssl/test_cipher.rb	(revision 49548)
@@ -104,7 +104,12 @@ class OpenSSL::TestCipher < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49525


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