From c85e4fce4751527a90478e958b5a3336de99c987 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 13 Feb 2015 07:18:34 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_cipher.rb | 10 +++++++++- version.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb index 30220d169c..954963acc5 100644 --- a/test/openssl/test_cipher.rb +++ b/test/openssl/test_cipher.rb @@ -104,7 +104,15 @@ class OpenSSL::TestCipher < Test::Unit::TestCase 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 diff --git a/version.h b/version.h index 536e39d4a1..cb9393d4bf 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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