tests: updated outputs to reflect new fingerprint/keyid formatstmp-add-sha256

14 files changed, 58 insertions, 58 deletions

diff --git a/tests/cert-tests/data/aki-cert.pem b/tests/cert-tests/data/aki-cert.pem
index 9a2972fd81..2e5fa0b730 100644
--- a/tests/cert-tests/data/aki-cert.pem
+++ b/tests/cert-tests/data/aki-cert.pem
@@ -64,12 +64,12 @@ X.509 Certificate Information:
 		cc:a2:9a:f1:6e:e8:cf:8e:d1:1a:3c:5e:19:c5:d7:9b
 		35:b0:02:23:24:e5:05:b8:d5:88:e3:e0:fa:b9:f4:5f
 Other Information:
-	SHA1 fingerprint:
-		62f3c89771da4ce01a91fc13e02b6057b4547a1d
-	SHA256 fingerprint:
-		50505039f8cbd1d36739bcf80d334f532f6817a332add4352f1f4fee9915cd8a
+	Fingerprint:
+		sha1:62f3c89771da4ce01a91fc13e02b6057b4547a1d
+		sha256:50505039f8cbd1d36739bcf80d334f532f6817a332add4352f1f4fee9915cd8a
 	Public Key ID:
-		df622ed0fe6a65a8df5b62840c826ac5b372235f
+		sha1:df622ed0fe6a65a8df5b62840c826ac5b372235f
+		sha256:a1d7b37438ab0eadc6a9c9c2f3265314e64065b9a3ad937b6ca535b8cb5fe093
 	Public key's random art:
 		+--[ RSA 2048]----+
 		|                 |
diff --git a/tests/cert-tests/data/arb-extensions.csr b/tests/cert-tests/data/arb-extensions.csr
index 2756f271c9..7c1f27b995 100644
--- a/tests/cert-tests/data/arb-extensions.csr
+++ b/tests/cert-tests/data/arb-extensions.csr
@@ -47,7 +47,8 @@ PKCS #10 Certificate Request Information:
 				Digital signature.
 Other Information:
 	Public Key ID:
-		5d40adf0ce9440958b7e99941d925422ca72365f
+		sha1:5d40adf0ce9440958b7e99941d925422ca72365f
+		sha256:472f7ef457b70a57a585094b285fdaef7ad72553495701ecd4f2a6dcb477b50e
 
 -----BEGIN NEW CERTIFICATE REQUEST-----
 MIIDIjCCAosCAQAwezEVMBMGA1UEAxMMQ2luZHkgTGF1cGVyMRcwFQYDVQQLEw5z
diff --git a/tests/cert-tests/data/bmpstring.pem b/tests/cert-tests/data/bmpstring.pem
index b99c80035b..707465eed5 100644
--- a/tests/cert-tests/data/bmpstring.pem
+++ b/tests/cert-tests/data/bmpstring.pem
@@ -99,12 +99,12 @@ X.509 Certificate Information:
 		cb:b5:48:a3:1f:33:5a:98:e5:29:5e:9b:e0:1f:fd:46
 		45:eb:4f:34:15:7c:4a:be:a3:07:40:3c:33:3d:34:74
 Other Information:
-	SHA1 fingerprint:
-		8b730ffbd11677aaaf8600b893927d9e402c3f2d
-	SHA256 fingerprint:
-		0738e6d0d062fb1f32e5f3a03fde6b3f045838fae7ad3bdd2c26f6003f213295
+	Fingerprint:
+		sha1:8b730ffbd11677aaaf8600b893927d9e402c3f2d
+		sha256:0738e6d0d062fb1f32e5f3a03fde6b3f045838fae7ad3bdd2c26f6003f213295
 	Public Key ID:
-		3c7fd9a47b17ed6f81ce80c326d147fd3b991444
+		sha1:3c7fd9a47b17ed6f81ce80c326d147fd3b991444
+		sha256:bb04f2e2a511a183ef195b3581f3e4ec968f742982687bd159f65374eb3d75d8
 	Public key's random art:
 		+--[ RSA 4096]----+
 		|            . oE |
