summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl-Heinz Gödderz <Devel@GuKK-Online.de>2018-12-01 16:27:47 +0100
committerGitHub <noreply@github.com>2018-12-01 16:27:47 +0100
commitdf87e1f457c9da5d7be694d010a16b7657a86882 (patch)
tree35a1c023a6cce9fa89bcb7d50c60ae48ebc33c49
parent5b9e096aed8a5a36b2ded962a0a4073cf01b80f4 (diff)
parentf0b1d8c489f941ae1f1bf223756e4d5993b54be1 (diff)
downloadcacert-devel-df87e1f457c9da5d7be694d010a16b7657a86882.tar.gz
cacert-devel-df87e1f457c9da5d7be694d010a16b7657a86882.tar.xz
cacert-devel-df87e1f457c9da5d7be694d010a16b7657a86882.zip
Merge pull request #18 from GuKKDevel/bug-1305
Bug 1305; new certs; deleted entry for windows installer .msi-file and CAP-form fingerprint-line split into two
-rw-r--r--pages/index/3.php6
-rw-r--r--www/cap.php4
2 files changed, 3 insertions, 7 deletions
diff --git a/pages/index/3.php b/pages/index/3.php
index 6c6ef80..044d4fd 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -18,12 +18,6 @@
<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>
-<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_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_X0F.crt"><?=_("Root Certificate (PEM Format)")?></a></li>
diff --git a/www/cap.php b/www/cap.php
index d9301a7..fd0a22e 100644
--- a/www/cap.php
+++ b/www/cap.php
@@ -53,7 +53,9 @@
$this->SetFont('Arial','',6);
if($_SESSION['_config']['language'] == "ja")
$this->SetFont('SJIS','',6);
- $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints (since 2019)")).": 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5 "._("and")." F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544",0,0,'C');
+ $this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints (since 2019)")),0,0,'C');
+ $this->ln(3);
+ $this->Cell(0,0, recode($_SESSION['_config']['recode'], "root: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5 "._("and")." class3: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544"),0,0,'C');
$this->SetLineWidth(0.05);
$this->Line(1, 43, $this->w - 1, 43);
$this->SetLineWidth(0.2);