From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 20 Nov 2012 17:10:37 +0000 (+0100)
Subject: updated for new output
X-Git-Tag: gnutls_3_1_5~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=517699a4c19ac33ea6e064e136e692fa6add1dcf;p=thirdparty%2Fgnutls.git

updated for new output
---

diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki
index e0722a0532..c212471169 100755
--- a/tests/cert-tests/aki
+++ b/tests/cert-tests/aki
@@ -31,11 +31,11 @@ $CERTTOOL --certificate-info --infile $srcdir/aki-cert.pem \
 diff $srcdir/aki-cert.pem tmp-aki.pem
 rc=$?
 
-rm -f tmp-aki.pem
-
 # We're done.
 if test "$rc" != "0"; then
   exit $rc
 fi
 
+rm -f tmp-aki.pem
+
 exit 0
diff --git a/tests/cert-tests/aki-cert.pem b/tests/cert-tests/aki-cert.pem
index f2d8992a59..c12d0bed3e 100644
--- a/tests/cert-tests/aki-cert.pem
+++ b/tests/cert-tests/aki-cert.pem
@@ -7,7 +7,7 @@ X.509 Certificate Information:
 		Not After: Sun Mar 24 23:59:59 UTC 2019
 	Subject: C=US,O=VeriSign\, Inc.,OU=VeriSign Trust Network,OU=Terms of use at https://www.verisign.com/rpa (c)09,CN=VeriSign Class 3 Secure Server CA - G2
 	Subject Public Key Algorithm: RSA
-	Certificate Security Level: Legacy (2048 bits)
+	Algorithm Security Level: Legacy (2048 bits)
 		Modulus (bits 2048):
 			00:d4:56:8f:57:3b:37:28:a6:40:63:d2:95:d5:05:74
 			da:b5:19:6a:96:d6:71:57:2f:e2:c0:34:8c:a0:95:b3
diff --git a/tests/cert-tests/bmpstring.pem b/tests/cert-tests/bmpstring.pem
index a1cbe14106..0bd2548edf 100644
--- a/tests/cert-tests/bmpstring.pem
+++ b/tests/cert-tests/bmpstring.pem
@@ -7,7 +7,7 @@ X.509 Certificate Information:
 		Not After: Wed Nov 23 21:59:59 UTC 2016
 	Subject: serialNumber=3,O=Hellenic Republic,CN=CSCA-HELLAS,C=GR,EMAIL=csca@passport.gov.gr
 	Subject Public Key Algorithm: RSA
-	Certificate Security Level: High (4096 bits)
+	Algorithm Security Level: High (4096 bits)
 		Modulus (bits 4096):
 			00:e0:95:b2:04:5a:91:78:1f:7f:1c:33:7f:d0:3a:e1
 			2c:a7:4c:19:be:43:30:c2:8b:b7:1a:1d:9d:80:43:30
diff --git a/tests/cert-tests/ca-no-pathlen.pem b/tests/cert-tests/ca-no-pathlen.pem
index 070be43462..f57a033bcb 100644
--- a/tests/cert-tests/ca-no-pathlen.pem
+++ b/tests/cert-tests/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: Insecure (512 bits)
+	Algorithm Security Level: Insecure (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/cert-tests/no-ca-or-pathlen.pem b/tests/cert-tests/no-ca-or-pathlen.pem
index 0a879191db..a255e077ad 100644
--- a/tests/cert-tests/no-ca-or-pathlen.pem
+++ b/tests/cert-tests/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 (1024 bits)
+	Algorithm 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/cert-tests/pathlen b/tests/cert-tests/pathlen
index c7d994cc57..5bfdbc9b3f 100755
--- a/tests/cert-tests/pathlen
+++ b/tests/cert-tests/pathlen
@@ -35,10 +35,12 @@ rc1=$?
 diff $srcdir/no-ca-or-pathlen.pem new-no-ca-or-pathlen.pem
 rc2=$?
 
-rm -f new-ca-no-pathlen.pem new-no-ca-or-pathlen.pem
 
 # We're done.
 if test "$rc1" != "0"; then
   exit $rc1
 fi
+
+rm -f new-ca-no-pathlen.pem new-no-ca-or-pathlen.pem
+
 exit $rc2