diff options
author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 02:21:26 +0000 |
---|---|---|
committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 02:21:26 +0000 |
commit | 00a006511b4b46298ac6cdebbeabb48d65d94ae8 (patch) | |
tree | 18c64f421da9921efcbd8aca5d2f7514c6920a2c /ext/openssl/ossl_hmac.c | |
parent | 84e835fe4a68586fcb17adc2a6140c737c83dd62 (diff) | |
download | ruby-00a006511b4b46298ac6cdebbeabb48d65d94ae8.tar.gz |
* 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/trunk@32606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_hmac.c')
-rw-r--r-- | ext/openssl/ossl_hmac.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index 15b37d09e9..5d29b8fc55 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -70,8 +70,10 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest) StringValue(key); GetHMAC(self, ctx); - HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key), - GetDigestPtr(digest), NULL); + if (HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key), + GetDigestPtr(digest), NULL) != 1) { + ossl_raise(eHMACError, "HMAC initialization failed."); + } return self; } @@ -180,7 +182,9 @@ ossl_hmac_reset(VALUE self) HMAC_CTX *ctx; GetHMAC(self, ctx); - HMAC_Init_ex(ctx, NULL, 0, NULL, NULL); + if (HMAC_Init_ex(ctx, NULL, 0, NULL, NULL) != 1) { + ossl_raise(eHMACError, "HMAC initialization failed"); + } return self; } |