From 37f1c36f3b13c7efa975ad351f2fde8dd4cbecae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl-Heinz=20G=C3=B6dderz=20=28GuKKDevel=29?=
 <Devel@GuKK-Online.de>
Date: Fri, 16 Nov 2018 16:35:36 +0100
Subject: Bug 1305; new cerificates; rename certificates to corresponding
 version; changing pages/index/3 to access the new certs

---
 pages/index/3.php | 56 +++++++++----------------------------------------------
 1 file changed, 9 insertions(+), 47 deletions(-)

(limited to 'pages/index/3.php')

diff --git a/pages/index/3.php b/pages/index/3.php
index af0c0f3..6c6ef80 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -18,66 +18,28 @@
 
 <p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.html'>","</a>")?></p>
 
-<h1><?=_("re-signed versions from 2016 - ")?><a href="https://blog.cacert.org/2016/03/successful-root-re-sign/"><?=_("see blog")?></a></h1>
-<br>
-
 <h3><?=_("Windows Installer") ?></h3>
 <ul class="no_indent">
-	<li><? printf(_("%s Windows installer package %s for browsers that use the Windows certificate store %s (for example Internet Explorer, Chrome on Windows and Safari on Windows)"), '<a href="certs/CAcert_Root_Certificates_256.msi">', '</a>', '<br/>')?></li>
-	<li><?=_("SHA1 Hash:") ?> f27e06391e5cfd87200baa1a0f674a9725516a4f</li>
-	<li><?=_("SHA256 Hash:") ?> 412c5fa846da64a80148f788b5bb0b70517d6f12bfb133ae6a87cc6bd1921b90</li>
+	<li><? printf(_("%s Windows installer package %s for browsers that use the Windows certificate store %s (for example Internet Explorer, Chrome on Windows and Safari on Windows)"), '<a href="certs/CAcert_Root_Certificates_X0F_X0E.msi">', '</a>', '<br/>')?></li>
+	<li><?=_("SHA256 Hash:") ?> 0A87 5483 1472 4971 DB5C 85AF 5B01 92E5 2325 259A 1485 1CEF 4AB9 02EC 70BF A5D5</li>
 </ul>
 
 <h3><?=_("Class 1 PKI Key")?></h3>
 <ul class="no_indent">
-	<li><a href="certs/root_256.crt"><?=_("Root Certificate (PEM Format)")?></a></li>
-	<li><a href="certs/root_256.der"><?=_("Root Certificate (DER Format)")?></a></li>
-	<li><a href="certs/root_256.txt"><?=_("Root Certificate (Text Format)")?></a></li>
+	<li><a href="certs/root_X0F.crt"><?=_("Root Certificate (PEM Format)")?></a></li>
+	<li><a href="certs/root_X0F.der"><?=_("Root Certificate (DER Format)")?></a></li>
+	<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>
 </ul>
 
 <h3><?=_("Class 3 PKI Key")?></h3>
 <ul class="no_indent">
-	<li><a href="certs/class3_256.crt"><?=_("Intermediate Certificate (PEM Format)")?></a></li>
-	<li><a href="certs/class3_256.der"><?=_("Intermediate Certificate (DER Format)")?></a></li>
-	<li><a href="certs/class3_256.txt"><?=_("Intermediate Certificate (Text Format)")?></a></li>
+	<li><a href="certs/class3_X0E.crt"><?=_("Intermediate Certificate (PEM Format)")?></a></li>
+	<li><a href="certs/class3_X0E.der"><?=_("Intermediate Certificate (DER Format)")?></a></li>
+	<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>
-</ul>
-
-<h1><?=_("old versions")?></h1>
-<br>
-
-<h3><?=_("Windows Installer") ?></h3>
-<ul class="no_indent">
-	<li><? printf(_("%s Windows installer package %s for browsers that use the Windows certificate store %s (for example Internet Explorer, Chrome on Windows and Safari on Windows)"), '<a href="certs/CAcert_Root_Certificates.msi">', '</a>', '<br/>')?></li>
-	<li><?=_("SHA1 Hash:") ?> 2db1957db31aa0d778d1a65ea146760ee1e67611</li>
-	<li><?=_("SHA256 Hash:") ?> 88883f2e3117bae6f43922fbaef8501b94efe4143c12116244ca5d0c23bcbb16</li>
-</ul>
-
-<h3><?=_("Class 1 PKI Key")?></h3>
-<ul class="no_indent">
-	<li><a href="certs/root.crt"><?=_("Root Certificate (PEM Format)")?></a></li>
-	<li><a href="certs/root.der"><?=_("Root Certificate (DER Format)")?></a></li>
-	<li><a href="certs/root.txt"><?=_("Root Certificate (Text Format)")?></a></li>
-	<li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/revoke.crl">CRL</a></li>
-	<li><?=_("SHA1 Fingerprint:")?> 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33</li>
-	<li><?=_("MD5 Fingerprint:")?> A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B</li>
-</ul>
-
-<h3><?=_("Class 3 PKI Key")?></h3>
-<ul class="no_indent">
-	<li><a href="certs/class3.crt"><?=_("Intermediate Certificate (PEM Format)")?></a></li>
-	<li><a href="certs/class3.der"><?=_("Intermediate Certificate (DER Format)")?></a></li>
-	<li><a href="certs/class3.txt"><?=_("Intermediate Certificate (Text Format)")?></a></li>
-	<li><a href="<?=$_SERVER['HTTPS']?"https":"http"?>://crl.cacert.org/class3-revoke.crl">CRL</a></li>
-<?php /*
-  class3 subroot fingerprint updated: 2011-05-23  class3 Re-sign project
-  https://wiki.cacert.org/Roots/Class3ResignProcedure/Migration
-*/ ?>
-	<li><?=_("SHA1 Fingerprint:")?> AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE</li>
-	<li><?=_("MD5 Fingerprint:")?> F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42</li>
+    <li><?=_("SHA256 fingerprint:")?> F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</li>
 </ul>
 
 <h3><?=_("GPG Key")?></h3>
-- 
cgit v1.2.1