resolve conflicts

1 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index 9ab740d51f..96de1bd11e 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -97,10 +97,14 @@ int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
                 return 0;
         }
         HMAC_CTX_init(&hmac);
-        HMAC_Init_ex(&hmac, key, md_size, md_type, NULL);
-        HMAC_Update(&hmac, p12->authsafes->d.data->data,
-                                         p12->authsafes->d.data->length);
-        HMAC_Final(&hmac, mac, maclen);
+        if (!HMAC_Init_ex(&hmac, key, md_size, md_type, NULL)
+                || !HMAC_Update(&hmac, p12->authsafes->d.data->data,
+                                         p12->authsafes->d.data->length)
+                || !HMAC_Final(&hmac, mac, maclen))
+                {
+                HMAC_CTX_cleanup(&hmac);
+                return 0;
+                }
         HMAC_CTX_cleanup(&hmac);
         return 1;
 }