summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2019-03-12 21:07:20 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2019-03-12 21:07:20 +0100
commitc551e10ec84a68b5d8d0458393c1961aed6e07f9 (patch)
tree9d5351c590345bcdeb59a91469041b0a4cf03e40
parentbddeab7b0c31ddcbce9327745bda15bdc4d8763f (diff)
parent36aaf2fa056b415802abe6986b3420ee57d52427 (diff)
downloadcacert-devel-c551e10ec84a68b5d8d0458393c1961aed6e07f9.tar.gz
cacert-devel-c551e10ec84a68b5d8d0458393c1961aed6e07f9.tar.xz
cacert-devel-c551e10ec84a68b5d8d0458393c1961aed6e07f9.zip
Merge branch 'bug-1305' into test-1442
-rw-r--r--includes/general.php2
-rw-r--r--pages/index/feed.rss1
-rw-r--r--www/cap.html.php4
-rw-r--r--www/cap.php2
-rw-r--r--www/capnew.php2
-rw-r--r--www/coap.html.php2
-rw-r--r--www/coapnew.php2
7 files changed, 8 insertions, 7 deletions
diff --git a/includes/general.php b/includes/general.php
index 4728c78..7901226 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -655,7 +655,7 @@
continue;
}
- stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+ stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
fputs($fp, "EHLO www.cacert.org\r\n");
do {
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
index fa6d213..3994c06 100644
--- a/pages/index/feed.rss
+++ b/pages/index/feed.rss
@@ -15,6 +15,7 @@
Merged in children are bug-1442.
Additional changes:
+ 2019-03-12: Recent changes of Brian in bug-1305 (postal address in CAP/COAP forms) are now merged in
2019-03-01: Mail checking re-activated, improvements to error reporting
2019-01-18: Now bug-1305 is fully merged in, not only the cherry picked cap forms as before.
2019-01-03: Disabled mail address checking, so it is possible to create new accounts now
diff --git a/www/cap.html.php b/www/cap.html.php
index b83d52d..971cdbc 100644
--- a/www/cap.html.php
+++ b/www/cap.html.php
@@ -38,9 +38,9 @@
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;">'.'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - <a href="http://www.cacert.org/"> http://www.cacert.org/</a><br></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 '<table border=1 cellspacing="0" cellpadding="0" bordercolor="lightblue" cellpadding="0" cellspacing="0" width="100%" style="color: white; background-color: rgb(112, 154, 186);" rules="groups">', "\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";
diff --git a/www/cap.php b/www/cap.php
index e4eb0e7..b189b18 100644
--- a/www/cap.php
+++ b/www/cap.php
@@ -55,7 +55,7 @@
$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
diff --git a/www/capnew.php b/www/capnew.php
index 7c610ef..394129c 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','CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia');
+define('POBOX','Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia');
define('WEB', 'http://www.cacert.org');
define('WIKI','http://wiki.cacert.org/wiki');
define('ROOTKEYS','http://www.cacert.org/index.php?id=3');
diff --git a/www/coap.html.php b/www/coap.html.php
index 9700afa..8cdb0eb 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;">CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - <a href="http://www.cacert.org/">http://www.cacert.org</a><br></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>
<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 6027893..f703014 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','CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia');
+define('POBOX','Hangar 10 Airfield Avenue, Murwillumbah NSW 2484, New South Wales, (Commonwealth of) Australia ');
define('WEB', 'http://www.cacert.org');
define('WIKI','http://wiki.cacert.org/wiki');
define('ROOTKEYS','http://www.cacert.org/index.php?id=3');