From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 9 Jun 2012 09:48:02 +0000 (+0200)
Subject: Fixed leaks in PKCS #8 decoding
X-Git-Tag: gnutls_3_0_21~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93493da862b12e1379bbbcf1707c657b7e55f724;p=thirdparty%2Fgnutls.git

Fixed leaks in PKCS #8 decoding
---

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index f83582af11..0d90f29756 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1385,7 +1385,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);
@@ -1593,8 +1593,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);