archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 49525,49575: [Backport #10839]

Browse source 
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
This commit is contained in:
naruse 2015-02-13 07:18:34 +00:00
parent 19424d0b51
commit c85e4fce47
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/openssl/test_cipher.rb
View file

@ -104,7 +104,15 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
def test_ciphers def test_ciphers
OpenSSL::Cipher.ciphers.each{|name| OpenSSL::Cipher.ciphers.each{|name|
next if /netbsd/ =~ RUBY_PLATFORM && /idea|rc5/i =~ 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 end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-13" #define RUBY_RELEASE_DATE "2015-02-13"
#define RUBY_PATCHLEVEL 45 #define RUBY_PATCHLEVEL 46
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2