diff options
| author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 04:17:39 +0000 |
|---|---|---|
| committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 04:17:39 +0000 |
| commit | df88c5af6d6a0ad781d70df7b28dcabfb72d6364 (patch) | |
| tree | 7470e679278da57785037b20e7e143f82e9f13aa /ext/openssl | |
| parent | 48e712703c746393941d9ddeed57efc366005dc7 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl_hmac.c | 10 |
1 files changed, 3 insertions, 7 deletions
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; } |