diff --git a/tests/cert-tests/data/ca-no-pathlen.pem b/tests/cert-tests/data/ca-no-pathlen.pem
index ab0373f199..155cc1ab74 100644
--- a/tests/cert-tests/data/ca-no-pathlen.pem
+++ b/tests/cert-tests/data/ca-no-pathlen.pem
@@ -27,12 +27,12 @@ X.509 Certificate Information:
 		f3:6e:7e:4c:f3:8d:ed:2a:f8:3f:39:04:ef:a4:fd:e3
 		fc:cb:ba:1f:2a:1d:ad:f3:f9:68:39:f4:6d:1f:6a:15
 Other Information:
-	SHA1 fingerprint:
-		f3ddd5478b80b142200b50c9eb2ee37061b09ed6
-	SHA256 fingerprint:
-		2a97f5b23c554a847b505429d9660ac2549bee5cc9279cb8c98d4b13729234ba
+	Fingerprint:
+		sha1:f3ddd5478b80b142200b50c9eb2ee37061b09ed6
+		sha256:2a97f5b23c554a847b505429d9660ac2549bee5cc9279cb8c98d4b13729234ba
 	Public Key ID:
-		f268df0e814c0302ed338e146f57421dba44f06c
+		sha1:f268df0e814c0302ed338e146f57421dba44f06c
+		sha256:aafdaec29861f9d05de1dfdc1c7a64332cedead32fcb790597b4757ea1104815
 	Public key's random art:
 		+--[ RSA  512]----+
 		|.o..+o...        |
diff --git a/tests/cert-tests/data/complex-cert.pem b/tests/cert-tests/data/complex-cert.pem
index 45968c7599..4c919248da 100644
--- a/tests/cert-tests/data/complex-cert.pem
+++ b/tests/cert-tests/data/complex-cert.pem
@@ -60,12 +60,12 @@ X.509 Certificate Information:
 		f9:e2:ad:9b:18:e9:38:93:44:b6:db:e2:37:c0:9d:e8
 		53:e2:8e:e6:67:ac:3f:61:f7:4e:47:84:5c:f3:d8:44
 Other Information:
-	SHA1 fingerprint:
-		5bf859ec9395b73f5ed5adfdfaa9c1add2ec23ff
-	SHA256 fingerprint:
-		3cbe4b0ed00f0b491fd9c7f620f2efe7357e50d9d096fd92c788041bb32e3d1b
+	Fingerprint:
+		sha1:5bf859ec9395b73f5ed5adfdfaa9c1add2ec23ff
+		sha256:3cbe4b0ed00f0b491fd9c7f620f2efe7357e50d9d096fd92c788041bb32e3d1b
 	Public Key ID:
-		1f1df37c58ffae0157ffccd8aae234092017a090
+		sha1:1f1df37c58ffae0157ffccd8aae234092017a090
+		sha256:9a39a13fee4b8f4c589b3934f78632fc4f688f34b7fd36cb17ce841109988f53
 	Public key's random art:
 		+--[ RSA 2432]----+
 		|..  ...          |
diff --git a/tests/cert-tests/data/gost-cert.pem b/tests/cert-tests/data/gost-cert.pem
index 9e73f63b3f..edcdb9e8a6 100644
--- a/tests/cert-tests/data/gost-cert.pem
+++ b/tests/cert-tests/data/gost-cert.pem
@@ -24,10 +24,9 @@ X.509 Certificate Information:
 		b2:43:1d:ed:b5:15:45:c7:10:38:41:28:68:29:62:20
 		e6:92:8a:64:34:87:b8:b9:9f:ab:c8:04:6d:26:55:99
 Other Information:
-	SHA1 fingerprint:
-		621f34c4fdd7e93f9b8f18224ba0bcd1c63a4771
-	SHA256 fingerprint:
-		ac6ecf4e7a876edf3e61f538d6061353c2015bfbdf60370492f7404d7f09e13a
+	Fingerprint:
+		sha1:621f34c4fdd7e93f9b8f18224ba0bcd1c63a4771
+		sha256:ac6ecf4e7a876edf3e61f538d6061353c2015bfbdf60370492f7404d7f09e13a
 
 -----BEGIN CERTIFICATE-----
 MIICXjCCAgugAwIBAgICAR8wCgYGKoUDAgIDBQAwdDELMAkGA1UEBhMCUlUxDzAN
