Corrected SHA-1 and SHA-256 fingerprints on all forms and pages.

3 files changed, 11 insertions, 7 deletions

diff --git a/pages/index/3.php b/pages/index/3.php
index 2796e3b..19f0f52 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -25,7 +25,7 @@
 	<li><a href="certs/root_X0F.txt"><?=_("Root Certificate (Text Format)")?></a></li>
 	<li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a></li>
 	<li><?=_("SHA256 fingerprint:")?> 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5</li>
-    <li><?=_("Old SHA1 fingerprint:")?> 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33</li>
+    <li><?=_("SHA1 fingerprint:")?> DDFC DA54 1E75 77AD DCA8 7E88 27A9 8A50 6032 52A5</li>
 </ul>
 
 <h3><?=_("Class 3 PKI Key")?></h3>
@@ -35,7 +35,7 @@
 	<li><a href="certs/class3_X0E.txt"><?=_("Intermediate Certificate (Text Format)")?></a></li>
 	<li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a></li>
     <li><?=_("SHA256 fingerprint:")?> F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</li>
-    <li><?=_("Old SHA1 fingerprint:")?> AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE</li>
+    <li><?=_("SHA1 fingerprint:")?> A7C4 8FBE 6B02 6DBD 0EC1 B465 B88D D813 EE1D EFA0</li>
 </ul>
 
 <h3><?=_("GPG Key")?></h3>
@@ -45,8 +45,10 @@
 	<li><?=_("Fingerprint:")?> A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58</li>
 </ul>
 
+
 <h4><?=_("PKI fingerprint signed by the CAcert GPG Key")?></h4>
-<pre>
+<?php if ( false ) { ?>
+    <pre>
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
@@ -63,6 +65,8 @@ Mch2LMZhK4h/SBIft5ROzVU=
 =R/pJ
 -----END PGP SIGNATURE-----
 </pre>
+<?php } ?>
+
 <pre>
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
diff --git a/www/capnew.php b/www/capnew.php
index 394129c..546b4e2 100644
--- a/www/capnew.php
+++ b/www/capnew.php
@@ -316,8 +316,8 @@ define('CLASS1_SHA256','07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 0
 define('CLASS3_SHA256','F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544');
 /* finger print CAcert Root Key */  // not to use since 2019
 /* finger print CAcert Root Key */ // should obtain this automatically
-define('CLASS1_SHA1','135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33');
-define('CLASS3_SHA1','AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE');
+define('CLASS1_SHA1','DDFC DA54 1E75 77AD DCA8 7E88 27A9 8A50 6032 52A5');
+define('CLASS3_SHA1','A7C4 8FBE 6B02 6DBD 0EC1 B465 B88D D813 EE1D EFA0');
 // next two are not used on the form
 define('CLASS1_MD5','A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B');
 define('CLASS3_MD5','F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42');
diff --git a/www/coapnew.php b/www/coapnew.php
index f703014..866067f 100644
--- a/www/coapnew.php
+++ b/www/coapnew.php
@@ -351,8 +351,8 @@ define('CLASS1_SHA256','07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 0
 define('CLASS3_SHA256','F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544');
 /* finger print CAcert Root Key */  // not to use since 2019
 /* finger print CAcert Root Key */ // should obtain this automatically
-define('CLASS1_SHA1','135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33');
-define('CLASS3_SHA1','AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE');
+define('CLASS1_SHA1','DDFC DA54 1E75 77AD DCA8 7E88 27A9 8A50 6032 52A5');
+define('CLASS3_SHA1','A7C4 8FBE 6B02 6DBD 0EC1 B465 B88D D813 EE1D EFA0');
 // next two are not used on the form
 define('CLASS1_MD5','A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B');
 define('CLASS3_MD5','F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42');