diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-02 19:56:46 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-02 19:56:46 +0000 |
| commit | 525c60b4cd6381f033e4a25e1df40c843ca0edd8 (patch) | |
| tree | 50a8804013430ddfa6af55d1bb21d69d2d2a7122 | |
| parent | d04026a9e77714b1140b1550fdfd51f4b3e482d0 (diff) | |
merge revision(s) 40048:
fix typo: s/@ca_cert/@cacert/
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/openssl/test_pkcs12.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb index 9f12bc5dc8..25ff606384 100644 --- a/test/openssl/test_pkcs12.rb +++ b/test/openssl/test_pkcs12.rb @@ -40,7 +40,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es= _EOS_ @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, now, now+3600, ca_exts, - @ca_cert, TEST_KEY_RSA2048, OpenSSL::Digest::SHA1.new) + @cacert, TEST_KEY_RSA2048, OpenSSL::Digest::SHA1.new) exts = [ ["keyUsage","digitalSignature",true], @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-03-27" -#define RUBY_PATCHLEVEL 100 +#define RUBY_RELEASE_DATE "2013-04-03" +#define RUBY_PATCHLEVEL 101 #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" |