summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl-Heinz Gödderz (GuKKDevel) <Devel@GuKK-Online.de>2018-11-20 11:08:15 +0100
committerKarl-Heinz Gödderz (GuKKDevel) <Devel@GuKK-Online.de>2018-11-20 11:08:15 +0100
commit603c86571e0630a5f88da4ca15c5f1b86f1c3b44 (patch)
treeef732e59dcd916a2d03bf1f9d6d1402baf45c2fe
parent37f1c36f3b13c7efa975ad351f2fde8dd4cbecae (diff)
downloadcacert-devel-603c86571e0630a5f88da4ca15c5f1b86f1c3b44.tar.gz
cacert-devel-603c86571e0630a5f88da4ca15c5f1b86f1c3b44.tar.xz
cacert-devel-603c86571e0630a5f88da4ca15c5f1b86f1c3b44.zip
Bug 1305; new root certs; implementing the new fingerprints to CAP-form and COAP-form
-rw-r--r--www/cap.html.php6
-rw-r--r--www/cap.php2
-rw-r--r--www/capnew.php6
-rw-r--r--www/coap.html.php6
-rw-r--r--www/coapnew.php6
5 files changed, 17 insertions, 9 deletions
diff --git a/www/cap.html.php b/www/cap.html.php
index 3522f1c..b83d52d 100644
--- a/www/cap.html.php
+++ b/www/cap.html.php
@@ -44,12 +44,12 @@
echo '<tbody>', "\n";
echo '<tr><td>', "\n";
echo '<tr>', "\n";
- echo ' <td align="left"><font size=-7>'._("CAcert's Root Certificate sha1 fingerprints").'</font></td>', "\n";
- echo ' <td align="right"><font size=-7>class 1: 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33</font></td>', "\n";
+ echo ' <td align="left"><font size=-7>'._("CAcert's Root Certificate sha256 fingerprints (since 2019)").'</font></td>', "\n";
+ echo ' <td align="right"><font size=-7>class 1: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5</font></td>', "\n";
echo '</tr>', "\n";
echo '<tr>', "\n";
echo ' <td></td>', "\n";
- echo ' <td align="right"><font size=-7>class 3: AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE</font></td>', "\n";
+ echo ' <td align="right"><font size=-7>class 3: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</font></td>', "\n";
echo '<tr>', "\n";
echo '</font>', "\n";
echo '</td>', "\n";
diff --git a/www/cap.php b/www/cap.php
index 40b269a..d9301a7 100644
--- a/www/cap.php
+++ b/www/cap.php
@@ -53,7 +53,7 @@
$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")).": A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B "._("and")." 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33",0,0,'C');
+ $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->SetLineWidth(0.05);
$this->Line(1, 43, $this->w - 1, 43);
$this->SetLineWidth(0.2);
diff --git a/www/capnew.php b/www/capnew.php
index a57bde3..7c610ef 100644
--- a/www/capnew.php
+++ b/www/capnew.php
@@ -311,6 +311,10 @@ define('ARBIT', WIKI.'/ArbitrationForum');
define('CCA', 'CAcertCommunityAgreement'); // default policy to print
define('POLICY','policy/'); // default polciy doc directory
define('EXT','.html'); // default polciy doc extention, should be html
+/* finger print CAcert Root Key SHA256 since 2019*/ // should obtain this automatically
+define('CLASS1_SHA256','07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5');
+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');
@@ -918,7 +922,7 @@ class CAPPDF extends TCPDF {
$this->SetXY($savex,$savey);
// sha1 fingerprint CAcert rootkeys class 1 and class 3
- $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha1 fingerprints") ) . ', class 1: '. CLASS1_SHA1 . ', class 3: ' . CLASS3_SHA1;
+ $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha256 fingerprints (since 2019)") ) . ', class 1: '. CLASS1_SHA256 . ', class 3: ' . CLASS3_SHA256;
$this->Ln(3); $this->SetX($this->lMargin);
$this->SetFont(FONT,'',F_SIZE * $this->colwidth / ($this->GetStringWidth($strg) +1));
$this->Cell($this->colwidth,10, $strg,0,0,'C',0,NULL);
diff --git a/www/coap.html.php b/www/coap.html.php
index fdc186e..9700afa 100644
--- a/www/coap.html.php
+++ b/www/coap.html.php
@@ -55,13 +55,13 @@ table#TAB1 td { border: 0 }
<tbody>
<tr>
<?php
- echo ' <td border=0 align="left"><font size=-7>'._("CAcert's Root Certificate sha1 fingerprints").'</font></td>', "\n";
+ echo ' <td border=0 align="left"><font size=-7>'._("CAcert's Root Certificate sha256 fingerprints (since 2019)").'</font></td>', "\n";
?>
- <td border=0 align="right"><font size=-7>class 1: 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33</font></td>
+ <td border=0 align="right"><font size=-7>class 1: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5</font></td>
</tr>
<tr>
<td border=0></td>
- <td border=0 align="right"><font size=-7>class 3: AD7C 3F64 FC44 39FE F4E9 0BE8 F47C 6CFA 8AAD FDCE</font></td>
+ <td border=0 align="right"><font size=-7>class 3: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</font></td>
<tr>
</font>
</td>
diff --git a/www/coapnew.php b/www/coapnew.php
index 832e397..6027893 100644
--- a/www/coapnew.php
+++ b/www/coapnew.php
@@ -346,6 +346,10 @@ define('ARBIT', WIKI."/ArbitrationForum");
define('CCA', "CAcertCommunityAgreement"); // default policy to print
define('POLICY','policy/'); // default polciy doc directory
define('EXT','.html'); // default polciy doc extention, should be html
+/* finger print CAcert Root Key SHA256 since 2019*/ // should obtain this automatically
+define('CLASS1_SHA256','07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5');
+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');
@@ -935,7 +939,7 @@ class COAPPDF extends TCPDF {
$this->SetXY($savex,$savey);
// sha1 fingerprint CAcert rootkeys class 1 and class 3
- $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha1 fingerprints") ) . ", class 1: ". CLASS1_SHA1 . ", class 3: " . CLASS3_SHA1;
+ $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha256 fingerprints") ) . ", class 1: ". CLASS1_SHA256 . ", class 3: " . CLASS3_SHA256;
$this->Ln(3); $this->SetX($this->lMargin);
$this->SetFont(FONT,'',F_SIZE * $this->colwidth / ($this->GetStringWidth($strg) +1));
$this->Cell($this->colwidth,10, $strg,0,0,'C',0,NULL);