summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-12-16 22:35:38 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-12-16 22:35:38 +0100
commitfeaea6498fe2edbfc7f44b1d73ad86d359df054f (patch)
treee0b5ba5bbab83c5018ec755841e0754c78788e89
parent9c04a028002752f3304f91e1f5c2cb5836870f3b (diff)
downloadcacert-devel-feaea6498fe2edbfc7f44b1d73ad86d359df054f.tar.gz
cacert-devel-feaea6498fe2edbfc7f44b1d73ad86d359df054f.tar.xz
cacert-devel-feaea6498fe2edbfc7f44b1d73ad86d359df054f.zip
Merge pull request #20 from GuKKDevel/bug-1305
corrected the address, and switched from 2-character chunks with colon…
-rw-r--r--pages/index/feed.rss1
-rw-r--r--www/cap.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index a011bfe..1d83be3 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2018-12-16: More changes from bug-1305 (cap forms): CAcert address and fingerprint format
2018-12-12: More changes from bug-1305 (cap forms)
2018-12-01: Once more cherry-picked cap form changes from bug-1305
2018-11-27: Cherry-picked bug-1305 (the cap/coap-forms only)
diff --git a/www/cap.php b/www/cap.php
index 6424271..b189b18 100644
--- a/www/cap.php
+++ b/www/cap.php
@@ -48,14 +48,14 @@
$this->SetFont('Arial','I',8);
if($_SESSION['_config']['language'] == "ja")
$this->SetFont('SJIS','I',8);
- $this->Cell(0,0,'CAcert Inc. - PO Box 66 - Oatley NSW 2223 - Australia - http://www.CAcert.org',0,0,'C');
+ $this->Cell(0,0,'CAcert Inc. - Hangar 10 Airfield Avenue - Murwillumbah NSW 2484 - Australia - http://www.CAcert.org',0,0,'C');
$this->Ln(3);
$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)")),0,0,'C');
$this->ln(3);
- $this->Cell(0,0, recode($_SESSION['_config']['recode'], "SHA1: root: DD:FC:DA:54:1E:75:77:AD:DC:A8:7E:88:27:A9:8A:50:60:32:52:A5 "._("and")." class3: A7:C4:8F:BE:6B:02:6D:BD:0E:C1:B4:65:B8:8D:D8:13:EE:1D:EF:A0"),0,0,'C');
+ $this->Cell(0,0, recode($_SESSION['_config']['recode'], "SHA1: root: DDFC DA54 1E75 77AD DCA8 7E88 27A9 8A50 6032 52A5 "._("and")." class3: A7C4 8FBE 6B02 6DBD 0EC1 B465 B88D D813 EE1D EFA0"),0,0,'C');
$this->ln(3);
$this->Cell(0,0, recode($_SESSION['_config']['recode'], "SHA256: 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); // added 3 points to the abcissa 43 -> 46 to get second line fingerprints