From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 22 May 2011 15:40:40 +0000 (+0200)
Subject: leak fix and updates for new formats.
X-Git-Tag: gnutls_2_99_2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=500eab9c58c0db9aebd2e74ffd71b1ba84a44ae6;p=thirdparty%2Fgnutls.git

leak fix and updates for new formats.
---

diff --git a/tests/pathlen/ca-no-pathlen.pem b/tests/pathlen/ca-no-pathlen.pem
index 759f51e740..9d395787b3 100644
--- a/tests/pathlen/ca-no-pathlen.pem
+++ b/tests/pathlen/ca-no-pathlen.pem
@@ -7,7 +7,7 @@ X.509 Certificate Information:
 		Not After: Sat Jan 27 10:00:06 UTC 2007
 	Subject: O=GnuTLS test certificate
 	Subject Public Key Algorithm: RSA
-	Certificate Security Level: Weak
+	Certificate Security Level: Weak (512 bits)
 		Modulus (bits 512):
 			00:a1:63:53:6b:54:95:ac:3c:a4:4b:4b:6a:ba:c0:9c
 			11:ad:28:dd:03:a8:c0:f4:17:bf:18:cd:9f:b3:5a:d1
diff --git a/tests/pathlen/no-ca-or-pathlen.pem b/tests/pathlen/no-ca-or-pathlen.pem
index 30488cd27b..8e9f682306 100644
--- a/tests/pathlen/no-ca-or-pathlen.pem
+++ b/tests/pathlen/no-ca-or-pathlen.pem
@@ -7,7 +7,7 @@ X.509 Certificate Information:
 		Not After: Fri Aug 25 23:59:59 UTC 2000
 	Subject: O=VeriSign\, Inc.,OU=VeriSign Trust Network,OU=www.verisign.com/repository/RPA Incorp. by Ref.\,LIAB.LTD(c)98,OU=Persona Not Validated,OU=Digital ID Class 1 - Netscape,CN=Simon Josefsson,EMAIL=simon@josefsson.org
 	Subject Public Key Algorithm: RSA
-	Certificate Security Level: Weak
+	Certificate Security Level: Weak (1024 bits)
 		Modulus (bits 1024):
 			00:c9:0c:ce:8a:fe:71:46:9b:ca:1d:e5:90:12:a5:11
 			0b:c6:2d:c4:33:c6:19:e8:60:59:4e:3f:64:3d:e4:f7
diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c
index 8b5992c1dc..a58906b7ed 100644
--- a/tests/pkcs12_s2k_pem.c
+++ b/tests/pkcs12_s2k_pem.c
@@ -281,13 +281,14 @@ main (void)
       ret = gnutls_x509_privkey_import_pkcs8 (key, &tmp,
                                               GNUTLS_X509_FMT_PEM,
                                               keys[i].password, 0);
+      gnutls_x509_privkey_deinit (key);
+
       if (ret != keys[i].expected_result)
         {
           printf ("fail[%d]: %d: %s\n", (int) i, ret, gnutls_strerror (ret));
           return 1;
         }
 
-      gnutls_x509_privkey_deinit (key);
     }
 
   gnutls_global_deinit ();