diff --git a/tests/cert-tests/data/long-oids.pem b/tests/cert-tests/data/long-oids.pem
index 90a86be7c6..50d3861b9e 100644
--- a/tests/cert-tests/data/long-oids.pem
+++ b/tests/cert-tests/data/long-oids.pem
@@ -4,7 +4,6 @@ X.509 Certificate Information:
 	Issuer: CN=sat-r220-10.lab.eng.rdu2.redhat.com,OU=SomeOrgUnit,O=Katello,L=Raleigh,ST=North Carolina,C=US
 	Validity:
 		Not Before: Fri Jul 01 18:54:17 UTC 2016
-		Not After: Wed Dec 01 13:00:00 UTC 2049
 	Subject: CN=8a88801755a7c9070155a7cfbe360004
 	Subject Public Key Algorithm: RSA
 	Algorithm Security Level: Medium (2048 bits)
@@ -124,12 +123,12 @@ X.509 Certificate Information:
 		9c:7b:a2:74:6f:87:97:a1:d9:82:7f:7d:62:6b:45:6c
 		0b:5e:25:43:8a:20:16:7d:e5:84:18:3f:7c:da:fc:f9
 Other Information:
-	SHA1 fingerprint:
-		562de99ca9cd44ea93399ddfe902189f54fc1a4e
-	SHA256 fingerprint:
-		2c17e1d8f33d7d4f6737978f74338b6f5007247a6c1dfdc2336095837979a130
+	Fingerprint:
+		sha1:562de99ca9cd44ea93399ddfe902189f54fc1a4e
+		sha256:2c17e1d8f33d7d4f6737978f74338b6f5007247a6c1dfdc2336095837979a130
 	Public Key ID:
-		d2e82f7dcb5150dd512201753aa90bec77b39a7d
+		sha1:d2e82f7dcb5150dd512201753aa90bec77b39a7d
+		sha256:01c62db2e09e811cd9c52b041c67be79fc665b86a1ca62ce8028e3b19ede89d8
 	Public key's random art:
 		+--[ RSA 2048]----+
 		|          .o=ooo+|
diff --git a/tests/cert-tests/data/multi-value-dn.pem b/tests/cert-tests/data/multi-value-dn.pem
index 091951ee6a..70e932de68 100644
--- a/tests/cert-tests/data/multi-value-dn.pem
+++ b/tests/cert-tests/data/multi-value-dn.pem
@@ -36,12 +36,12 @@ X.509 Certificate Information:
 		63:ce:99:58:38:13:5b:15:c2:bd:27:ea:fd:7b:0e:30
 		e7:37:c6:47:ce:03:e7:5a:19:2a:90:a8:93:89:e9:9d
 Other Information:
-	SHA1 fingerprint:
-		3cd23994f8e12b98462899fd30d6750f153dba7f
-	SHA256 fingerprint:
-		9442533a526ab64a4fb32b87898fae2d6dd7e85730926a58ff5f5cb9fd810b0e
+	Fingerprint:
+		sha1:3cd23994f8e12b98462899fd30d6750f153dba7f
+		sha256:9442533a526ab64a4fb32b87898fae2d6dd7e85730926a58ff5f5cb9fd810b0e
 	Public Key ID:
-		753ab7fc73642914496111fdce90cbf63d1c8a13
+		sha1:753ab7fc73642914496111fdce90cbf63d1c8a13
+		sha256:0ffb94e70ee41e39af7547fb6eeead068e23a97e2d188521c471b75d772ff51b
 	Public key's random art:
 		+--[ RSA 1024]----+
 		|            .**  |
diff --git a/tests/cert-tests/data/name-constraints-ip2.pem b/tests/cert-tests/data/name-constraints-ip2.pem
index e6010191a3..dc70e4029f 100644
--- a/tests/cert-tests/data/name-constraints-ip2.pem
+++ b/tests/cert-tests/data/name-constraints-ip2.pem
@@ -57,12 +57,12 @@ X.509 Certificate Information:
 		12:7f:10:02:39:ea:0f:e9:35:66:1c:bc:76:06:dc:6f
 		ea:7d:cb:38:06:3e:0e:d3:fe:9e:21:14:d5:56:23:98
 Other Information:
