Fixed leaks in PKCS #8 decoding

2 files changed, 5 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 4c70f28cfe..2c0d483df6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ See the end for copying conditions.
 
 Version 2.12.20 (unreleased)
 
+** libgnutls: Fixed memory leak in PKCS #8 key import.
+
 ** libgnutls: Check key identifiers when checking for an issuer.
 
 ** API and ABI modifications:
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index d58471bf15..32a6f8ef6e 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1346,7 +1346,7 @@ read_pbkdf2_params (ASN1_TYPE pbes2_asn,
   /* We don't read the PRF. We only use the default.
    */
 
-  return 0;
+  result = 0;
 
 error:
   asn1_delete_structure (&pbkdf2_asn);
@@ -1554,8 +1554,8 @@ read_pbe_enc_params (ASN1_TYPE pbes2_asn,
       goto error;
     }
   _gnutls_hard_log ("IV.size: %d\n", params->iv_size);
-
-  return 0;
+  
+  result = 0;
 
 error:
   asn1_delete_structure (&pbe_asn);