summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard "Ted" Fröhlich <bernhard@cacert.org>2021-08-07 00:12:12 +0200
committerGitHub <noreply@github.com>2021-08-07 00:12:12 +0200
commit41e7a2134d464bbc387e98d82453f5fd94847150 (patch)
tree02e9a0c851ec2060a82959a424b8e47fcf5dae51
parent05b03d6cb5196f296abde465e3d2ecf1395bc132 (diff)
parentb3f52daa1ce68bb1bbaf23ead1bf34d20496a5e7 (diff)
downloadcacert-devel-41e7a2134d464bbc387e98d82453f5fd94847150.tar.gz
cacert-devel-41e7a2134d464bbc387e98d82453f5fd94847150.tar.xz
cacert-devel-41e7a2134d464bbc387e98d82453f5fd94847150.zip
Merge pull request #25 from eruedin/release
Choosing the "usual" branch naming...
-rw-r--r--www/cap.html.php8
-rw-r--r--www/capnew.php6
-rw-r--r--www/coap.html.php2
-rw-r--r--www/coapnew.php6
4 files changed, 11 insertions, 11 deletions
diff --git a/www/cap.html.php b/www/cap.html.php
index 971cdbc..c2127d8 100644
--- a/www/cap.html.php
+++ b/www/cap.html.php
@@ -38,18 +38,18 @@
echo '<div style="text-align: right;">', "\n";
echo '<big><big><span style="font-weight: bold;">'._("Identity Verification Form (CAP) form").'</span></big></big><br>', "\n";
echo '</div>', "\n";
- echo '<div style="text-align: right;">'.'Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia - <a href="http://www.cacert.org/"> http://www.cacert.org/</a><br></div>', "\n";
+ echo '<div style="text-align: right;">'.'Clos Belmont 2, 1208 Geneva, Switzerland - <a href="http://www.cacert.org/"> http://www.cacert.org/</a><br></div>', "\n";
echo '<table border=1 cellspacing="0" cellpadding="0" bordercolor="lightblue" width="100%" style="color: white; background-color: rgb(112, 154, 186);" rules="groups">', "\n";
echo '<tbody>', "\n";
echo '<tr><td>', "\n";
echo '<tr>', "\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 ' <td align="left"><font size=-7>'._("CAcert's Root Certificate sha256 fingerprints").'</font></td>', "\n";
+ echo ' <td align="right"><font size=-7>class 1 (2019): 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: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544</font></td>', "\n";
+ echo ' <td align="right"><font size=-7>class 3 (2021): 1BC5 A61A 2C0C 0132 C52B 284F 3DA0 D8DA CF71 7A0F 6C1D DF81 D80B 36EE E444 2869</font></td>', "\n";
echo '<tr>', "\n";
echo '</font>', "\n";
echo '</td>', "\n";
diff --git a/www/capnew.php b/www/capnew.php
index 546b4e2..07c74bb 100644
--- a/www/capnew.php
+++ b/www/capnew.php
@@ -297,7 +297,7 @@ define('LLBLUE','#D6E2EB'); // lighhter blue RGB 173 197 215
define('LIME', '#C7FF00'); // RGB 199 255 0
define('GREEN', '#00BE00'); // 0 190 0
-define('POBOX','Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia');
+define('POBOX','Clos Belmont 2, 1208 Genève, Suisse');
define('WEB', 'http://www.cacert.org');
define('WIKI','http://wiki.cacert.org/wiki');
define('ROOTKEYS','http://www.cacert.org/index.php?id=3');
@@ -313,11 +313,11 @@ 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');
+define('CLASS3_SHA256','1BC5 A61A 2C0C 0132 C52B 284F 3DA0 D8DA CF71 7A0F 6C1D DF81 D80B 36EE E444 2869');
/* finger print CAcert Root Key */ // not to use since 2019
/* finger print CAcert Root Key */ // should obtain this automatically
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');
+define('CLASS3_SHA1','D8A8 3A64 117F FD21 94FE E198 3DD2 5C7B 32A8 FFC8');
// 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/coap.html.php b/www/coap.html.php
index 8cdb0eb..90583bc 100644
--- a/www/coap.html.php
+++ b/www/coap.html.php
@@ -49,7 +49,7 @@ table#TAB1 td { border: 0 }
echo '<big><big><span style="font-weight: bold;">'._("Organisation Information (COAP) form").'</span></big></big><br>', "\n";
?>
</div>
-<div style="text-align: right;">Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia - <a href="http://www.cacert.org/">http://www.cacert.org</a><br></div>
+<div style="text-align: right;">Clos Belmont 2, 1208 Geneve, Switzerland - <a href="http://www.cacert.org/">http://www.cacert.org</a><br></div>
<br>
<table style="border-bottom: solid; border-color: rgb(17, 86, 140)" cellspacing="0" cellpadding="0" width="100%">
<tbody>
diff --git a/www/coapnew.php b/www/coapnew.php
index 866067f..f1b8121 100644
--- a/www/coapnew.php
+++ b/www/coapnew.php
@@ -332,7 +332,7 @@ define('LLBLUE','#D6E2EB'); // lighhter blue RGB 173 197 215
define('LIME', '#C7FF00'); // RGB 199 255 0
define('GREEN', '#00BE00'); // 0 190 0
-define('POBOX','Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia ');
+define('POBOX','Clos Belmont 2, 1208 Genève, Suisse ');
define('WEB', 'http://www.cacert.org');
define('WIKI','http://wiki.cacert.org/wiki');
define('ROOTKEYS','http://www.cacert.org/index.php?id=3');
@@ -348,11 +348,11 @@ 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');
+define('CLASS3_SHA256','1BC5 A61A 2C0C 0132 C52B 284F 3DA0 D8DA CF71 7A0F 6C1D DF81 D80B 36EE E444 2869');
/* finger print CAcert Root Key */ // not to use since 2019
/* finger print CAcert Root Key */ // should obtain this automatically
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');
+define('CLASS3_SHA1','D8A8 3A64 117F FD21 94FE E198 3DD2 5C7B 32A8 FFC8');
// 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');