-	SHA1 fingerprint:
-		9d38c87dafe2a22e0a816bdad933261a1eb36843
-	SHA256 fingerprint:
-		fa9a75cd439042b406a229276ee2c313cc758f95a9f729549a44bb4bd897f863
+	Fingerprint:
+		sha1:9d38c87dafe2a22e0a816bdad933261a1eb36843
+		sha256:fa9a75cd439042b406a229276ee2c313cc758f95a9f729549a44bb4bd897f863
 	Public Key ID:
-		6eb4659b8f1d564e7c09551636eb4c1f6db1c00b
+		sha1:6eb4659b8f1d564e7c09551636eb4c1f6db1c00b
+		sha256:feb180a57b0adeda7b9e29902b7cb0d9818eee8e53fdec881159cc2c73f575c7
 	Public key's random art:
 		+--[ RSA 2048]----+
 		|            .. *=|
diff --git a/tests/cert-tests/data/no-ca-or-pathlen.pem b/tests/cert-tests/data/no-ca-or-pathlen.pem
index b79d874985..80b709f989 100644
--- a/tests/cert-tests/data/no-ca-or-pathlen.pem
+++ b/tests/cert-tests/data/no-ca-or-pathlen.pem
@@ -45,12 +45,12 @@ warning: signed using a broken signature algorithm that can be forged.
 		59:0c:44:ca:ce:ad:77:24:52:b4:78:5f:cc:4f:15:a7
 		8f:20:81:56:65:08:50:37:75:bc:a2:11:82:72:48:76
 Other Information:
-	SHA1 fingerprint:
-		8f735c5ddefd723f59b6a3bb2ac0522470c0182f
-	SHA256 fingerprint:
-		fc5b45b20c489393a457f177572920ac40bacba9d25cea51200822271eaf7d1f
+	Fingerprint:
+		sha1:8f735c5ddefd723f59b6a3bb2ac0522470c0182f
+		sha256:fc5b45b20c489393a457f177572920ac40bacba9d25cea51200822271eaf7d1f
 	Public Key ID:
-		1e09d707d4e3651b84dcb6c68a828d2affef7ec3
+		sha1:1e09d707d4e3651b84dcb6c68a828d2affef7ec3
+		sha256:118e72e3655150c895ecbd19b3634179fb4a87c7a25abefcb11f5d66661d5a4d
 	Public key's random art:
 		+--[ RSA 1024]----+
 		|         .oo +.  |
diff --git a/tests/cert-tests/data/template-tlsfeature.csr b/tests/cert-tests/data/template-tlsfeature.csr
index 997babcd5d..e22bec812c 100644
--- a/tests/cert-tests/data/template-tlsfeature.csr
+++ b/tests/cert-tests/data/template-tlsfeature.csr
@@ -37,7 +37,8 @@ PKCS #10 Certificate Request Information:
 				17
 Other Information:
 	Public Key ID:
-		5d40adf0ce9440958b7e99941d925422ca72365f
+		sha1:5d40adf0ce9440958b7e99941d925422ca72365f
+		sha256:472f7ef457b70a57a585094b285fdaef7ad72553495701ecd4f2a6dcb477b50e
 
 -----BEGIN NEW CERTIFICATE REQUEST-----
 MIICrDCCAhUCAQAwgZoxFTATBgNVBAMTDENpbmR5IExhdXBlcjEXMBUGA1UECxMO
diff --git a/tests/cert-tests/data/very-long-dn.pem b/tests/cert-tests/data/very-long-dn.pem
index 94e6302453..8685d305f3 100644
--- a/tests/cert-tests/data/very-long-dn.pem
+++ b/tests/cert-tests/data/very-long-dn.pem
@@ -47,12 +47,12 @@ X.509 Certificate Information:
 		cc:22:9f:43:0a:5a:fe:07:38:ef:d4:26:14:3d:ac:23
 		46:66:78:27:94:c3:b2:8b:35:e2:f9:f2:63:4e:b0:00
 Other Information:
-	SHA1 fingerprint:
-		a8777344231982af097f0d7074ca7d151d819b70
-	SHA256 fingerprint:
-		8f54c2adbf5b935c2f4e59dad04fec2d483e051a0740a7380dd70992cb0ba9e8
+	Fingerprint:
+		sha1:a8777344231982af097f0d7074ca7d151d819b70
+		sha256:8f54c2adbf5b935c2f4e59dad04fec2d483e051a0740a7380dd70992cb0ba9e8
 	Public Key ID:
