1 files changed, 10 insertions, 8 deletions
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index c2aa50bbdc..8febeb7c3f 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -159,16 +159,18 @@ ossl_hmac_update(VALUE self, VALUE data)
 static void
 hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
 {
-    HMAC_CTX final;
-
-    HMAC_CTX_copy(&final, ctx);
-    if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
-	HMAC_CTX_cleanup(&final);
-	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
+    HMAC_CTX *final = HMAC_CTX_new();
+    if (!final)
+	ossl_raise(eHMACError, "HMAC_CTX_new() failed");
+
+    HMAC_CTX_copy(final, ctx);
+    if (!(*buf = OPENSSL_malloc(HMAC_size(final)))) {
+	HMAC_CTX_free(final);
+	OSSL_Debug("Allocating %"PRIuSIZE" mem", HMAC_size(final));
 	ossl_raise(eHMACError, "Cannot allocate memory for hmac");
     }
-    HMAC_Final(&final, *buf, buf_len);
-    HMAC_CTX_cleanup(&final);
+    HMAC_Final(final, *buf, buf_len);
+    HMAC_CTX_free(final);
 }
 
 /*