diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl_hmac.c | 10 |
2 files changed, 10 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Fri Jul 22 13:03:12 2011 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. + Fri Jul 22 11:22:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> * backport r32606 from trunk. diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index 5d29b8fc55..5220c9e73d 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -70,10 +70,8 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest) StringValue(key); GetHMAC(self, ctx); - if (HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key), - GetDigestPtr(digest), NULL) != 1) { - ossl_raise(eHMACError, "HMAC initialization failed."); - } + HMAC_Init(ctx, RSTRING_PTR(key), RSTRING_LENINT(key), + GetDigestPtr(digest)); return self; } @@ -182,9 +180,7 @@ ossl_hmac_reset(VALUE self) HMAC_CTX *ctx; GetHMAC(self, ctx); - if (HMAC_Init_ex(ctx, NULL, 0, NULL, NULL) != 1) { - ossl_raise(eHMACError, "HMAC initialization failed"); - } + HMAC_Init(ctx, NULL, 0, NULL); return self; } |