-		914b5c4688e78013a7c1953e7780298ffb2174b9
+		sha1:914b5c4688e78013a7c1953e7780298ffb2174b9
+		sha256:2ffa41e756b2e63e1f09231b695d42ffaa1e16b143646b46203e364772cd91f8
 	Public key's random art:
 		+--[ RSA 2048]----+
 		|   .o+o= o+      |
diff --git a/tests/cert-tests/data/xmpp-othername.pem b/tests/cert-tests/data/xmpp-othername.pem
index ae851241ee..519d66bff7 100644
--- a/tests/cert-tests/data/xmpp-othername.pem
+++ b/tests/cert-tests/data/xmpp-othername.pem
@@ -119,12 +119,12 @@ X.509 Certificate Information:
 		8e:96:55:5a:b8:aa:9e:f2:d4:2f:75:c8:c3:ed:71:29
 		0d:50:53:12:27:1d:33:9e:88:ad:e8:d7:5c:5c:e6:25
 Other Information:
-	SHA1 fingerprint:
-		76dd3120fa7875c0be1c02e20c011e44376b4a3c
-	SHA256 fingerprint:
-		814f39ca12a03cc103ad4ed1ff27e7d5f78f67fd83d5be526c5e5a5b790840b8
+	Fingerprint:
+		sha1:76dd3120fa7875c0be1c02e20c011e44376b4a3c
+		sha256:814f39ca12a03cc103ad4ed1ff27e7d5f78f67fd83d5be526c5e5a5b790840b8
 	Public Key ID:
-		8fade0593f112844029a404634863883e7e0030f
+		sha1:8fade0593f112844029a404634863883e7e0030f
+		sha256:47393632a002ae367305fd8e24e3b8925f9aae5cff75ce182be17deb02043fcc
 	Public key's random art:
 		+--[ RSA 4096]----+
 		|OB.....          |
diff --git a/tests/dn2.c b/tests/dn2.c
index 07f72a15c7..b149ccc862 100644
--- a/tests/dn2.c
+++ b/tests/dn2.c
@@ -64,7 +64,7 @@ static char pem[] =
     "/do1TDFI0vSl5+M=\n" "-----END CERTIFICATE-----\n";
 
 static const char *info =
-    "subject `CN=www.gmx.de,O=GMX GmbH,street=Frankfurter Ring 129,L=Muenchen,ST=Bavaria,postalCode=80807,C=DE,serialNumber=HRB 144261,businessCategory=V1.0\\, Clause 5.(b),jurisdictionOfIncorporationLocalityName=Muenchen,jurisdictionOfIncorporationCountryName=DE', issuer `CN=VeriSign Class 3 Extended Validation SSL SGC CA,OU=Terms of use at https://www.verisign.com/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\\, Inc.,C=US', serial 0x48eca1e3c658be04c547c1eca67a6433, RSA key 1024 bits, signed using RSA-SHA1, activated `2008-11-13 00:00:00 UTC', expires `2009-11-13 23:59:59 UTC', SHA-1 fingerprint `7ece297c45d5b17685224b4e929a30e91a9553cb'";
+    "subject `CN=www.gmx.de,O=GMX GmbH,street=Frankfurter Ring 129,L=Muenchen,ST=Bavaria,postalCode=80807,C=DE,serialNumber=HRB 144261,businessCategory=V1.0\\, Clause 5.(b),jurisdictionOfIncorporationLocalityName=Muenchen,jurisdictionOfIncorporationCountryName=DE', issuer `CN=VeriSign Class 3 Extended Validation SSL SGC CA,OU=Terms of use at https://www.verisign.com/rpa (c)06,OU=VeriSign Trust Network,O=VeriSign\\, Inc.,C=US', serial 0x48eca1e3c658be04c547c1eca67a6433, RSA key 1024 bits, signed using RSA-SHA1, activated `2008-11-13 00:00:00 UTC', expires `2009-11-13 23:59:59 UTC', key-ID `sha256:b158e5a008a2a936ce793909598b55c1e35a54f8a32cffd7f792fdea024e4af9'";
 
 void doit(void)
 {