kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r49575,r49579: [Backport #10839]

Browse source 
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
This commit is contained in:
nagachika 2015-02-13 14:16:02 +00:00
parent 095d964e15
commit 40705c2be1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/openssl/test_cipher.rb
View file

@ -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
}

6
version.h
View file

@ -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"