diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-13 14:16:02 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-13 14:16:02 +0000 |
commit | 40705c2be1d0fee20f7cce0e0105aabd075b99ed (patch) | |
tree | c53aecd26f90b4bdf2691beec17587337a35d58e | |
parent | 095d964e156e73d1827d1213ab30cef602ce9c10 (diff) |
merge revision(s) r49575,r49579: [Backport #10839]
test_cipher.rb: show cipher name
* test/openssl/test_cipher.rb (test_ciphers): show wrap mode
cipher name, which does not end with "wrap".
http://rubyci.blob.core.windows.net/fedora21/ruby-trunk/log/20150212T061502Z.fail.html.gz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/openssl/test_cipher.rb | 2 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb index c87eacce1d..101a75a15b 100644 --- a/test/openssl/test_cipher.rb +++ b/test/openssl/test_cipher.rb @@ -107,7 +107,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase 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' + next if /wrap/ =~ name and e.message == 'wrap mode not allowed' raise end } @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.5" -#define RUBY_RELEASE_DATE "2015-02-09" -#define RUBY_PATCHLEVEL 291 +#define RUBY_RELEASE_DATE "2015-02-13" +#define RUBY_PATCHLEVEL 292 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" |