diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-18 09:53:29 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-18 09:53:29 +0000 |
| commit | d761c9b178d8a2b7757ca5ea41135c7ea37c70b2 (patch) | |
| tree | 2fa288d6bfe10f3c961d9914e7c547666cfe52f3 /ChangeLog | |
| parent | ef73b34c87f52be6a87e0f7ab8d5a03bfcaa983f (diff) | |
merge revision(s) 32605:32610:
* backport r32609 from trunk.
* ext/openssl/ossl_hmac.c: Revert checking return type of
HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
* backport r32606 from trunk.
* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
Thanks, Jared Jennings, for the patch.
[ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@36126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,19 @@ +Mon Jun 18 18:32:43 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * backport r32609 from trunk. + + * ext/openssl/ossl_hmac.c: Revert checking return type of + HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0. + +Mon Jun 18 18:32:43 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * backport r32606 from trunk. + + * ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex. + * ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex. + Thanks, Jared Jennings, for the patch. + [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670] + Sun Jun 10 03:00:21 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (ruby_setjmp): need to save the stack after r2 (the Table |