summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/.gitignore5
-rw-r--r--www/ac.php11
-rw-r--r--www/account.php13
-rw-r--r--www/alert_hash_collision.php8
-rw-r--r--www/api/ccsr.php109
-rw-r--r--www/api/cemails.php48
-rw-r--r--www/api/edu.php2
l---------www/cacert1-class3-revoke.crl1
l---------www/cacert1-revoke.crl1
-rw-r--r--www/cats/cats_import.php22
-rw-r--r--www/certs/cacert.asc55
-rw-r--r--www/certs/class3.crt81
-rw-r--r--www/certs/class3.derbin1885 -> 1926 bytes
-rw-r--r--www/certs/class3.txt227
-rw-r--r--www/certs/root.crt80
-rw-r--r--www/certs/root.derbin1857 -> 1963 bytes
-rw-r--r--www/certs/root.txt241
-rw-r--r--www/disputes.php24
-rw-r--r--www/gpg.php438
-rw-r--r--www/images/cacert4.pngbin6421 -> 17565 bytes
-rw-r--r--www/index.php73
-rw-r--r--www/robots.txt3
-rw-r--r--www/stats.php18
-rw-r--r--www/styles/default.css56
-rw-r--r--www/tverify/seclayer.php27
-rw-r--r--www/verify.php4
-rw-r--r--www/wot.php142
27 files changed, 1004 insertions, 685 deletions
diff --git a/www/.gitignore b/www/.gitignore
new file mode 100644
index 0000000..faca589
--- /dev/null
+++ b/www/.gitignore
@@ -0,0 +1,5 @@
+# Ignore CRLs autogenerated by the CommModule
+/class3-revoke.crl
+/class3-revoke.crl.patch
+/revoke.crl
+/revoke.crl.patch
diff --git a/www/ac.php b/www/ac.php
index fe8ac18..b997d94 100644
--- a/www/ac.php
+++ b/www/ac.php
@@ -17,7 +17,7 @@
*/
header('Content-Type: text/html; charset=UTF-8');
- if($_REQUEST['i'] != "")
+ if(isset($_REQUEST['i']) && $_REQUEST['i'] != "")
echo "<html><body><script language=\"JavaScript\"><!--\n";
$s = mysql_real_escape_string($_REQUEST['s']);
@@ -27,15 +27,16 @@
$bits = explode(",", $s);
- $loc = trim(mysql_real_escape_string($bits['0']));
- $reg = trim(mysql_real_escape_string($bits['1']));
- $ccname = trim(mysql_real_escape_string($bits['2']));
+ $loc = trim(mysql_real_escape_string($bits[0]));
+ $reg = trim(mysql_real_escape_string(isset($bits[1])?$bits[1]:""));
+ $ccname = trim(mysql_real_escape_string(isset($bits[2])?$bits[2]:""));
$query = "select `locations`.`id` as `locid`, `locations`.`name` as `locname`, `regions`.`name` as `regname`,
`countries`.`name` as `ccname` from `locations`, `regions`, `countries` where
`locations`.`name` like '$loc%' and `regions`.`name` like '$reg%' and `countries`.`name` like '$ccname%' and
`locations`.`regid`=`regions`.`id` and `locations`.`ccid`=`countries`.`id`
order by `locations`.`acount` DESC, `locations`.`name` ASC limit 10";
$res = mysql_query($query);
+ $rc = 0;
while($row = mysql_fetch_assoc($res))
{
$rc++;
@@ -45,7 +46,7 @@
}
echo ");";
- if($_REQUEST['i'] != "")
+ if(isset($_REQUEST['i']) && $_REQUEST['i'] != "")
echo "\n\n// -->\n</script></body></html>";
exit;
diff --git a/www/account.php b/www/account.php
index c7f34a3..8dbf7a5 100644
--- a/www/account.php
+++ b/www/account.php
@@ -1,6 +1,6 @@
<? /*
LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
+ Copyright (C) 2004-2015 CAcert Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -54,17 +54,6 @@
exit;
}
- } else if($id == 51 && $_GET['img'] == "show") {
- $query = "select * from `tverify` where `id`='".intval($_GET['photoid'])."' and `modified`=0";
- $res = mysql_query($query);
- if(mysql_num_rows($res))
- {
- $row = mysql_fetch_assoc($res);
- readfile($row['photoid']);
- } else {
- die("No such file.");
- }
- exit;
} else if ($id == 37) {
$protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
$newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs';
diff --git a/www/alert_hash_collision.php b/www/alert_hash_collision.php
index bad60e8..f5eaa9c 100644
--- a/www/alert_hash_collision.php
+++ b/www/alert_hash_collision.php
@@ -14,13 +14,13 @@ if (!preg_match('/^(mem|org)-[0-9]+$/', @$_POST['usernym']))
if (preg_match('/^mem-[0-9]+$/', @$_POST['usernym']))
{
- mysql_query("update emailcerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
- mysql_query("update domaincerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
+ mysql_query("update emailcerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
+ mysql_query("update domaincerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
}
else
{
- mysql_query("update orgemailcerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
- mysql_query("update orgdomaincerts set coll_found=1 where memid='".mysql_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
+ mysql_query("update orgemailcerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
+ mysql_query("update orgdomaincerts set coll_found=1 where memid='".mysql_real_escape_string(substr(@$_POST['usernym'],4))."' and pkhash!='' and pkhash='".$_POST['pkhash']."';");
}
//exec(REPORT_WEAK . ' ' . $_POST['usernym'] . ' ' . lower($_POST['pkhash']));
diff --git a/www/api/ccsr.php b/www/api/ccsr.php
deleted file mode 100644
index 3bfe55a..0000000
--- a/www/api/ccsr.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<? /*
- LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-require_once '../../includes/lib/check_weak_key.php';
-
- $username = mysql_real_escape_string($_REQUEST['username']);
- $password = mysql_real_escape_string($_REQUEST['password']);
-
- $query = "select * from `users` where `email`='$username' and (`password`=old_password('$password') or `password`=sha1('$password'))";
- $res = mysql_query($query);
- if(mysql_num_rows($res) != 1)
- die("403,That username couldn't be found\n");
- $user = mysql_fetch_assoc($res);
- $memid = $user['id'];
- $emails = array();
- foreach($_REQUEST['email'] as $email)
- {
- $email = mysql_real_escape_string(trim($email));
- $query = "select * from `email` where `memid`='".intval($memid)."' and `hash`='' and `deleted`=0 and `email`='$email'";
- $res = mysql_query($query);
- if(mysql_num_rows($res) > 0)
- {
- $row = mysql_fetch_assoc($res);
- $id = $row['id'];
- $emails[$id] = $email;
- }
- }
- if(count($emails) <= 0)
- die("404,Wasn't able to match any emails sent against your account");
- $query = "select sum(`points`) as `points` from `notary` where `to`='".intval($memid)."' and `notary`.`deleted`=0 group by `to`";
- $row = mysql_fetch_assoc(mysql_query($query));
- $points = $row['points'];
-
- $name = "CAcert WoT User\n";
- $newname = mysql_real_escape_string(trim($_REQUEST['name']));
- if($points >= 50)
- {
- if($newname == $user['fname']." ".$user['lname'] ||
- $newname == $user['fname']." ".$user['mname']." ".$user['lname'] ||
- $newname == $user['fname']." ".$user['lname']." ".$user['suffix'] ||
- $newname == $user['fname']." ".$user['mname']." ".$user['lname']." ".$user['suffix'])
- $name = $newname;
- }
-
- $codesign = 0;
- if($user['codesign'] == "1" && $_REQUEST['codesign'] == "1" && $points >= 100)
- $codesign = 1;
-
- $CSR = trim($_REQUEST['optionalCSR']);
-
- if (($weakKey = checkWeakKeyCSR($CSR)) !== "")
- {
- die("403, $weakKey");
- }
-
- $incsr = tempnam("/tmp", "ccsrIn");
- $checkedcsr = tempnam("/tmp", "ccsrOut");
- $fp = fopen($incsr, "w");
- fputs($fp, $CSR);
- fclose($fp);
- $incsr_esc = escapeshellarg($incsr);
- $checkedcsr_esc = escapeshellarg($checkedcsr);
- $do = shell_exec("/usr/bin/openssl req -in $incsr_esc -out $checkedcsr_esc");
- @unlink($incsr);
- if(filesize($checkedcsr) <= 0)
- die("404,Invalid or missing CSR");
-
- $csrsubject = "/CN=$name";
- foreach($emails as $id => $email)
- $csrsubject .= "/emailAddress=".$email;
-
- $query = "insert into `emailcerts` set `CN`='".mysql_real_escape_string($user['email'])."', `keytype`='MS',
- `memid`='".intval($user['id'])."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
- `subject`='".mysql_real_escape_string($csrsubject)."', `codesign`='".intval($codesign)."'";
- mysql_query($query);
- $certid = mysql_insert_id();
- $CSRname = generatecertpath("csr","client",$certid);
- rename($checkedcsr, $CSRname);
-
- mysql_query("update `emailcerts` set `csr_name`='$CSRname' where `id`='$certid'");
-
- foreach($emails as $emailid => $email)
- mysql_query("insert into `emaillink` set `emailcertsid`='$certid', `emailid`='".intval($emailid)."'");
-
- $do = shell_exec("../../scripts/runclient");
- sleep(10); // THIS IS BROKEN AND SHOULD BE FIXED
- $query = "select * from `emailcerts` where `id`='$certid' and `crt_name` != ''";
- $res = mysql_query($query);
- if(mysql_num_rows($res) <= 0)
- die("404,Your certificate request has failed. ID: ".intval($certid));
- $cert = mysql_fetch_assoc($res);
- echo "200,Authentication Ok\n";
- readfile("../".$cert['crt_name']);
-?>
diff --git a/www/api/cemails.php b/www/api/cemails.php
deleted file mode 100644
index f937069..0000000
--- a/www/api/cemails.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<? /*
- LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
- $username = mysql_escape_string($_REQUEST['username']);
- $password = mysql_escape_string($_REQUEST['password']);
-
- $query = "select * from `users` where `email`='$username' and (`password`=old_password('$password') or `password`=sha1('$password'))";
- $res = mysql_query($query);
- if(mysql_num_rows($res) != 1)
- die("403,That username couldn't be found\n");
- echo "200,Authentication Ok\n";
- $user = mysql_fetch_assoc($res);
- $memid = $user['id'];
- $query = "select sum(`points`) as `points` from `notary` where `to`='".intval($memid)."' and `notary`.`deleted`=0 group by `to`";
- $row = mysql_fetch_assoc(mysql_query($query));
- $points = $row['points'];
- echo "CS=".intval($user['codesign'])."\n";
- echo "NAME=CAcert WoT User\n";
- if($points >= 50)
- {
- echo "NAME=".sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])."\n";
- if($user['mname'] != "")
- echo "NAME=".sanitizeHTML($user['fname'])." ".sanitizeHTML($user['mname'])." ".sanitizeHTML($user['lname'])."\n";
- if($user['suffix'] != "")
- echo "NAME=".sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])." ".sanitizeHTML($user['suffix'])."\n";
- if($user['mname'] != "" && $user['suffix'] != "")
- echo "NAME=".sanitizeHTML($user['fname'])." ".sanitizeHTML($user['mname'])." ".sanitizeHTML($user['lname'])." ".sanitizeHTML($user['suffix'])."\n";
- }
- $query = "select * from `email` where `memid`='".intval($memid)."' and `hash`='' and `deleted`=0";
- $res = mysql_query($query);
- while($row = mysql_fetch_assoc($res)) {
- echo "EMAIL=".sanitizeHTML($row['email'])."\n";
- }
-?>
diff --git a/www/api/edu.php b/www/api/edu.php
index 27b7b1b..80a4e79 100644
--- a/www/api/edu.php
+++ b/www/api/edu.php
@@ -20,7 +20,7 @@
if ($ipadress=='72.36.220.19' && $_SERVER['HTTPS']=="on")
{
- $serial=mysql_escape_string($_REQUEST["serial"]);
+ $serial=mysql_real_escape_string($_REQUEST["serial"]);
$root=intval($_REQUEST["root"]);
$sql="select memid from emailcerts where serial='$serial' and rootcert='$root'";
diff --git a/www/cacert1-class3-revoke.crl b/www/cacert1-class3-revoke.crl
new file mode 120000
index 0000000..3bcd255
--- /dev/null
+++ b/www/cacert1-class3-revoke.crl
@@ -0,0 +1 @@
+class3-revoke.crl \ No newline at end of file
diff --git a/www/cacert1-revoke.crl b/www/cacert1-revoke.crl
new file mode 120000
index 0000000..e7b822f
--- /dev/null
+++ b/www/cacert1-revoke.crl
@@ -0,0 +1 @@
+revoke.crl \ No newline at end of file
diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php
index feb92d4..218e715 100644
--- a/www/cats/cats_import.php
+++ b/www/cats/cats_import.php
@@ -19,8 +19,8 @@
// Comment (to be romeved): better to disable shot open tags in php.ini
/*
- cats_import.php
-
+ cats_import.php
+
API for CATS to import passed tests into main CAcert database.
*/
@@ -31,8 +31,10 @@ function sanitize_string($buffer) {
}
define ('UNDEFINED', 'nd');
-define ('ALLOWED_IP', '213.154.225.243');
-define ('ALLOWED_IP2', '172.16.2.27');
+// Specific for testserver: Accept Test-CATS-Server
+define ('ALLOWED_IP', '172.16.2.10');
+//define ('ALLOWED_IP', '213.154.225.243');
+define ('ALLOWED_IP2', '192.109.159.28');
define ('CONFIG_FILEPATH', '/www/');
$remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED;
@@ -45,10 +47,10 @@ $access = FALSE;
// Access only from CATS.cacert.org with a client certificate for cats@cacert.org
if (
($remote_addr == ALLOWED_IP || $remote_addr == ALLOWED_IP2) &&
- $https == 'on' &&
- // Comment (to be romeved): better to use preg_match matching the end of the line (since this is on the end of the line right?)
- // Ted: Is this specified? I don't think so, therefore I'd keep stristr
- strlen(stristr($ssl_client_s_dn, '/emailAddress=cats@cacert.org')) > 0
+ $https == 'on' &&
+ // This should match the email element at the start, the end, or somewhere in the middle,
+ // and accept slashes (old convention) as well as commas (new convention) as delimiters
+ preg_match("/(^|,|\/)emailAddress=cats@cacert.org(,|\/|$)/", $ssl_client_s_dn)
) $access = TRUE;
if ($access !== TRUE) {
@@ -83,7 +85,7 @@ if (get_magic_quotes_gpc()) {
$variant = $_POST['variant'];
$date = $_POST['date'];
}
-
+
// Explicitly select all those IDs so I can insert new rows if needed.
$query = mysql_query('SELECT `id` FROM `cats_type` WHERE `type_text` = \''.mysql_real_escape_string($type).'\';');
if (!$query) {
@@ -162,6 +164,6 @@ if (!fix_assurer_flag($userID)) {
exit();
}
-echo 'OK'."\r\n";
+echo 'OK'."\r\n";
?>
diff --git a/www/certs/cacert.asc b/www/certs/cacert.asc
index 120f516..e526392 100644
--- a/www/certs/cacert.asc
+++ b/www/certs/cacert.asc
@@ -1,30 +1,31 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.2 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
-mQGiBD8OdRwRBACEr0/NPA88qp8f6KyIMMveLQ1FOuLi0aDQDPybG7u1nrBoi3VI
-tSRyfYcdExVxWQjTGd9qbShzXBw2DsxjA6YjiGzWKpVcqtj9uUDpSlylBaoadUzu
-Sf3r3IkOHR2QJeC+9v2il30xy5XLMxDRbQYaSmf4uwTlIOUWNn118KpdawCgoNny
-p4DR9EvRgCmY5z6IKHA2WscD/AhAKDVHCIAoZHzSB/puNOuVUSKRbIWNAqUAYosz
-GRzYWb8O/3Ja4fNb3IMQ1gIsEcnUJFHnzID3pTjqWyiCId/NSX3fLuQxZHZE9n8P
-PqlZIvqMrOfCT0RJQa0zTFcrgepnmnHLj7qmtXQZm+YkTvlihOZNtVA4JNzrxDrQ
-egkqA/4hr0LezNJfkUhWnbW604p7AmmKK7Hi/ZixAfnxN0adgnV7oC3Q4VM8aB2i
-gReSuifluHiaJmf/WsA3KH4bdyLRbagz6dOPkXY8bQKy9yRxQz9oYwudlluYoZXe
-gSQI2Jle9U2ENefa9ouvVlsB0he1qzF6VzHXAXpLsANt5smDh7Q0Q0EgQ2VydCBT
-aWduaW5nIEF1dGhvcml0eSAoUm9vdCBDQSkgPGdwZ0BjYWNlcnQub3JnPohfBBMR
-AgAfBQI/DnUcBQk4ZAkABAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDSuw0BZdD9WEFX
-AJ9C6WBcYfTYw1uvZ+N85TPGG5PMKQCcCM1tyULC5J6pfwevywS6cEwfagW5Ag0E
-Pw51MBAIANUbl1u0j+mnVJk1fKbJ+Ul6SAYpNtordfgrgrmlnOhMCFcROrCzsaaI
-1ehohxMbTnIj0RP0g/KotahAurqB98qzHIxXZMEJSzBE2OCNvlIXqUyT1jwhAUN6
-e71s084Lml84gD4cIr7+2YtwIu+6zrE+YdjfMT1NibM3vmiXaknrk4aADb02ZS5U
-iDeRstUO5PG7qVg4umR0HZJ1Ck2U7Kdjaekzzlm0q/vYMZKTYX37NkZRUU0QFLsM
-tACEaZnwKf9hMAWJwG1OFyJeLVH8xvzCkI4I+fpAvAQj6LVAh41SHl7EivH6SiTp
-/+61idoz/CGqeLBxuex6Z+Y53U54FmcAAwUH/2chzBs1YWFX5LuLGEW3R3UW/wDb
-RnYpsSR+pnMBVh18WS0nF08R/SXtb12RsqN5H+GtELOZng6IWL5hhgNaYvF1F4sW
-Ezm2nyVmTsu7/DtHLmXtzz1oNLQ9pzJkoqP2pGtPYQKvmiuoNbt+l1prwjt5zn1D
-slLn8w0+9/PP1YdKpuZ/189yQP6iYsLHxBxg/50MbSzoFwiT22aJCdF+OJ7zRwDy
-GhjnfV7HVwdEDV5rvb7aRolRmZZF2UADSPu52BWT4PI0nVnewAgivyELqVU3Zc3P
-aWqmH5BAh22MjbsbXrWZXK/WOfZCNlPVdfHxwFGxnlwsHgmyrkPAs3szJGiITAQY
-EQIADAUCPw51MAUJOGQJAAAKCRDSuw0BZdD9WMw8AJwIVUzB2WQJGAbf/aXzCABn
-QWdKwACdEWUSf69RZiJgp4oMfXMx0fDEh2I=
-=OaPO
+mQGiBE3TAtQRBACuFhUNT3BOIXflZx8ENFN2hf0KHDgReWMW5+hcx8M2C9mueAST
+89x0QxtdWUbsrMFSr3UvDIKjoPFVzV+WT/dez5aADSrnR4OxYPfzcNIWPjm8su/9
+HrH6+ivaH+iOoBOuhYrHthun+1fsqLedhTMNqb+tt6OfzqIuyFkmpm+FqwCg5ECF
+s53E7j6BJuKYLeWqFDqFOH0D/1pnXyBF78YurXcwwA7eSQWoc3f1g5lwyqOWwcLv
+ynI/dcPV5BosEUcqEjaNEyBR0LFRZC7tnw2VLPzr65aLA6SrFqEJ2bEdWkO9vM5g
+8InhmcqTz7Yg/QGnyGT0iNBMG8zg4Ajz20Ty6GE887HMao6qpYKXSbujMRWVjVLn
+VjpgA/9i1gsBjpGwr5rJ67dyDLVkJ5XMEP2ivgAhzKQ/inyLk2N3Nbm0YKWgrZRE
++pEcZVsLn2jHqd5yu1zVr3Cm44HHaB/A4ew+hRio9vbhJy7cfanfZpAL8Rg8wZbQ
+t4x6zvrs0fXXNuD1BiSucOK4qGZ2vWukggmhAlHu5x5hws5qtbRLQ0FjZXJ0IFRl
+c3QgU2VydmVyIFNpZ25pbmcgQXV0aG9yaXR5IChmb3IgdGVzdGluZyBvbmx5ISEh
+KSA8Z3BnQGNhY2VydC5vcmc+iGYEExECACYFAk3TAtQCGwMFCSWYBgAGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgAAKCRBL5zSBd/dRrLxrAJ9kaSLRAlcy9e57yuAAxoZy
+weX20ACg44B1AA26G0OePf9o3YBdUTjPsES5Ag0ETdMC1BAIAI9UEZ2NKbJfVWc+
+CBb5kKhO6qazLDnRsRkMY5WE1PTBP09ieAaQ7cv424e6fKdZxSO5vUQ27tLmcQXo
+ICoREsDuSyESvEPbyBOro5LIY+z52TihqEHLPUN7OxlbPLX81AIKOCgEIUtpcYoX
+MiwXPVO50Swo3PCCQiOQ7ewvkd32ZbSPl50B+/59JiDsQsnx1o+Ls7WkALzQ6w7T
+UxLIVYWuFd9Hg/VOXBH67e81p/O7SDy6pMkDQaA9F22rA5Vv5TBJ2BAKWYfYK47i
+HxtUhw2/WBUzhcw2AGqCnCy9nrYELLAqljnlCdWLyvhuWyUAG87D/1/5qD0+9idh
+jcFWH/MAAwUH/2R7AWSZzbomxTcO5Q7/WxzTDtgUEy7eRbjqFMAusiQlTYDdeHz8
+PfWok6mGhUapJaGnA05hy6aYBIzl4idmQgz39xD47O0qeDWve6YwrDuLYju6JIwv
+YfNiNAOjrZcRW4PCYeJfIK0WHV3+3kkneOX4Mql9QNKWs5W2LReMnHyq6POWasuf
+EgDu0TfqaJTeK3IXKrEJI8G4R4xdHXmZ16Is5T49w09mvMan+TTGczzjWn0aWD3D
+DOlTKK7h+82MSNCTiCi7aNoEyMTfeadSsrbqiaqtF0P/fyBDpGWFj3/A4foAcgtx
+KVt0UHf1Va1g8M+czG3pCOne6dyafZGAe7qITwQYEQIADwUCTdMC1AIbDAUJJZgG
+AAAKCRBL5zSBd/dRrAC5AKDdxp26zp4Km3jItBdeMD/gv8qxMgCgmmH1kizLe5Rk
+yYchS2oleEWXIqM=
+=9tD2
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/www/certs/class3.crt b/www/certs/class3.crt
index 087ca0e..1899afb 100644
--- a/www/certs/class3.crt
+++ b/www/certs/class3.crt
@@ -1,42 +1,43 @@
-----BEGIN CERTIFICATE-----
-MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv
-b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU
-MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0
-Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a
-iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1
-aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C
-jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia
-pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0
-FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt
-XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL
-oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6
-R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp
-rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/
-LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA
-BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow
-gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV
-BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG
-A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
-c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH
-AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr
-BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB
-MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y
-Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj
-ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5
-b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D
-QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc
-7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH
-Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4
-D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3
-VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a
-lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW
-Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt
-hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz
-0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn
-ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT
-d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60
-4GGSt/M3mMS+lqO3ig==
+MIIHgjCCBWqgAwIBAgICEBswDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkFV
+MRgwFgYDVQQIEw9OZXcgU291dGggV2FsZXMxGjAYBgNVBAoTEUNBY2VydCBUZXN0
+c2VydmVyMSEwHwYDVQQLExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxHzAdBgNV
+BAMTFkNBY2VydCBUZXN0c2VydmVyIFJvb3QwHhcNMTEwNTAxMTgyNTA5WhcNMjEw
+NDI4MTgyNTA5WjBiMRkwFwYDVQQKExBDQWNlcnQgVGVzdHNldmVyMSEwHwYDVQQL
+ExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxIjAgBgNVBAMTGUNBY2VydCBUZXN0
+c2VydmVyIENsYXNzIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDI
+576JQukwI58zuNidaS0HUYVCBmy4mpV7VhydDtW07hDu5lYGmbcuBW+SfjPCjMMR
+QVEiNrWv3tLclBKah/ubOmgP1HenQxRfGiJkuPk7dwlM7qqPfRn/H1Pm1w1bj/e1
+yZkeNc0UzMPdRbD9InR3/hwHQ1hfLHKGbbYc6uTb+0UOgGAsMwb/WVb+8mSrgERZ
+9pFhw8uK5+BFgJwSdsTsN68h5ZDL4VIf9Zq8z8jNGcXK0DSoZ0vT0y6EyVdXiXNS
+PF/zAPTbBBQcBGmhKBlcTLwcPHLeHIEfwRGf72wqBYNNrT0J37yTci31x+xC0/iQ
+wjPD4rRhYFxm/UW9sFtEJVtIf9o/oj2Mh2FGRa0DDk0oX+jewZEnTy+MUd0k4LFy
+Md6Ucn4lJsb3uHnjZ8ayz5DEMDQ/3Mzjf6CjhOc4oXm5UXuE2gsZyno93fLtTXAc
+4w0KzMcZ2diAp5Tdpq0w3pMJUAFoehFScBRK7Kb9xuXVPxoSvGCVPNXXUsEioIlf
+T2StKvDVBPBTtWRnE0BLYTJaWQAnWp64QgWiVn+JmdGkIm4sHpB1FweN4msdkgic
+6JAlYJRp71tSjuEnJwVtgqLqpUtLPTpJ64/0lDlazCJ5NaduTpAA+MSqXlHSA/Rb
+Q1VSaKdRadqLYOUoqGFwHdldeyZpAwp0ibM62GmVrQIDAQABo4ICGjCCAhYwHQYD
+VR0OBBYEFISE4B0WSV6xxeXnzy2oVnRL6JKUMIG0BgNVHSMEgawwgamAFIXXBQrW
+j/IELV7ry/32aYsfTgb+oYGNpIGKMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMP
+TmV3IFNvdXRoIFdhbGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8G
+A1UECxMYaHR0cDovL2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQg
+VGVzdHNlcnZlciBSb290ggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEE
+UTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEF
+BQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBGBgNVHSAEPzA9MDsG
+BCsGAQUwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5DQWNlcnQub3JnL2luZGV4
+LnBocD9pZD0xMDA0BglghkgBhvhCAQgEJxYlaHR0cDovL3d3dy5DQWNlcnQub3Jn
+L2luZGV4LnBocD9pZD0xMDBQBglghkgBhvhCAQ0EQxZBVG8gZ2V0IHlvdXIgb3du
+IGNlcnRpZmljYXRlIGZvciBGUkVFLCBnbyB0byBodHRwOi8vd3d3LkNBY2VydC5v
+cmcwDQYJKoZIhvcNAQELBQADggIBAFWedxYAhAD+hiOxIqMoynyAdMaBbmCg7zJc
+Eq6pgbP7cHL+4zzIP4Zc/tPsmbL7il3cILb0+ETwmXRnC6c9E2xWke6jv9qzQ0Aj
+QI7FQdD/0cJgKagMTn+aBgyiGG6U0zTKU7cK3Ae3zSjtdaibEJyQoQlLuEzZzDYO
+LBXJXDEInhrZ+gqWRnWDOJwdr/19alqgF8nvxKQ136vV8Lqmsrzcs0O+6v53YeVj
+9AYyeCLK2XPCyhGpia2t7uPIN1zolCgJLXQcJEg3dGRqsmAeuB7PylOz9xuxXjYR
+Sq6fcOP31CxhSeHwTqTxzkuz/u+l4RBq/0LkMS/QBBmnjaqPy3TbEwner/xMWxyL
+i9DPLPrXnJXrxczV5ScUt+0cMYWDY+A+pnxwd0s/TzfDIChidSTKSbY9kPcbxCVO
+W+Pz6muoYWrPuj02rZDIN29rIQAe73vh3C++zvAB6SfbfTTMij97K86fc9Rs6amK
+CwdhKWKFibL6z0FhxAvjpxo3Fugm4q9sDAzx3GHUJ1vzq3ZJAbY1CiPglUb9rAi+
+cpFkrnSP9paa/w5iYrSTOBduGdBp8kcrHXB9RuSLndL+J41xexIBb+tSTQ8H8pzk
+iRTOfmYoGiizERHM1OUl9BPW/2+UZ9o4KUl7sPakniMkpm1dBKhvXj9rcA8+SUpp
+Raog64+T
-----END CERTIFICATE-----
diff --git a/www/certs/class3.der b/www/certs/class3.der
index 56f8c88..e13d2b9 100644
--- a/www/certs/class3.der
+++ b/www/certs/class3.der
Binary files differ
diff --git a/www/certs/class3.txt b/www/certs/class3.txt
index a77aa14..68533d8 100644
--- a/www/certs/class3.txt
+++ b/www/certs/class3.txt
@@ -1,59 +1,59 @@
Certificate:
Data:
Version: 3 (0x2)
- Serial Number: 672138 (0xa418a)
+ Serial Number: 4123 (0x101b)
Signature Algorithm: sha256WithRSAEncryption
- Issuer: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org
+ Issuer: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root
Validity
- Not Before: May 23 17:48:02 2011 GMT
- Not After : May 20 17:48:02 2021 GMT
- Subject: O=CAcert Inc., OU=http://www.CAcert.org, CN=CAcert Class 3 Root
+ Not Before: May 1 18:25:09 2011 GMT
+ Not After : Apr 28 18:25:09 2021 GMT
+ Subject: O=CAcert Testsever, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Class 3
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public Key: (4096 bit)
Modulus (4096 bit):
- 00:ab:49:35:11:48:7c:d2:26:7e:53:94:cf:43:a9:
- dd:28:d7:42:2a:8b:f3:87:78:19:58:7c:0f:9e:da:
- 89:7d:e1:fb:eb:72:90:0d:74:a1:96:64:ab:9f:a0:
- 24:99:73:da:e2:55:76:c7:17:7b:f5:04:ac:46:b8:
- c3:be:7f:64:8d:10:6c:24:f3:61:9c:c0:f2:90:fa:
- 51:e6:f5:69:01:63:c3:0f:56:e2:4a:42:cf:e2:44:
- 8c:25:28:a8:c5:79:09:7d:46:b9:8a:f3:e9:f3:34:
- 29:08:45:e4:1c:9f:cb:94:04:1c:81:a8:14:b3:98:
- 65:c4:43:ec:4e:82:8d:09:d1:bd:aa:5b:8d:92:d0:
- ec:de:90:c5:7f:0a:c2:e3:eb:e6:31:5a:5e:74:3e:
- 97:33:59:e8:c3:03:3d:60:33:bf:f7:d1:6f:47:c4:
- cd:ee:62:83:52:6e:2e:08:9a:a4:d9:15:18:91:a6:
- 85:92:47:b0:ae:48:eb:6d:b7:21:ec:85:1a:68:72:
- 35:ab:ff:f0:10:5d:c0:f4:94:a7:6a:d5:3b:92:7e:
- 4c:90:05:7e:93:c1:2c:8b:a4:8e:62:74:15:71:6e:
- 0b:71:03:ea:af:15:38:9a:d4:d2:05:72:6f:8c:f9:
- 2b:eb:5a:72:25:f9:39:46:e3:72:1b:3e:04:c3:64:
- 27:22:10:2a:8a:4f:58:a7:03:ad:be:b4:2e:13:ed:
- 5d:aa:48:d7:d5:7d:d4:2a:7b:5c:fa:46:04:50:e4:
- cc:0e:42:5b:8c:ed:db:f2:cf:fc:96:93:e0:db:11:
- 36:54:62:34:38:8f:0c:60:9b:3b:97:56:38:ad:f3:
- d2:5b:8b:a0:5b:ea:4e:96:b8:7c:d7:d5:a0:86:70:
- 40:d3:91:29:b7:a2:3c:ad:f5:8c:bb:cf:1a:92:8a:
- e4:34:7b:c0:d8:6c:5f:e9:0a:c2:c3:a7:20:9a:5a:
- df:2c:5d:52:5c:ba:47:d5:9b:ef:24:28:70:38:20:
- 2f:d5:7f:29:c0:b2:41:03:68:92:cc:e0:9c:cc:97:
- 4b:45:ef:3a:10:0a:ab:70:3a:98:95:70:ad:35:b1:
- ea:85:2b:a4:1c:80:21:31:a9:ae:60:7a:80:26:48:
- 00:b8:01:c0:93:63:55:22:91:3c:56:e7:af:db:3a:
- 25:f3:8f:31:54:ea:26:8b:81:59:f9:a1:d1:53:11:
- c5:7b:9d:03:f6:74:11:e0:6d:b1:2c:3f:2c:86:91:
- 99:71:9a:a6:77:8b:34:60:d1:14:b4:2c:ac:9d:af:
- 8c:10:d3:9f:c4:6a:f8:6f:13:fc:73:59:f7:66:42:
- 74:1e:8a:e3:f8:dc:d2:6f:98:9c:cb:47:98:95:40:
- 05:fb:e9
+ 00:c8:e7:be:89:42:e9:30:23:9f:33:b8:d8:9d:69:
+ 2d:07:51:85:42:06:6c:b8:9a:95:7b:56:1c:9d:0e:
+ d5:b4:ee:10:ee:e6:56:06:99:b7:2e:05:6f:92:7e:
+ 33:c2:8c:c3:11:41:51:22:36:b5:af:de:d2:dc:94:
+ 12:9a:87:fb:9b:3a:68:0f:d4:77:a7:43:14:5f:1a:
+ 22:64:b8:f9:3b:77:09:4c:ee:aa:8f:7d:19:ff:1f:
+ 53:e6:d7:0d:5b:8f:f7:b5:c9:99:1e:35:cd:14:cc:
+ c3:dd:45:b0:fd:22:74:77:fe:1c:07:43:58:5f:2c:
+ 72:86:6d:b6:1c:ea:e4:db:fb:45:0e:80:60:2c:33:
+ 06:ff:59:56:fe:f2:64:ab:80:44:59:f6:91:61:c3:
+ cb:8a:e7:e0:45:80:9c:12:76:c4:ec:37:af:21:e5:
+ 90:cb:e1:52:1f:f5:9a:bc:cf:c8:cd:19:c5:ca:d0:
+ 34:a8:67:4b:d3:d3:2e:84:c9:57:57:89:73:52:3c:
+ 5f:f3:00:f4:db:04:14:1c:04:69:a1:28:19:5c:4c:
+ bc:1c:3c:72:de:1c:81:1f:c1:11:9f:ef:6c:2a:05:
+ 83:4d:ad:3d:09:df:bc:93:72:2d:f5:c7:ec:42:d3:
+ f8:90:c2:33:c3:e2:b4:61:60:5c:66:fd:45:bd:b0:
+ 5b:44:25:5b:48:7f:da:3f:a2:3d:8c:87:61:46:45:
+ ad:03:0e:4d:28:5f:e8:de:c1:91:27:4f:2f:8c:51:
+ dd:24:e0:b1:72:31:de:94:72:7e:25:26:c6:f7:b8:
+ 79:e3:67:c6:b2:cf:90:c4:30:34:3f:dc:cc:e3:7f:
+ a0:a3:84:e7:38:a1:79:b9:51:7b:84:da:0b:19:ca:
+ 7a:3d:dd:f2:ed:4d:70:1c:e3:0d:0a:cc:c7:19:d9:
+ d8:80:a7:94:dd:a6:ad:30:de:93:09:50:01:68:7a:
+ 11:52:70:14:4a:ec:a6:fd:c6:e5:d5:3f:1a:12:bc:
+ 60:95:3c:d5:d7:52:c1:22:a0:89:5f:4f:64:ad:2a:
+ f0:d5:04:f0:53:b5:64:67:13:40:4b:61:32:5a:59:
+ 00:27:5a:9e:b8:42:05:a2:56:7f:89:99:d1:a4:22:
+ 6e:2c:1e:90:75:17:07:8d:e2:6b:1d:92:08:9c:e8:
+ 90:25:60:94:69:ef:5b:52:8e:e1:27:27:05:6d:82:
+ a2:ea:a5:4b:4b:3d:3a:49:eb:8f:f4:94:39:5a:cc:
+ 22:79:35:a7:6e:4e:90:00:f8:c4:aa:5e:51:d2:03:
+ f4:5b:43:55:52:68:a7:51:69:da:8b:60:e5:28:a8:
+ 61:70:1d:d9:5d:7b:26:69:03:0a:74:89:b3:3a:d8:
+ 69:95:ad
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Subject Key Identifier:
- 75:A8:71:60:4C:88:13:F0:78:D9:89:77:B5:6D:C5:89:DF:BC:B1:7A
+ 84:84:E0:1D:16:49:5E:B1:C5:E5:E7:CF:2D:A8:56:74:4B:E8:92:94
X509v3 Authority Key Identifier:
- keyid:16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1
- DirName:/O=Root CA/OU=http://www.cacert.org/CN=CA Cert Signing Authority/emailAddress=support@cacert.org
+ keyid:85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE
+ DirName:/C=AU/ST=New South Wales/O=CAcert Testserver/OU=http://cacert1.it-sls.de/CN=CAcert Testserver Root
serial:00
X509v3 Basic Constraints: critical
@@ -63,7 +63,7 @@ Certificate:
CA Issuers - URI:http://www.CAcert.org/ca.crt
X509v3 Certificate Policies:
- Policy: 1.3.6.1.4.1.18506
+ Policy: Security
CPS: http://www.CAcert.org/index.php?id=10
Netscape CA Policy Url:
@@ -71,74 +71,75 @@ Certificate:
Netscape Comment:
To get your own certificate for FREE, go to http://www.CAcert.org
Signature Algorithm: sha256WithRSAEncryption
- 29:28:85:ae:44:a9:b9:af:a4:79:13:f0:a8:a3:2b:97:60:f3:
- 5c:ee:e3:2f:c1:f6:e2:66:a0:11:ae:36:37:3a:76:15:04:53:
- ea:42:f5:f9:ea:c0:15:d8:a6:82:d9:e4:61:ae:72:0b:29:5c:
- 90:43:e8:41:b2:e1:77:db:02:13:44:78:47:55:af:58:fc:cc:
- 98:f6:45:b9:d1:20:f8:d8:21:07:fe:6d:aa:73:d4:b3:c6:07:
- e9:09:85:cc:3b:f2:b6:be:2c:1c:25:d5:71:8c:39:b5:2e:ea:
- be:18:81:ba:b0:93:b8:0f:e3:e6:d7:26:8c:31:5a:72:03:84:
- 52:e6:a6:f5:33:22:45:0a:c8:0b:0d:8a:b8:36:6f:90:09:a1:
- ab:bd:d7:d5:4e:2e:71:a2:d4:ae:fa:a7:54:2b:eb:35:8d:5a:
- b7:54:88:2f:ee:74:9f:ed:48:16:ca:0d:48:d0:94:d3:ac:a4:
- a2:f6:24:df:92:e3:bd:eb:43:40:91:6e:1c:18:8e:56:b4:82:
- 12:f3:a9:93:9f:d4:bc:9c:ad:9c:75:ee:5a:97:1b:95:e7:74:
- 2d:1c:0f:b0:2c:97:9f:fb:a9:33:39:7a:e7:03:3a:92:8e:22:
- f6:8c:0d:e4:d9:7e:0d:76:18:f7:01:f9:ef:96:96:a2:55:73:
- c0:3c:71:b4:1d:1a:56:43:b7:c3:0a:8d:72:fc:e2:10:09:0b:
- 41:ce:8c:94:a0:f9:03:fd:71:73:4b:8a:57:33:e5:8e:74:7e:
- 15:01:00:e6:cc:4a:1c:e7:7f:95:19:2d:c5:a5:0c:8b:bb:b5:
- ed:85:b3:5c:d3:df:b8:b9:f2:ca:c7:0d:01:14:ac:70:58:c5:
- 8c:8d:33:d4:9d:66:a3:1a:50:95:23:fc:48:e0:06:43:12:d9:
- cd:a7:86:39:2f:36:72:a3:80:10:e4:e1:f3:d1:cb:5b:1a:c0:
- e4:80:9a:7c:13:73:06:4f:db:a3:6b:24:0a:ba:b3:1c:bc:4a:
- 78:bb:e5:e3:75:38:a5:48:a7:a2:1e:af:76:d4:5e:f7:38:86:
- 56:5a:89:ce:d6:c3:a7:79:b2:52:a0:c6:f1:85:b4:25:8c:f2:
- 3f:96:b3:10:d9:8d:6c:57:3b:9f:6f:86:3a:18:82:22:36:c8:
- b0:91:38:db:2a:a1:93:aa:84:3f:f5:27:65:ae:73:d5:c8:d5:
- d3:77:ea:4b:9d:c7:41:bb:c7:c0:e3:a0:3f:e4:7d:a4:8d:73:
- e6:12:4b:df:a1:73:73:73:3a:80:e8:d5:cb:8e:2f:cb:ea:13:
- a7:d6:41:8b:ac:fa:3c:89:d7:24:f5:4e:b4:e0:61:92:b7:f3:
- 37:98:c4:be:96:a3:b7:8a
+ 55:9e:77:16:00:84:00:fe:86:23:b1:22:a3:28:ca:7c:80:74:
+ c6:81:6e:60:a0:ef:32:5c:12:ae:a9:81:b3:fb:70:72:fe:e3:
+ 3c:c8:3f:86:5c:fe:d3:ec:99:b2:fb:8a:5d:dc:20:b6:f4:f8:
+ 44:f0:99:74:67:0b:a7:3d:13:6c:56:91:ee:a3:bf:da:b3:43:
+ 40:23:40:8e:c5:41:d0:ff:d1:c2:60:29:a8:0c:4e:7f:9a:06:
+ 0c:a2:18:6e:94:d3:34:ca:53:b7:0a:dc:07:b7:cd:28:ed:75:
+ a8:9b:10:9c:90:a1:09:4b:b8:4c:d9:cc:36:0e:2c:15:c9:5c:
+ 31:08:9e:1a:d9:fa:0a:96:46:75:83:38:9c:1d:af:fd:7d:6a:
+ 5a:a0:17:c9:ef:c4:a4:35:df:ab:d5:f0:ba:a6:b2:bc:dc:b3:
+ 43:be:ea:fe:77:61:e5:63:f4:06:32:78:22:ca:d9:73:c2:ca:
+ 11:a9:89:ad:ad:ee:e3:c8:37:5c:e8:94:28:09:2d:74:1c:24:
+ 48:37:74:64:6a:b2:60:1e:b8:1e:cf:ca:53:b3:f7:1b:b1:5e:
+ 36:11:4a:ae:9f:70:e3:f7:d4:2c:61:49:e1:f0:4e:a4:f1:ce:
+ 4b:b3:fe:ef:a5:e1:10:6a:ff:42:e4:31:2f:d0:04:19:a7:8d:
+ aa:8f:cb:74:db:13:09:de:af:fc:4c:5b:1c:8b:8b:d0:cf:2c:
+ fa:d7:9c:95:eb:c5:cc:d5:e5:27:14:b7:ed:1c:31:85:83:63:
+ e0:3e:a6:7c:70:77:4b:3f:4f:37:c3:20:28:62:75:24:ca:49:
+ b6:3d:90:f7:1b:c4:25:4e:5b:e3:f3:ea:6b:a8:61:6a:cf:ba:
+ 3d:36:ad:90:c8:37:6f:6b:21:00:1e:ef:7b:e1:dc:2f:be:ce:
+ f0:01:e9:27:db:7d:34:cc:8a:3f:7b:2b:ce:9f:73:d4:6c:e9:
+ a9:8a:0b:07:61:29:62:85:89:b2:fa:cf:41:61:c4:0b:e3:a7:
+ 1a:37:16:e8:26:e2:af:6c:0c:0c:f1:dc:61:d4:27:5b:f3:ab:
+ 76:49:01:b6:35:0a:23:e0:95:46:fd:ac:08:be:72:91:64:ae:
+ 74:8f:f6:96:9a:ff:0e:62:62:b4:93:38:17:6e:19:d0:69:f2:
+ 47:2b:1d:70:7d:46:e4:8b:9d:d2:fe:27:8d:71:7b:12:01:6f:
+ eb:52:4d:0f:07:f2:9c:e4:89:14:ce:7e:66:28:1a:28:b3:11:
+ 11:cc:d4:e5:25:f4:13:d6:ff:6f:94:67:da:38:29:49:7b:b0:
+ f6:a4:9e:23:24:a6:6d:5d:04:a8:6f:5e:3f:6b:70:0f:3e:49:
+ 4a:69:45:aa:20:eb:8f:93
-----BEGIN CERTIFICATE-----
-MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv
-b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU
-MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0
-Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a
-iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1
-aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C
-jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia
-pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0
-FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt
-XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL
-oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6
-R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp
-rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/
-LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA
-BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow
-gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV
-BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG
-A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
-c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH
-AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr
-BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB
-MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y
-Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj
-ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5
-b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D
-QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc
-7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH
-Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4
-D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3
-VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a
-lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW
-Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt
-hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz
-0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn
-ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT
-d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60
-4GGSt/M3mMS+lqO3ig==
+MIIHgjCCBWqgAwIBAgICEBswDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkFV
+MRgwFgYDVQQIEw9OZXcgU291dGggV2FsZXMxGjAYBgNVBAoTEUNBY2VydCBUZXN0
+c2VydmVyMSEwHwYDVQQLExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxHzAdBgNV
+BAMTFkNBY2VydCBUZXN0c2VydmVyIFJvb3QwHhcNMTEwNTAxMTgyNTA5WhcNMjEw
+NDI4MTgyNTA5WjBiMRkwFwYDVQQKExBDQWNlcnQgVGVzdHNldmVyMSEwHwYDVQQL
+ExhodHRwOi8vY2FjZXJ0MS5pdC1zbHMuZGUxIjAgBgNVBAMTGUNBY2VydCBUZXN0
+c2VydmVyIENsYXNzIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDI
+576JQukwI58zuNidaS0HUYVCBmy4mpV7VhydDtW07hDu5lYGmbcuBW+SfjPCjMMR
+QVEiNrWv3tLclBKah/ubOmgP1HenQxRfGiJkuPk7dwlM7qqPfRn/H1Pm1w1bj/e1
+yZkeNc0UzMPdRbD9InR3/hwHQ1hfLHKGbbYc6uTb+0UOgGAsMwb/WVb+8mSrgERZ
+9pFhw8uK5+BFgJwSdsTsN68h5ZDL4VIf9Zq8z8jNGcXK0DSoZ0vT0y6EyVdXiXNS
+PF/zAPTbBBQcBGmhKBlcTLwcPHLeHIEfwRGf72wqBYNNrT0J37yTci31x+xC0/iQ
+wjPD4rRhYFxm/UW9sFtEJVtIf9o/oj2Mh2FGRa0DDk0oX+jewZEnTy+MUd0k4LFy
+Md6Ucn4lJsb3uHnjZ8ayz5DEMDQ/3Mzjf6CjhOc4oXm5UXuE2gsZyno93fLtTXAc
+4w0KzMcZ2diAp5Tdpq0w3pMJUAFoehFScBRK7Kb9xuXVPxoSvGCVPNXXUsEioIlf
+T2StKvDVBPBTtWRnE0BLYTJaWQAnWp64QgWiVn+JmdGkIm4sHpB1FweN4msdkgic
+6JAlYJRp71tSjuEnJwVtgqLqpUtLPTpJ64/0lDlazCJ5NaduTpAA+MSqXlHSA/Rb
+Q1VSaKdRadqLYOUoqGFwHdldeyZpAwp0ibM62GmVrQIDAQABo4ICGjCCAhYwHQYD
+VR0OBBYEFISE4B0WSV6xxeXnzy2oVnRL6JKUMIG0BgNVHSMEgawwgamAFIXXBQrW
+j/IELV7ry/32aYsfTgb+oYGNpIGKMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMP
+TmV3IFNvdXRoIFdhbGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8G
+A1UECxMYaHR0cDovL2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQg
+VGVzdHNlcnZlciBSb290ggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEE
+UTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEF
+BQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBGBgNVHSAEPzA9MDsG
+BCsGAQUwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5DQWNlcnQub3JnL2luZGV4
+LnBocD9pZD0xMDA0BglghkgBhvhCAQgEJxYlaHR0cDovL3d3dy5DQWNlcnQub3Jn
+L2luZGV4LnBocD9pZD0xMDBQBglghkgBhvhCAQ0EQxZBVG8gZ2V0IHlvdXIgb3du
+IGNlcnRpZmljYXRlIGZvciBGUkVFLCBnbyB0byBodHRwOi8vd3d3LkNBY2VydC5v
+cmcwDQYJKoZIhvcNAQELBQADggIBAFWedxYAhAD+hiOxIqMoynyAdMaBbmCg7zJc
+Eq6pgbP7cHL+4zzIP4Zc/tPsmbL7il3cILb0+ETwmXRnC6c9E2xWke6jv9qzQ0Aj
+QI7FQdD/0cJgKagMTn+aBgyiGG6U0zTKU7cK3Ae3zSjtdaibEJyQoQlLuEzZzDYO
+LBXJXDEInhrZ+gqWRnWDOJwdr/19alqgF8nvxKQ136vV8Lqmsrzcs0O+6v53YeVj
+9AYyeCLK2XPCyhGpia2t7uPIN1zolCgJLXQcJEg3dGRqsmAeuB7PylOz9xuxXjYR
+Sq6fcOP31CxhSeHwTqTxzkuz/u+l4RBq/0LkMS/QBBmnjaqPy3TbEwner/xMWxyL
+i9DPLPrXnJXrxczV5ScUt+0cMYWDY+A+pnxwd0s/TzfDIChidSTKSbY9kPcbxCVO
+W+Pz6muoYWrPuj02rZDIN29rIQAe73vh3C++zvAB6SfbfTTMij97K86fc9Rs6amK
+CwdhKWKFibL6z0FhxAvjpxo3Fugm4q9sDAzx3GHUJ1vzq3ZJAbY1CiPglUb9rAi+
+cpFkrnSP9paa/w5iYrSTOBduGdBp8kcrHXB9RuSLndL+J41xexIBb+tSTQ8H8pzk
+iRTOfmYoGiizERHM1OUl9BPW/2+UZ9o4KUl7sPakniMkpm1dBKhvXj9rcA8+SUpp
+Raog64+T
-----END CERTIFICATE-----
diff --git a/www/certs/root.crt b/www/certs/root.crt
index e7dfc82..fa9d766 100644
--- a/www/certs/root.crt
+++ b/www/certs/root.crt
@@ -1,41 +1,43 @@
-----BEGIN CERTIFICATE-----
-MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
-BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
-MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
-ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
-8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
-zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
-fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
-w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
-G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
-epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
-laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
-QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
-fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
-YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
-ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
-gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
-MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
-IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
-dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
-czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
-dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
-aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
-AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
-b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
-ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
-nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
-18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
-gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
-Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
-sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
-SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
-CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
-GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
-zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
-omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
+MIIHpzCCBY+gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMCQVUx
+GDAWBgNVBAgTD05ldyBTb3V0aCBXYWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3Rz
+ZXJ2ZXIxITAfBgNVBAsTGGh0dHA6Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UE
+AxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIgUm9vdDAeFw0xMTAzMjkyMDQ1MjBaFw0yMTAz
+MjYyMDQ1MjBaMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMPTmV3IFNvdXRoIFdh
+bGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8GA1UECxMYaHR0cDov
+L2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQgVGVzdHNlcnZlciBS
+b290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5fvQIrtzGpSbyWam
+2kHfXMCXgRuTHSuQwbvkqdLAqtiI4ZQkF4jTy+7D6LVnDd3kw/hC1EAhcV79WuTn
+PrrpjM1JdliOOOvb5sh9SQrdT4w1IO2JBmHrykcHCcvh7tLcm8iKA3iIIxO76SXZ
+Pd7buDEQQrP8z6AXBgCRIdtS9uA5WxAmmbj2ToL8UaViijB062zVO9euOuMdN5Qk
+pCVOj9tfzotJDHw3sNvP65G/C63ZJ0ysUhohncXe+e6UIPHVS+V54nBENz+4HY/d
+zchFFHhnhuCSyhPfSz975IlnBSgMqhVPEYuFpAkDUSUpc8kXoe+cVVSjPBw0exUJ
+X4OUjEUf3HgdPyaoeeAPbkQ2pd118vMHzTzAX7t/GzVxROkYSzFvuSljI7ivFx9Y
+lPRsMW5L9TRIjxCPBLoqTNKgQQOfZiib+T4PY/ii+qU17lMZK9L9hnAMjW8L2dzx
+Z6/qrhM58vKqt6Rd9bsUt109WWflKY39YenlGaCJU+0qgsUcbl2qHjgbkz8rvJJM
+10BkVROvVvqnPjkSc8ZPD+1Si9pP0pztAl7vXsDM30jtL6Jv/DyTFKUljpb0tqA9
+22SyOxUu0kkKBYXY1HrqL6Ahvjeorv5aDzrUqAYTYB6Z82ykx0bG5FsAK4ShoTv1
+3ir9ejhln4JPGiyQTdMXgRaHX/kCAwEAAaOCAhowggIWMB0GA1UdDgQWBBSF1wUK
+1o/yBC1e68v99mmLH04G/jCBtAYDVR0jBIGsMIGpgBSF1wUK1o/yBC1e68v99mmL
+H04G/qGBjaSBijCBhzELMAkGA1UEBhMCQVUxGDAWBgNVBAgTD05ldyBTb3V0aCBX
+YWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3RzZXJ2ZXIxITAfBgNVBAsTGGh0dHA6
+Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UEAxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIg
+Um9vdIIBADAPBgNVHRMBAf8EBTADAQH/MF0GCCsGAQUFBwEBBFEwTzAjBggrBgEF
+BQcwAYYXaHR0cDovL29jc3AuQ0FjZXJ0Lm9yZy8wKAYIKwYBBQUHMAKGHGh0dHA6
+Ly93d3cuQ0FjZXJ0Lm9yZy9jYS5jcnQwRgYDVR0gBD8wPTA7BgQrBgEFMDMwMQYI
+KwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAw
+NAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/
+aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5b3VyIG93biBjZXJ0aWZpY2F0
+ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5DQWNlcnQub3JnMA0GCSqGSIb3
+DQEBBQUAA4ICAQDQjXJDogH/NiU53JEUaw7jEF7qgp8vLjO2AXkwwpdKOWKS6lm9
+BQXiKs6HUdVYwsdST30kSvF1dD9Y9gCgFVyN662Tk2LwaPyKRq9cxlUXwqKEczfE
+4yFPhYXS1giIGL8aSUx0lok6KWRXNgspgBIZ+0tFV+9GLNTP5y+ofU2ME1xw6+zM
+tN/rgN2Xt6oVO24tJlKWVvodIgfq8QPscxZHwFqyHWh8hsL8q4mSDZZ0B7wHy51F
+gliDzcq+WG8tk29WV++7uHRnN2rqJSoGc91IAHN2YmBW/mCeiqPH0Ms1x7Oo1DuZ
+C5pc1GGyxGun252NxRM9jEz7UsWqHRCCyyA6Tyo2E6b3gdiatmohW1JIUTk+WONZ
+41+Htgz+vhGFzTOnAWUQLapPllNeYjs/b1Ub8vpycx2O0FU3ZPtC+41GriPHQ2rJ
+/ToQVI4ZAHUp7O6n4+r7Onhf5qylVeux+Qzy+IV2Db7rj0KXBoHjW3S0hIfIJE0x
+1T5Ldj+YBFvCLvd6RrcNgoS/HaKAV/42AENy1V1eBBP6TJ8kmXWVbyRpzRFgZmmB
+z6jLle2M0/kaPER2s5QFvxu+Y6mwrQ237im9oPHzY4kGv8eeF+AMUOmSC+M5jb3m
++IafDexcFnjchflKWV/RRHSj28kJ3ops1lgpkx4+TJo3M62Udepphw0ItA==
-----END CERTIFICATE-----
diff --git a/www/certs/root.der b/www/certs/root.der
index 719b0ff..9166696 100644
--- a/www/certs/root.der
+++ b/www/certs/root.der
Binary files differ
diff --git a/www/certs/root.txt b/www/certs/root.txt
index 96bb2cd..26c1593 100644
--- a/www/certs/root.txt
+++ b/www/certs/root.txt
@@ -2,139 +2,144 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 0 (0x0)
- Signature Algorithm: md5WithRSAEncryption
- Issuer: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org
+ Signature Algorithm: sha1WithRSAEncryption
+ Issuer: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root
Validity
- Not Before: Mar 30 12:29:49 2003 GMT
- Not After : Mar 29 12:29:49 2033 GMT
- Subject: O=Root CA, OU=http://www.cacert.org, CN=CA Cert Signing Authority/emailAddress=support@cacert.org
+ Not Before: Mar 29 20:45:20 2011 GMT
+ Not After : Mar 26 20:45:20 2021 GMT
+ Subject: C=AU, ST=New South Wales, O=CAcert Testserver, OU=http://cacert1.it-sls.de, CN=CAcert Testserver Root
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public Key: (4096 bit)
Modulus (4096 bit):
- 00:ce:22:c0:e2:46:7d:ec:36:28:07:50:96:f2:a0:
- 33:40:8c:4b:f1:3b:66:3f:31:e5:6b:02:36:db:d6:
- 7c:f6:f1:88:8f:4e:77:36:05:41:95:f9:09:f0:12:
- cf:46:86:73:60:b7:6e:7e:e8:c0:58:64:ae:cd:b0:
- ad:45:17:0c:63:fa:67:0a:e8:d6:d2:bf:3e:e7:98:
- c4:f0:4c:fa:e0:03:bb:35:5d:6c:21:de:9e:20:d9:
- ba:cd:66:32:37:72:fa:f7:08:f5:c7:cd:58:c9:8e:
- e7:0e:5e:ea:3e:fe:1c:a1:14:0a:15:6c:86:84:5b:
- 64:66:2a:7a:a9:4b:53:79:f5:88:a2:7b:ee:2f:0a:
- 61:2b:8d:b2:7e:4d:56:a5:13:ec:ea:da:92:9e:ac:
- 44:41:1e:58:60:65:05:66:f8:c0:44:bd:cb:94:f7:
- 42:7e:0b:f7:65:68:98:51:05:f0:f3:05:91:04:1d:
- 1b:17:82:ec:c8:57:bb:c3:6b:7a:88:f1:b0:72:cc:
- 25:5b:20:91:ec:16:02:12:8f:32:e9:17:18:48:d0:
- c7:05:2e:02:30:42:b8:25:9c:05:6b:3f:aa:3a:a7:
- eb:53:48:f7:e8:d2:b6:07:98:dc:1b:c6:34:7f:7f:
- c9:1c:82:7a:05:58:2b:08:5b:f3:38:a2:ab:17:5d:
- 66:c9:98:d7:9e:10:8b:a2:d2:dd:74:9a:f7:71:0c:
- 72:60:df:cd:6f:98:33:9d:96:34:76:3e:24:7a:92:
- b0:0e:95:1e:6f:e6:a0:45:38:47:aa:d7:41:ed:4a:
- b7:12:f6:d7:1b:83:8a:0f:2e:d8:09:b6:59:d7:aa:
- 04:ff:d2:93:7d:68:2e:dd:8b:4b:ab:58:ba:2f:8d:
- ea:95:a7:a0:c3:54:89:a5:fb:db:8b:51:22:9d:b2:
- c3:be:11:be:2c:91:86:8b:96:78:ad:20:d3:8a:2f:
- 1a:3f:c6:d0:51:65:87:21:b1:19:01:65:7f:45:1c:
- 87:f5:7c:d0:41:4c:4f:29:98:21:fd:33:1f:75:0c:
- 04:51:fa:19:77:db:d4:14:1c:ee:81:c3:1d:f5:98:
- b7:69:06:91:22:dd:00:50:cc:81:31:ac:12:07:7b:
- 38:da:68:5b:e6:2b:d4:7e:c9:5f:ad:e8:eb:72:4c:
- f3:01:e5:4b:20:bf:9a:a6:57:ca:91:00:01:8b:a1:
- 75:21:37:b5:63:0d:67:3e:46:4f:70:20:67:ce:c5:
- d6:59:db:02:e0:f0:d2:cb:cd:ba:62:b7:90:41:e8:
- dd:20:e4:29:bc:64:29:42:c8:22:dc:78:9a:ff:43:
- ec:98:1b:09:51:4b:5a:5a:c2:71:f1:c4:cb:73:a9:
- e5:a1:0b
+ 00:e5:fb:d0:22:bb:73:1a:94:9b:c9:66:a6:da:41:
+ df:5c:c0:97:81:1b:93:1d:2b:90:c1:bb:e4:a9:d2:
+ c0:aa:d8:88:e1:94:24:17:88:d3:cb:ee:c3:e8:b5:
+ 67:0d:dd:e4:c3:f8:42:d4:40:21:71:5e:fd:5a:e4:
+ e7:3e:ba:e9:8c:cd:49:76:58:8e:38:eb:db:e6:c8:
+ 7d:49:0a:dd:4f:8c:35:20:ed:89:06:61:eb:ca:47:
+ 07:09:cb:e1:ee:d2:dc:9b:c8:8a:03:78:88:23:13:
+ bb:e9:25:d9:3d:de:db:b8:31:10:42:b3:fc:cf:a0:
+ 17:06:00:91:21:db:52:f6:e0:39:5b:10:26:99:b8:
+ f6:4e:82:fc:51:a5:62:8a:30:74:eb:6c:d5:3b:d7:
+ ae:3a:e3:1d:37:94:24:a4:25:4e:8f:db:5f:ce:8b:
+ 49:0c:7c:37:b0:db:cf:eb:91:bf:0b:ad:d9:27:4c:
+ ac:52:1a:21:9d:c5:de:f9:ee:94:20:f1:d5:4b:e5:
+ 79:e2:70:44:37:3f:b8:1d:8f:dd:cd:c8:45:14:78:
+ 67:86:e0:92:ca:13:df:4b:3f:7b:e4:89:67:05:28:
+ 0c:aa:15:4f:11:8b:85:a4:09:03:51:25:29:73:c9:
+ 17:a1:ef:9c:55:54:a3:3c:1c:34:7b:15:09:5f:83:
+ 94:8c:45:1f:dc:78:1d:3f:26:a8:79:e0:0f:6e:44:
+ 36:a5:dd:75:f2:f3:07:cd:3c:c0:5f:bb:7f:1b:35:
+ 71:44:e9:18:4b:31:6f:b9:29:63:23:b8:af:17:1f:
+ 58:94:f4:6c:31:6e:4b:f5:34:48:8f:10:8f:04:ba:
+ 2a:4c:d2:a0:41:03:9f:66:28:9b:f9:3e:0f:63:f8:
+ a2:fa:a5:35:ee:53:19:2b:d2:fd:86:70:0c:8d:6f:
+ 0b:d9:dc:f1:67:af:ea:ae:13:39:f2:f2:aa:b7:a4:
+ 5d:f5:bb:14:b7:5d:3d:59:67:e5:29:8d:fd:61:e9:
+ e5:19:a0:89:53:ed:2a:82:c5:1c:6e:5d:aa:1e:38:
+ 1b:93:3f:2b:bc:92:4c:d7:40:64:55:13:af:56:fa:
+ a7:3e:39:12:73:c6:4f:0f:ed:52:8b:da:4f:d2:9c:
+ ed:02:5e:ef:5e:c0:cc:df:48:ed:2f:a2:6f:fc:3c:
+ 93:14:a5:25:8e:96:f4:b6:a0:3d:db:64:b2:3b:15:
+ 2e:d2:49:0a:05:85:d8:d4:7a:ea:2f:a0:21:be:37:
+ a8:ae:fe:5a:0f:3a:d4:a8:06:13:60:1e:99:f3:6c:
+ a4:c7:46:c6:e4:5b:00:2b:84:a1:a1:3b:f5:de:2a:
+ fd:7a:38:65:9f:82:4f:1a:2c:90:4d:d3:17:81:16:
+ 87:5f:f9
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Subject Key Identifier:
- 16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1
+ 85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE
X509v3 Authority Key Identifier:
- keyid:16:B5:32:1B:D4:C7:F3:E0:E6:8E:F3:BD:D2:B0:3A:EE:B2:39:18:D1
- DirName:/O=Root CA/OU=http://www.cacert.org/CN=CA Cert Signing Authority/emailAddress=support@cacert.org
+ keyid:85:D7:05:0A:D6:8F:F2:04:2D:5E:EB:CB:FD:F6:69:8B:1F:4E:06:FE
+ DirName:/C=AU/ST=New South Wales/O=CAcert Testserver/OU=http://cacert1.it-sls.de/CN=CAcert Testserver Root
serial:00
X509v3 Basic Constraints: critical
CA:TRUE
- X509v3 CRL Distribution Points:
- URI:https://www.cacert.org/revoke.crl
+ Authority Information Access:
+ OCSP - URI:http://ocsp.CAcert.org/
+ CA Issuers - URI:http://www.CAcert.org/ca.crt
+
+ X509v3 Certificate Policies:
+ Policy: Security
+ CPS: http://www.CAcert.org/index.php?id=10
- Netscape CA Revocation Url:
- https://www.cacert.org/revoke.crl
Netscape CA Policy Url:
- http://www.cacert.org/index.php?id=10
+ http://www.CAcert.org/index.php?id=10
Netscape Comment:
- To get your own certificate for FREE head over to http://www.cacert.org
- Signature Algorithm: md5WithRSAEncryption
- 28:c7:ee:9c:82:02:ba:5c:80:12:ca:35:0a:1d:81:6f:89:6a:
- 99:cc:f2:68:0f:7f:a7:e1:8d:58:95:3e:bd:f2:06:c3:90:5a:
- ac:b5:60:f6:99:43:01:a3:88:70:9c:9d:62:9d:a4:87:af:67:
- 58:0d:30:36:3b:e6:ad:48:d3:cb:74:02:86:71:3e:e2:2b:03:
- 68:f1:34:62:40:46:3b:53:ea:28:f4:ac:fb:66:95:53:8a:4d:
- 5d:fd:3b:d9:60:d7:ca:79:69:3b:b1:65:92:a6:c6:81:82:5c:
- 9c:cd:eb:4d:01:8a:a5:df:11:55:aa:15:ca:1f:37:c0:82:98:
- 70:61:db:6a:7c:96:a3:8e:2e:54:3e:4f:21:a9:90:ef:dc:82:
- bf:dc:e8:45:ad:4d:90:73:08:3c:94:65:b0:04:99:76:7f:e2:
- bc:c2:6a:15:aa:97:04:37:24:d8:1e:94:4e:6d:0e:51:be:d6:
- c4:8f:ca:96:6d:f7:43:df:e8:30:65:27:3b:7b:bb:43:43:63:
- c4:43:f7:b2:ec:68:cc:e1:19:8e:22:fb:98:e1:7b:5a:3e:01:
- 37:3b:8b:08:b0:a2:f3:95:4e:1a:cb:9b:cd:9a:b1:db:b2:70:
- f0:2d:4a:db:d8:b0:e3:6f:45:48:33:12:ff:fe:3c:32:2a:54:
- f7:c4:f7:8a:f0:88:23:c2:47:fe:64:7a:71:c0:d1:1e:a6:63:
- b0:07:7e:a4:2f:d3:01:8f:dc:9f:2b:b6:c6:08:a9:0f:93:48:
- 25:fc:12:fd:9f:42:dc:f3:c4:3e:f6:57:b0:d7:dd:69:d1:06:
- 77:34:0a:4b:d2:ca:a0:ff:1c:c6:8c:c9:16:be:c4:cc:32:37:
- 68:73:5f:08:fb:51:f7:49:53:36:05:0a:95:02:4c:f2:79:1a:
- 10:f6:d8:3a:75:9c:f3:1d:f1:a2:0d:70:67:86:1b:b3:16:f5:
- 2f:e5:a4:eb:79:86:f9:3d:0b:c2:73:0b:a5:99:ac:6f:fc:67:
- b8:e5:2f:0b:a6:18:24:8d:7b:d1:48:35:29:18:40:ac:93:60:
- e1:96:86:50:b4:7a:59:d8:8f:21:0b:9f:cf:82:91:c6:3b:bf:
- 6b:dc:07:91:b9:97:56:23:aa:b6:6c:94:c6:48:06:3c:e4:ce:
- 4e:aa:e4:f6:2f:09:dc:53:6f:2e:fc:74:eb:3a:63:99:c2:a6:
- ac:89:bc:a7:b2:44:a0:0d:8a:10:e3:6c:f2:24:cb:fa:9b:9f:
- 70:47:2e:de:14:8b:d4:b2:20:09:96:a2:64:f1:24:1c:dc:a1:
- 35:9c:15:b2:d4:bc:55:2e:7d:06:f5:9c:0e:55:f4:5a:d6:93:
- da:76:ad:25:73:4c:c5:43
+ To get your own certificate for FREE, go to http://www.CAcert.org
+ Signature Algorithm: sha1WithRSAEncryption
+ d0:8d:72:43:a2:01:ff:36:25:39:dc:91:14:6b:0e:e3:10:5e:
+ ea:82:9f:2f:2e:33:b6:01:79:30:c2:97:4a:39:62:92:ea:59:
+ bd:05:05:e2:2a:ce:87:51:d5:58:c2:c7:52:4f:7d:24:4a:f1:
+ 75:74:3f:58:f6:00:a0:15:5c:8d:eb:ad:93:93:62:f0:68:fc:
+ 8a:46:af:5c:c6:55:17:c2:a2:84:73:37:c4:e3:21:4f:85:85:
+ d2:d6:08:88:18:bf:1a:49:4c:74:96:89:3a:29:64:57:36:0b:
+ 29:80:12:19:fb:4b:45:57:ef:46:2c:d4:cf:e7:2f:a8:7d:4d:
+ 8c:13:5c:70:eb:ec:cc:b4:df:eb:80:dd:97:b7:aa:15:3b:6e:
+ 2d:26:52:96:56:fa:1d:22:07:ea:f1:03:ec:73:16:47:c0:5a:
+ b2:1d:68:7c:86:c2:fc:ab:89:92:0d:96:74:07:bc:07:cb:9d:
+ 45:82:58:83:cd:ca:be:58:6f:2d:93:6f:56:57:ef:bb:b8:74:
+ 67:37:6a:ea:25:2a:06:73:dd:48:00:73:76:62:60:56:fe:60:
+ 9e:8a:a3:c7:d0:cb:35:c7:b3:a8:d4:3b:99:0b:9a:5c:d4:61:
+ b2:c4:6b:a7:db:9d:8d:c5:13:3d:8c:4c:fb:52:c5:aa:1d:10:
+ 82:cb:20:3a:4f:2a:36:13:a6:f7:81:d8:9a:b6:6a:21:5b:52:
+ 48:51:39:3e:58:e3:59:e3:5f:87:b6:0c:fe:be:11:85:cd:33:
+ a7:01:65:10:2d:aa:4f:96:53:5e:62:3b:3f:6f:55:1b:f2:fa:
+ 72:73:1d:8e:d0:55:37:64:fb:42:fb:8d:46:ae:23:c7:43:6a:
+ c9:fd:3a:10:54:8e:19:00:75:29:ec:ee:a7:e3:ea:fb:3a:78:
+ 5f:e6:ac:a5:55:eb:b1:f9:0c:f2:f8:85:76:0d:be:eb:8f:42:
+ 97:06:81:e3:5b:74:b4:84:87:c8:24:4d:31:d5:3e:4b:76:3f:
+ 98:04:5b:c2:2e:f7:7a:46:b7:0d:82:84:bf:1d:a2:80:57:fe:
+ 36:00:43:72:d5:5d:5e:04:13:fa:4c:9f:24:99:75:95:6f:24:
+ 69:cd:11:60:66:69:81:cf:a8:cb:95:ed:8c:d3:f9:1a:3c:44:
+ 76:b3:94:05:bf:1b:be:63:a9:b0:ad:0d:b7:ee:29:bd:a0:f1:
+ f3:63:89:06:bf:c7:9e:17:e0:0c:50:e9:92:0b:e3:39:8d:bd:
+ e6:f8:86:9f:0d:ec:5c:16:78:dc:85:f9:4a:59:5f:d1:44:74:
+ a3:db:c9:09:de:8a:6c:d6:58:29:93:1e:3e:4c:9a:37:33:ad:
+ 94:75:ea:69:87:0d:08:b4
-----BEGIN CERTIFICATE-----
-MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
-BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
-MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
-ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
-8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
-zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
-fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
-w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
-G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
-epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
-laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
-QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
-fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
-YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
-ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
-gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
-MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
-IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
-dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
-czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
-dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
-aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
-AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
-b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
-ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
-nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
-18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
-gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
-Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
-sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
-SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
-CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
-GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
-zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
-omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
+MIIHpzCCBY+gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMCQVUx
+GDAWBgNVBAgTD05ldyBTb3V0aCBXYWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3Rz
+ZXJ2ZXIxITAfBgNVBAsTGGh0dHA6Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UE
+AxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIgUm9vdDAeFw0xMTAzMjkyMDQ1MjBaFw0yMTAz
+MjYyMDQ1MjBaMIGHMQswCQYDVQQGEwJBVTEYMBYGA1UECBMPTmV3IFNvdXRoIFdh
+bGVzMRowGAYDVQQKExFDQWNlcnQgVGVzdHNlcnZlcjEhMB8GA1UECxMYaHR0cDov
+L2NhY2VydDEuaXQtc2xzLmRlMR8wHQYDVQQDExZDQWNlcnQgVGVzdHNlcnZlciBS
+b290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5fvQIrtzGpSbyWam
+2kHfXMCXgRuTHSuQwbvkqdLAqtiI4ZQkF4jTy+7D6LVnDd3kw/hC1EAhcV79WuTn
+PrrpjM1JdliOOOvb5sh9SQrdT4w1IO2JBmHrykcHCcvh7tLcm8iKA3iIIxO76SXZ
+Pd7buDEQQrP8z6AXBgCRIdtS9uA5WxAmmbj2ToL8UaViijB062zVO9euOuMdN5Qk
+pCVOj9tfzotJDHw3sNvP65G/C63ZJ0ysUhohncXe+e6UIPHVS+V54nBENz+4HY/d
+zchFFHhnhuCSyhPfSz975IlnBSgMqhVPEYuFpAkDUSUpc8kXoe+cVVSjPBw0exUJ
+X4OUjEUf3HgdPyaoeeAPbkQ2pd118vMHzTzAX7t/GzVxROkYSzFvuSljI7ivFx9Y
+lPRsMW5L9TRIjxCPBLoqTNKgQQOfZiib+T4PY/ii+qU17lMZK9L9hnAMjW8L2dzx
+Z6/qrhM58vKqt6Rd9bsUt109WWflKY39YenlGaCJU+0qgsUcbl2qHjgbkz8rvJJM
+10BkVROvVvqnPjkSc8ZPD+1Si9pP0pztAl7vXsDM30jtL6Jv/DyTFKUljpb0tqA9
+22SyOxUu0kkKBYXY1HrqL6Ahvjeorv5aDzrUqAYTYB6Z82ykx0bG5FsAK4ShoTv1
+3ir9ejhln4JPGiyQTdMXgRaHX/kCAwEAAaOCAhowggIWMB0GA1UdDgQWBBSF1wUK
+1o/yBC1e68v99mmLH04G/jCBtAYDVR0jBIGsMIGpgBSF1wUK1o/yBC1e68v99mmL
+H04G/qGBjaSBijCBhzELMAkGA1UEBhMCQVUxGDAWBgNVBAgTD05ldyBTb3V0aCBX
+YWxlczEaMBgGA1UEChMRQ0FjZXJ0IFRlc3RzZXJ2ZXIxITAfBgNVBAsTGGh0dHA6
+Ly9jYWNlcnQxLml0LXNscy5kZTEfMB0GA1UEAxMWQ0FjZXJ0IFRlc3RzZXJ2ZXIg
+Um9vdIIBADAPBgNVHRMBAf8EBTADAQH/MF0GCCsGAQUFBwEBBFEwTzAjBggrBgEF
+BQcwAYYXaHR0cDovL29jc3AuQ0FjZXJ0Lm9yZy8wKAYIKwYBBQUHMAKGHGh0dHA6
+Ly93d3cuQ0FjZXJ0Lm9yZy9jYS5jcnQwRgYDVR0gBD8wPTA7BgQrBgEFMDMwMQYI
+KwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAw
+NAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5waHA/
+aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5b3VyIG93biBjZXJ0aWZpY2F0
+ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5DQWNlcnQub3JnMA0GCSqGSIb3
+DQEBBQUAA4ICAQDQjXJDogH/NiU53JEUaw7jEF7qgp8vLjO2AXkwwpdKOWKS6lm9
+BQXiKs6HUdVYwsdST30kSvF1dD9Y9gCgFVyN662Tk2LwaPyKRq9cxlUXwqKEczfE
+4yFPhYXS1giIGL8aSUx0lok6KWRXNgspgBIZ+0tFV+9GLNTP5y+ofU2ME1xw6+zM
+tN/rgN2Xt6oVO24tJlKWVvodIgfq8QPscxZHwFqyHWh8hsL8q4mSDZZ0B7wHy51F
+gliDzcq+WG8tk29WV++7uHRnN2rqJSoGc91IAHN2YmBW/mCeiqPH0Ms1x7Oo1DuZ
+C5pc1GGyxGun252NxRM9jEz7UsWqHRCCyyA6Tyo2E6b3gdiatmohW1JIUTk+WONZ
+41+Htgz+vhGFzTOnAWUQLapPllNeYjs/b1Ub8vpycx2O0FU3ZPtC+41GriPHQ2rJ
+/ToQVI4ZAHUp7O6n4+r7Onhf5qylVeux+Qzy+IV2Db7rj0KXBoHjW3S0hIfIJE0x
+1T5Ldj+YBFvCLvd6RrcNgoS/HaKAV/42AENy1V1eBBP6TJ8kmXWVbyRpzRFgZmmB
+z6jLle2M0/kaPER2s5QFvxu+Y6mwrQ237im9oPHzY4kGv8eeF+AMUOmSC+M5jb3m
++IafDexcFnjchflKWV/RRHSj28kJ3ops1lgpkx4+TJo3M62Udepphw0ItA==
-----END CERTIFICATE-----
diff --git a/www/disputes.php b/www/disputes.php
index 96c7c75..0034b93 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -28,7 +28,7 @@
if($type == "reallyemail")
{
$emailid = intval($_SESSION['_config']['emailid']);
- $hash = mysql_escape_string(trim($_SESSION['_config']['hash']));
+ $hash = mysql_real_escape_string(trim($_SESSION['_config']['hash']));
$res = mysql_query("select * from `disputeemail` where `id`='$emailid' and `hash`='$hash'");
if(mysql_num_rows($res) <= 0)
@@ -81,7 +81,7 @@
if($type == "email")
{
$emailid = intval($_REQUEST['emailid']);
- $hash = trim(mysql_escape_string(stripslashes($_REQUEST['hash'])));
+ $hash = trim(mysql_real_escape_string(stripslashes($_REQUEST['hash'])));
if($emailid <= 0 || $hash == "")
{
showheader(_("Email Dispute"));
@@ -127,7 +127,7 @@
if($type == "reallydomain")
{
$domainid = intval($_SESSION['_config']['domainid']);
- $hash = mysql_escape_string(trim($_SESSION['_config']['hash']));
+ $hash = mysql_real_escape_string(trim($_SESSION['_config']['hash']));
$res = mysql_query("select * from `disputedomain` where `id`='$domainid' and `hash`='$hash'");
if(mysql_num_rows($res) <= 0)
@@ -168,7 +168,7 @@
if($type == "domain")
{
$domainid = intval($_REQUEST['domainid']);
- $hash = trim(mysql_escape_string(stripslashes($_REQUEST['hash'])));
+ $hash = trim(mysql_real_escape_string(stripslashes($_REQUEST['hash'])));
if($domainid <= 0 || $hash == "")
{
showheader(_("Domain Dispute"));
@@ -214,7 +214,7 @@
if($oldid == "1")
{
csrf_check('emaildispute');
- $email = trim(mysql_escape_string(stripslashes($_REQUEST['dispute'])));
+ $email = trim(mysql_real_escape_string(stripslashes($_REQUEST['dispute'])));
if($email == "")
{
showheader(_("Email Dispute"));
@@ -224,7 +224,7 @@
}
//check if email belongs to locked account
- $res = mysql_query("select 1 from `email`, `users` where `email`.`email`='$email' and `email`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1)");
+ $res = mysql_query("select 1 from `email`, `users` where `email`.`email`='$email' and `email`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1) and `email`.`deleted` = 0");
if(mysql_num_rows($res) > 0)
{
showheader(_("Email Dispute"));
@@ -307,7 +307,7 @@
if($oldid == "2")
{
csrf_check('domaindispute');
- $domain = trim(mysql_escape_string(stripslashes($_REQUEST['dispute'])));
+ $domain = trim(mysql_real_escape_string(stripslashes($_REQUEST['dispute'])));
if($domain == "")
{
showheader(_("Domain Dispute"));
@@ -317,7 +317,7 @@
}
//check if domain belongs to locked account
- $res = mysql_query("select 1 from `domains`, `users` where `domains`.`domain`='$domain' and `domains`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1)");
+ $res = mysql_query("select 1 from `domains`, `users` where `domains`.`domain`='$domain' and `domains`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1) and `domains`.`deleted` = 0");
if(mysql_num_rows($res) > 0)
{
showheader(_("Domain Dispute"));
@@ -389,7 +389,7 @@
$bits = explode(":", $line, 2);
$line = trim($bits[1]);
if(!in_array($line, $addy) && $line != "")
- $addy[] = trim(mysql_escape_string(stripslashes($line)));
+ $addy[] = trim(mysql_real_escape_string(stripslashes($line)));
}
} else {
if(is_array($adds))
@@ -406,7 +406,7 @@
$line = $bit;
}
if(!in_array($line, $addy) && $line != "")
- $addy[] = trim(mysql_escape_string(stripslashes($line)));
+ $addy[] = trim(mysql_real_escape_string(stripslashes($line)));
}
}
@@ -423,7 +423,7 @@
if($oldid == "5")
{
- $authaddy = trim(mysql_escape_string(stripslashes($_REQUEST['authaddy'])));
+ $authaddy = trim(mysql_real_escape_string(stripslashes($_REQUEST['authaddy'])));
if(!in_array($authaddy, $_SESSION['_config']['addy']) || $authaddy == "")
{
@@ -446,7 +446,7 @@
$domainid = intval($_SESSION['_config']['domainid']);
$memid = intval($_SESSION['_config']['memid']);
$oldmemid = intval($_SESSION['_config']['oldmemid']);
- $domain = mysql_escape_string($_SESSION['_config']['domain']);
+ $domain = mysql_real_escape_string($_SESSION['_config']['domain']);
$hash = make_hash();
$query = "insert into `disputedomain` set `domain`='$domain',`memid`='".$_SESSION['profile']['id']."',
diff --git a/www/gpg.php b/www/gpg.php
index 3b87009..4246adc 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -48,31 +48,421 @@
$keyid="";
-if(0)
-{
- if($_SESSION["profile"]["id"] != 5897)
- {
- showheader(_("Welcome to CAcert.org"));
- echo "The OpenPGP signing system is currently shutdown due to a maintenance. We hope to get it fixed within the next few hours. We are very sorry for the inconvenience.";
+function normalizeName($name) {
+ // Based on http://stackoverflow.com/questions/11176752/converting-named-html-entities-to-numeric-html-entities
+ static $HTML401NamedToNumeric = array(
+ //HTML 4.01 standard
+ '&nbsp;' => '&#160;', # no-break space = non-breaking space, U+00A0 ISOnum
+ '&iexcl;' => '&#161;', # inverted exclamation mark, U+00A1 ISOnum
+ '&cent;' => '&#162;', # cent sign, U+00A2 ISOnum
+ '&pound;' => '&#163;', # pound sign, U+00A3 ISOnum
+ '&curren;' => '&#164;', # currency sign, U+00A4 ISOnum
+ '&yen;' => '&#165;', # yen sign = yuan sign, U+00A5 ISOnum
+ '&brvbar;' => '&#166;', # broken bar = broken vertical bar, U+00A6 ISOnum
+ '&sect;' => '&#167;', # section sign, U+00A7 ISOnum
+ '&uml;' => '&#168;', # diaeresis = spacing diaeresis, U+00A8 ISOdia
+ '&copy;' => '&#169;', # copyright sign, U+00A9 ISOnum
+ '&ordf;' => '&#170;', # feminine ordinal indicator, U+00AA ISOnum
+ '&laquo;' => '&#171;', # left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
+ '&not;' => '&#172;', # not sign, U+00AC ISOnum
+ '&shy;' => '&#173;', # soft hyphen = discretionary hyphen, U+00AD ISOnum
+ '&reg;' => '&#174;', # registered sign = registered trade mark sign, U+00AE ISOnum
+ '&macr;' => '&#175;', # macron = spacing macron = overline = APL overbar, U+00AF ISOdia
+ '&deg;' => '&#176;', # degree sign, U+00B0 ISOnum
+ '&plusmn;' => '&#177;', # plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
+ '&sup2;' => '&#178;', # superscript two = superscript digit two = squared, U+00B2 ISOnum
+ '&sup3;' => '&#179;', # superscript three = superscript digit three = cubed, U+00B3 ISOnum
+ '&acute;' => '&#180;', # acute accent = spacing acute, U+00B4 ISOdia
+ '&micro;' => '&#181;', # micro sign, U+00B5 ISOnum
+ '&para;' => '&#182;', # pilcrow sign = paragraph sign, U+00B6 ISOnum
+ '&middot;' => '&#183;', # middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
+ '&cedil;' => '&#184;', # cedilla = spacing cedilla, U+00B8 ISOdia
+ '&sup1;' => '&#185;', # superscript one = superscript digit one, U+00B9 ISOnum
+ '&ordm;' => '&#186;', # masculine ordinal indicator, U+00BA ISOnum
+ '&raquo;' => '&#187;', # right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
+ '&frac14;' => '&#188;', # vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
+ '&frac12;' => '&#189;', # vulgar fraction one half = fraction one half, U+00BD ISOnum
+ '&frac34;' => '&#190;', # vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
+ '&iquest;' => '&#191;', # inverted question mark = turned question mark, U+00BF ISOnum
+ '&Agrave;' => '&#192;', # latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
+ '&Aacute;' => '&#193;', # latin capital letter A with acute, U+00C1 ISOlat1
+ '&Acirc;' => '&#194;', # latin capital letter A with circumflex, U+00C2 ISOlat1
+ '&Atilde;' => '&#195;', # latin capital letter A with tilde, U+00C3 ISOlat1
+ '&Auml;' => '&#196;', # latin capital letter A with diaeresis, U+00C4 ISOlat1
+ '&Aring;' => '&#197;', # latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
+ '&AElig;' => '&#198;', # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
+ '&Ccedil;' => '&#199;', # latin capital letter C with cedilla, U+00C7 ISOlat1
+ '&Egrave;' => '&#200;', # latin capital letter E with grave, U+00C8 ISOlat1
+ '&Eacute;' => '&#201;', # latin capital letter E with acute, U+00C9 ISOlat1
+ '&Ecirc;' => '&#202;', # latin capital letter E with circumflex, U+00CA ISOlat1
+ '&Euml;' => '&#203;', # latin capital letter E with diaeresis, U+00CB ISOlat1
+ '&Igrave;' => '&#204;', # latin capital letter I with grave, U+00CC ISOlat1
+ '&Iacute;' => '&#205;', # latin capital letter I with acute, U+00CD ISOlat1
+ '&Icirc;' => '&#206;', # latin capital letter I with circumflex, U+00CE ISOlat1
+ '&Iuml;' => '&#207;', # latin capital letter I with diaeresis, U+00CF ISOlat1
+ '&ETH;' => '&#208;', # latin capital letter ETH, U+00D0 ISOlat1
+ '&Ntilde;' => '&#209;', # latin capital letter N with tilde, U+00D1 ISOlat1
+ '&Ograve;' => '&#210;', # latin capital letter O with grave, U+00D2 ISOlat1
+ '&Oacute;' => '&#211;', # latin capital letter O with acute, U+00D3 ISOlat1
+ '&Ocirc;' => '&#212;', # latin capital letter O with circumflex, U+00D4 ISOlat1
+ '&Otilde;' => '&#213;', # latin capital letter O with tilde, U+00D5 ISOlat1
+ '&Ouml;' => '&#214;', # latin capital letter O with diaeresis, U+00D6 ISOlat1
+ '&times;' => '&#215;', # multiplication sign, U+00D7 ISOnum
+ '&Oslash;' => '&#216;', # latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
+ '&Ugrave;' => '&#217;', # latin capital letter U with grave, U+00D9 ISOlat1
+ '&Uacute;' => '&#218;', # latin capital letter U with acute, U+00DA ISOlat1
+ '&Ucirc;' => '&#219;', # latin capital letter U with circumflex, U+00DB ISOlat1
+ '&Uuml;' => '&#220;', # latin capital letter U with diaeresis, U+00DC ISOlat1
+ '&Yacute;' => '&#221;', # latin capital letter Y with acute, U+00DD ISOlat1
+ '&THORN;' => '&#222;', # latin capital letter THORN, U+00DE ISOlat1
+ '&szlig;' => '&#223;', # latin small letter sharp s = ess-zed, U+00DF ISOlat1
+ '&agrave;' => '&#224;', # latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
+ '&aacute;' => '&#225;', # latin small letter a with acute, U+00E1 ISOlat1
+ '&acirc;' => '&#226;', # latin small letter a with circumflex, U+00E2 ISOlat1
+ '&atilde;' => '&#227;', # latin small letter a with tilde, U+00E3 ISOlat1
+ '&auml;' => '&#228;', # latin small letter a with diaeresis, U+00E4 ISOlat1
+ '&aring;' => '&#229;', # latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
+ '&aelig;' => '&#230;', # latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
+ '&ccedil;' => '&#231;', # latin small letter c with cedilla, U+00E7 ISOlat1
+ '&egrave;' => '&#232;', # latin small letter e with grave, U+00E8 ISOlat1
+ '&eacute;' => '&#233;', # latin small letter e with acute, U+00E9 ISOlat1
+ '&ecirc;' => '&#234;', # latin small letter e with circumflex, U+00EA ISOlat1
+ '&euml;' => '&#235;', # latin small letter e with diaeresis, U+00EB ISOlat1
+ '&igrave;' => '&#236;', # latin small letter i with grave, U+00EC ISOlat1
+ '&iacute;' => '&#237;', # latin small letter i with acute, U+00ED ISOlat1
+ '&icirc;' => '&#238;', # latin small letter i with circumflex, U+00EE ISOlat1
+ '&iuml;' => '&#239;', # latin small letter i with diaeresis, U+00EF ISOlat1
+ '&eth;' => '&#240;', # latin small letter eth, U+00F0 ISOlat1
+ '&ntilde;' => '&#241;', # latin small letter n with tilde, U+00F1 ISOlat1
+ '&ograve;' => '&#242;', # latin small letter o with grave, U+00F2 ISOlat1
+ '&oacute;' => '&#243;', # latin small letter o with acute, U+00F3 ISOlat1
+ '&ocirc;' => '&#244;', # latin small letter o with circumflex, U+00F4 ISOlat1
+ '&otilde;' => '&#245;', # latin small letter o with tilde, U+00F5 ISOlat1
+ '&ouml;' => '&#246;', # latin small letter o with diaeresis, U+00F6 ISOlat1
+ '&divide;' => '&#247;', # division sign, U+00F7 ISOnum
+ '&oslash;' => '&#248;', # latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
+ '&ugrave;' => '&#249;', # latin small letter u with grave, U+00F9 ISOlat1
+ '&uacute;' => '&#250;', # latin small letter u with acute, U+00FA ISOlat1
+ '&ucirc;' => '&#251;', # latin small letter u with circumflex, U+00FB ISOlat1
+ '&uuml;' => '&#252;', # latin small letter u with diaeresis, U+00FC ISOlat1
+ '&yacute;' => '&#253;', # latin small letter y with acute, U+00FD ISOlat1
+ '&thorn;' => '&#254;', # latin small letter thorn, U+00FE ISOlat1
+ '&yuml;' => '&#255;', # latin small letter y with diaeresis, U+00FF ISOlat1
+ '&fnof;' => '&#402;', # latin small f with hook = function = florin, U+0192 ISOtech
+ '&Alpha;' => '&#913;', # greek capital letter alpha, U+0391
+ '&Beta;' => '&#914;', # greek capital letter beta, U+0392
+ '&Gamma;' => '&#915;', # greek capital letter gamma, U+0393 ISOgrk3
+ '&Delta;' => '&#916;', # greek capital letter delta, U+0394 ISOgrk3
+ '&Epsilon;' => '&#917;', # greek capital letter epsilon, U+0395
+ '&Zeta;' => '&#918;', # greek capital letter zeta, U+0396
+ '&Eta;' => '&#919;', # greek capital letter eta, U+0397
+ '&Theta;' => '&#920;', # greek capital letter theta, U+0398 ISOgrk3
+ '&Iota;' => '&#921;', # greek capital letter iota, U+0399
+ '&Kappa;' => '&#922;', # greek capital letter kappa, U+039A
+ '&Lambda;' => '&#923;', # greek capital letter lambda, U+039B ISOgrk3
+ '&Mu;' => '&#924;', # greek capital letter mu, U+039C
+ '&Nu;' => '&#925;', # greek capital letter nu, U+039D
+ '&Xi;' => '&#926;', # greek capital letter xi, U+039E ISOgrk3
+ '&Omicron;' => '&#927;', # greek capital letter omicron, U+039F
+ '&Pi;' => '&#928;', # greek capital letter pi, U+03A0 ISOgrk3
+ '&Rho;' => '&#929;', # greek capital letter rho, U+03A1
+ '&Sigma;' => '&#931;', # greek capital letter sigma, U+03A3 ISOgrk3
+ '&Tau;' => '&#932;', # greek capital letter tau, U+03A4
+ '&Upsilon;' => '&#933;', # greek capital letter upsilon, U+03A5 ISOgrk3
+ '&Phi;' => '&#934;', # greek capital letter phi, U+03A6 ISOgrk3
+ '&Chi;' => '&#935;', # greek capital letter chi, U+03A7
+ '&Psi;' => '&#936;', # greek capital letter psi, U+03A8 ISOgrk3
+ '&Omega;' => '&#937;', # greek capital letter omega, U+03A9 ISOgrk3
+ '&alpha;' => '&#945;', # greek small letter alpha, U+03B1 ISOgrk3
+ '&beta;' => '&#946;', # greek small letter beta, U+03B2 ISOgrk3
+ '&gamma;' => '&#947;', # greek small letter gamma, U+03B3 ISOgrk3
+ '&delta;' => '&#948;', # greek small letter delta, U+03B4 ISOgrk3
+ '&epsilon;' => '&#949;', # greek small letter epsilon, U+03B5 ISOgrk3
+ '&zeta;' => '&#950;', # greek small letter zeta, U+03B6 ISOgrk3
+ '&eta;' => '&#951;', # greek small letter eta, U+03B7 ISOgrk3
+ '&theta;' => '&#952;', # greek small letter theta, U+03B8 ISOgrk3
+ '&iota;' => '&#953;', # greek small letter iota, U+03B9 ISOgrk3
+ '&kappa;' => '&#954;', # greek small letter kappa, U+03BA ISOgrk3
+ '&lambda;' => '&#955;', # greek small letter lambda, U+03BB ISOgrk3
+ '&mu;' => '&#956;', # greek small letter mu, U+03BC ISOgrk3
+ '&nu;' => '&#957;', # greek small letter nu, U+03BD ISOgrk3
+ '&xi;' => '&#958;', # greek small letter xi, U+03BE ISOgrk3
+ '&omicron;' => '&#959;', # greek small letter omicron, U+03BF NEW
+ '&pi;' => '&#960;', # greek small letter pi, U+03C0 ISOgrk3
+ '&rho;' => '&#961;', # greek small letter rho, U+03C1 ISOgrk3
+ '&sigmaf;' => '&#962;', # greek small letter final sigma, U+03C2 ISOgrk3
+ '&sigma;' => '&#963;', # greek small letter sigma, U+03C3 ISOgrk3
+ '&tau;' => '&#964;', # greek small letter tau, U+03C4 ISOgrk3
+ '&upsilon;' => '&#965;', # greek small letter upsilon, U+03C5 ISOgrk3
+ '&phi;' => '&#966;', # greek small letter phi, U+03C6 ISOgrk3
+ '&chi;' => '&#967;', # greek small letter chi, U+03C7 ISOgrk3
+ '&psi;' => '&#968;', # greek small letter psi, U+03C8 ISOgrk3
+ '&omega;' => '&#969;', # greek small letter omega, U+03C9 ISOgrk3
+ '&thetasym;' => '&#977;', # greek small letter theta symbol, U+03D1 NEW
+ '&upsih;' => '&#978;', # greek upsilon with hook symbol, U+03D2 NEW
+ '&piv;' => '&#982;', # greek pi symbol, U+03D6 ISOgrk3
+ '&bull;' => '&#8226;', # bullet = black small circle, U+2022 ISOpub
+ '&hellip;' => '&#8230;', # horizontal ellipsis = three dot leader, U+2026 ISOpub
+ '&prime;' => '&#8242;', # prime = minutes = feet, U+2032 ISOtech
+ '&Prime;' => '&#8243;', # double prime = seconds = inches, U+2033 ISOtech
+ '&oline;' => '&#8254;', # overline = spacing overscore, U+203E NEW
+ '&frasl;' => '&#8260;', # fraction slash, U+2044 NEW
+ '&weierp;' => '&#8472;', # script capital P = power set = Weierstrass p, U+2118 ISOamso
+ '&image;' => '&#8465;', # blackletter capital I = imaginary part, U+2111 ISOamso
+ '&real;' => '&#8476;', # blackletter capital R = real part symbol, U+211C ISOamso
+ '&trade;' => '&#8482;', # trade mark sign, U+2122 ISOnum
+ '&alefsym;' => '&#8501;', # alef symbol = first transfinite cardinal, U+2135 NEW
+ '&larr;' => '&#8592;', # leftwards arrow, U+2190 ISOnum
+ '&uarr;' => '&#8593;', # upwards arrow, U+2191 ISOnum
+ '&rarr;' => '&#8594;', # rightwards arrow, U+2192 ISOnum
+ '&darr;' => '&#8595;', # downwards arrow, U+2193 ISOnum
+ '&harr;' => '&#8596;', # left right arrow, U+2194 ISOamsa
+ '&crarr;' => '&#8629;', # downwards arrow with corner leftwards = carriage return, U+21B5 NEW
+ '&lArr;' => '&#8656;', # leftwards double arrow, U+21D0 ISOtech
+ '&uArr;' => '&#8657;', # upwards double arrow, U+21D1 ISOamsa
+ '&rArr;' => '&#8658;', # rightwards double arrow, U+21D2 ISOtech
+ '&dArr;' => '&#8659;', # downwards double arrow, U+21D3 ISOamsa
+ '&hArr;' => '&#8660;', # left right double arrow, U+21D4 ISOamsa
+ '&forall;' => '&#8704;', # for all, U+2200 ISOtech
+ '&part;' => '&#8706;', # partial differential, U+2202 ISOtech
+ '&exist;' => '&#8707;', # there exists, U+2203 ISOtech
+ '&empty;' => '&#8709;', # empty set = null set = diameter, U+2205 ISOamso
+ '&nabla;' => '&#8711;', # nabla = backward difference, U+2207 ISOtech
+ '&isin;' => '&#8712;', # element of, U+2208 ISOtech
+ '&notin;' => '&#8713;', # not an element of, U+2209 ISOtech
+ '&ni;' => '&#8715;', # contains as member, U+220B ISOtech
+ '&prod;' => '&#8719;', # n-ary product = product sign, U+220F ISOamsb
+ '&sum;' => '&#8721;', # n-ary sumation, U+2211 ISOamsb
+ '&minus;' => '&#8722;', # minus sign, U+2212 ISOtech
+ '&lowast;' => '&#8727;', # asterisk operator, U+2217 ISOtech
+ '&radic;' => '&#8730;', # square root = radical sign, U+221A ISOtech
+ '&prop;' => '&#8733;', # proportional to, U+221D ISOtech
+ '&infin;' => '&#8734;', # infinity, U+221E ISOtech
+ '&ang;' => '&#8736;', # angle, U+2220 ISOamso
+ '&and;' => '&#8743;', # logical and = wedge, U+2227 ISOtech
+ '&or;' => '&#8744;', # logical or = vee, U+2228 ISOtech
+ '&cap;' => '&#8745;', # intersection = cap, U+2229 ISOtech
+ '&cup;' => '&#8746;', # union = cup, U+222A ISOtech
+ '&int;' => '&#8747;', # integral, U+222B ISOtech
+ '&there4;' => '&#8756;', # therefore, U+2234 ISOtech
+ '&sim;' => '&#8764;', # tilde operator = varies with = similar to, U+223C ISOtech
+ '&cong;' => '&#8773;', # approximately equal to, U+2245 ISOtech
+ '&asymp;' => '&#8776;', # almost equal to = asymptotic to, U+2248 ISOamsr
+ '&ne;' => '&#8800;', # not equal to, U+2260 ISOtech
+ '&equiv;' => '&#8801;', # identical to, U+2261 ISOtech
+ '&le;' => '&#8804;', # less-than or equal to, U+2264 ISOtech
+ '&ge;' => '&#8805;', # greater-than or equal to, U+2265 ISOtech
+ '&sub;' => '&#8834;', # subset of, U+2282 ISOtech
+ '&sup;' => '&#8835;', # superset of, U+2283 ISOtech
+ '&nsub;' => '&#8836;', # not a subset of, U+2284 ISOamsn
+ '&sube;' => '&#8838;', # subset of or equal to, U+2286 ISOtech
+ '&supe;' => '&#8839;', # superset of or equal to, U+2287 ISOtech
+ '&oplus;' => '&#8853;', # circled plus = direct sum, U+2295 ISOamsb
+ '&otimes;' => '&#8855;', # circled times = vector product, U+2297 ISOamsb
+ '&perp;' => '&#8869;', # up tack = orthogonal to = perpendicular, U+22A5 ISOtech
+ '&sdot;' => '&#8901;', # dot operator, U+22C5 ISOamsb
+ '&lceil;' => '&#8968;', # left ceiling = apl upstile, U+2308 ISOamsc
+ '&rceil;' => '&#8969;', # right ceiling, U+2309 ISOamsc
+ '&lfloor;' => '&#8970;', # left floor = apl downstile, U+230A ISOamsc
+ '&rfloor;' => '&#8971;', # right floor, U+230B ISOamsc
+ '&lang;' => '&#9001;', # left-pointing angle bracket = bra, U+2329 ISOtech
+ '&rang;' => '&#9002;', # right-pointing angle bracket = ket, U+232A ISOtech
+ '&loz;' => '&#9674;', # lozenge, U+25CA ISOpub
+ '&spades;' => '&#9824;', # black spade suit, U+2660 ISOpub
+ '&clubs;' => '&#9827;', # black club suit = shamrock, U+2663 ISOpub
+ '&hearts;' => '&#9829;', # black heart suit = valentine, U+2665 ISOpub
+ '&diams;' => '&#9830;', # black diamond suit, U+2666 ISOpub
+ '&quot;' => '&#34;', # quotation mark = APL quote, U+0022 ISOnum
+ '&amp;' => '&#38;', # ampersand, U+0026 ISOnum
+ '&lt;' => '&#60;', # less-than sign, U+003C ISOnum
+ '&gt;' => '&#62;', # greater-than sign, U+003E ISOnum
+ '&OElig;' => '&#338;', # latin capital ligature OE, U+0152 ISOlat2
+ '&oelig;' => '&#339;', # latin small ligature oe, U+0153 ISOlat2
+ '&Scaron;' => '&#352;', # latin capital letter S with caron, U+0160 ISOlat2
+ '&scaron;' => '&#353;', # latin small letter s with caron, U+0161 ISOlat2
+ '&Yuml;' => '&#376;', # latin capital letter Y with diaeresis, U+0178 ISOlat2
+ '&circ;' => '&#710;', # modifier letter circumflex accent, U+02C6 ISOpub
+ '&tilde;' => '&#732;', # small tilde, U+02DC ISOdia
+ '&ensp;' => '&#8194;', # en space, U+2002 ISOpub
+ '&emsp;' => '&#8195;', # em space, U+2003 ISOpub
+ '&thinsp;' => '&#8201;', # thin space, U+2009 ISOpub
+ '&zwnj;' => '&#8204;', # zero width non-joiner, U+200C NEW RFC 2070
+ '&zwj;' => '&#8205;', # zero width joiner, U+200D NEW RFC 2070
+ '&lrm;' => '&#8206;', # left-to-right mark, U+200E NEW RFC 2070
+ '&rlm;' => '&#8207;', # right-to-left mark, U+200F NEW RFC 2070
+ '&ndash;' => '&#8211;', # en dash, U+2013 ISOpub
+ '&mdash;' => '&#8212;', # em dash, U+2014 ISOpub
+ '&lsquo;' => '&#8216;', # left single quotation mark, U+2018 ISOnum
+ '&rsquo;' => '&#8217;', # right single quotation mark, U+2019 ISOnum
+ '&sbquo;' => '&#8218;', # single low-9 quotation mark, U+201A NEW
+ '&ldquo;' => '&#8220;', # left double quotation mark, U+201C ISOnum
+ '&rdquo;' => '&#8221;', # right double quotation mark, U+201D ISOnum
+ '&bdquo;' => '&#8222;', # double low-9 quotation mark, U+201E NEW
+ '&dagger;' => '&#8224;', # dagger, U+2020 ISOpub
+ '&Dagger;' => '&#8225;', # double dagger, U+2021 ISOpub
+ '&permil;' => '&#8240;', # per mille sign, U+2030 ISOtech
+ '&lsaquo;' => '&#8249;', # single left-pointing angle quotation mark, U+2039 ISO proposed
+ '&rsaquo;' => '&#8250;', # single right-pointing angle quotation mark, U+203A ISO proposed
+ '&euro;' => '&#8364;', # euro sign, U+20AC NEW
+
+ //XHTML standerd:
+ '&apos;' => '&#39;', # apostrophe = APL quote, U+0027 ISOnum
+ );
+
+ //Enhanced version of SanitizeHTML which is charset-aware for UTF-8 + ISO-8859-1
+ $charset = mb_detect_encoding($name, "auto, ISO-8859-1, UTF-8", true);
+ if(false === $charset || !in_array($charset, array('UTF-8', 'ISO-8859-1', 'ISO-8859-15', 'cp1251', 'cp1252', 'KOI8-R', 'BIG5', 'GB2312', 'BIG5-HKSCS', 'Shift_JIS', 'EUC-JP')) ) {
+ $charset = 'ISO-8859-1';
+ }
+ $name = htmlentities($name, ENT_QUOTES, $charset, false);
+
+ //Normalize HTML entities
+ $name = strtr($name, $HTML401NamedToNumeric);
+
+ return $name;
+}
- exit(0);
- }
+function expandVariants($name) {
+ static $replacements = array(
+ '&#168;' => array(''), # diaeresis = spacing diaeresis, U+00A8 ISOdia
+ '&#173;' => array('-'), # soft hyphen = discretionary hyphen, U+00AD ISOnum
+ '&#175;' => array(''), # macron = spacing macron = overline = APL overbar, U+00AF ISOdia
+ '&#180;' => array(''), # acute accent = spacing acute, U+00B4 ISOdia
+ '&#184;' => array(''), # cedilla = spacing cedilla, U+00B8 ISOdia
+ '&#192;' => array('A'), # latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
+ '&#193;' => array('A'), # latin capital letter A with acute, U+00C1 ISOlat1
+ '&#194;' => array('A'), # latin capital letter A with circumflex, U+00C2 ISOlat1
+ '&#195;' => array('A'), # latin capital letter A with tilde, U+00C3 ISOlat1
+ '&#196;' => array('Ae', 'A'), # latin capital letter A with diaeresis, U+00C4 ISOlat1
+ '&#197;' => array('A'), # latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
+ '&#198;' => array('AE'), # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
+ '&#199;' => array('C'), # latin capital letter C with cedilla, U+00C7 ISOlat1
+ '&#200;' => array('E'), # latin capital letter E with grave, U+00C8 ISOlat1
+ '&#201;' => array('E'), # latin capital letter E with acute, U+00C9 ISOlat1
+ '&#202;' => array('E'), # latin capital letter E with circumflex, U+00CA ISOlat1
+ '&#203;' => array('Ee', 'E'), # latin capital letter E with diaeresis, U+00CB ISOlat1
+ '&#204;' => array('I'), # latin capital letter I with grave, U+00CC ISOlat1
+ '&#205;' => array('I'), # latin capital letter I with acute, U+00CD ISOlat1
+ '&#206;' => array('I'), # latin capital letter I with circumflex, U+00CE ISOlat1
+ '&#207;' => array('Ie', 'I'), # latin capital letter I with diaeresis, U+00CF ISOlat1
+ '&#208;' => array('Dj', 'Gj', 'Th'), # latin capital letter ETH, U+00D0 ISOlat1
+ '&#209;' => array('N'), # latin capital letter N with tilde, U+00D1 ISOlat1
+ '&#210;' => array('O'), # latin capital letter O with grave, U+00D2 ISOlat1
+ '&#211;' => array('O'), # latin capital letter O with acute, U+00D3 ISOlat1
+ '&#212;' => array('O'), # latin capital letter O with circumflex, U+00D4 ISOlat1
+ '&#213;' => array('O'), # latin capital letter O with tilde, U+00D5 ISOlat1
+ '&#214;' => array('Oe', 'O'), # latin capital letter O with diaeresis, U+00D6 ISOlat1
+ '&#216;' => array('O'), # latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
+ '&#217;' => array('U'), # latin capital letter U with grave, U+00D9 ISOlat1
+ '&#218;' => array('U'), # latin capital letter U with acute, U+00DA ISOlat1
+ '&#219;' => array('U'), # latin capital letter U with circumflex, U+00DB ISOlat1
+ '&#220;' => array('Ue', 'U'), # latin capital letter U with diaeresis, U+00DC ISOlat1
+ '&#221;' => array('Y'), # latin capital letter Y with acute, U+00DD ISOlat1
+ '&#222;' => array('Th'), # latin capital letter THORN, U+00DE ISOlat1
+ '&#223;' => array('ss', 'sz'), # latin small letter sharp s = ess-zed, U+00DF ISOlat1
+ '&#224;' => array('a'), # latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
+ '&#225;' => array('a'), # latin small letter a with acute, U+00E1 ISOlat1
+ '&#226;' => array('a'), # latin small letter a with circumflex, U+00E2 ISOlat1
+ '&#227;' => array('a'), # latin small letter a with tilde, U+00E3 ISOlat1
+ '&#228;' => array('ae', 'a'), # latin small letter a with diaeresis, U+00E4 ISOlat1
+ '&#229;' => array('a'), # latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
+ '&#230;' => array('ae'), # latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
+ '&#231;' => array('c'), # latin small letter c with cedilla, U+00E7 ISOlat1
+ '&#232;' => array('e'), # latin small letter e with grave, U+00E8 ISOlat1
+ '&#233;' => array('e'), # latin small letter e with acute, U+00E9 ISOlat1
+ '&#234;' => array('e'), # latin small letter e with circumflex, U+00EA ISOlat1
+ '&#235;' => array('ee', 'e'), # latin small letter e with diaeresis, U+00EB ISOlat1
+ '&#236;' => array('i'), # latin small letter i with grave, U+00EC ISOlat1
+ '&#237;' => array('i'), # latin small letter i with acute, U+00ED ISOlat1
+ '&#238;' => array('i'), # latin small letter i with circumflex, U+00EE ISOlat1
+ '&#239;' => array('ie', 'i'), # latin small letter i with diaeresis, U+00EF ISOlat1
+ '&#240;' => array('dj', 'gj', 'th'), # latin small letter eth, U+00F0 ISOlat1
+ '&#241;' => array('n'), # latin small letter n with tilde, U+00F1 ISOlat1
+ '&#242;' => array('o'), # latin small letter o with grave, U+00F2 ISOlat1
+ '&#243;' => array('o'), # latin small letter o with acute, U+00F3 ISOlat1
+ '&#244;' => array('o'), # latin small letter o with circumflex, U+00F4 ISOlat1
+ '&#245;' => array('o'), # latin small letter o with tilde, U+00F5 ISOlat1
+ '&#246;' => array('oe', 'o'), # latin small letter o with diaeresis, U+00F6 ISOlat1
+ '&#248;' => array('o'), # latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
+ '&#249;' => array('u'), # latin small letter u with grave, U+00F9 ISOlat1
+ '&#250;' => array('u'), # latin small letter u with acute, U+00FA ISOlat1
+ '&#251;' => array('u'), # latin small letter u with circumflex, U+00FB ISOlat1
+ '&#252;' => array('ue', 'u'), # latin small letter u with diaeresis, U+00FC ISOlat1
+ '&#253;' => array('y'), # latin small letter y with acute, U+00FD ISOlat1
+ '&#254;' => array('th'), # latin small letter thorn, U+00FE ISOlat1
+ '&#255;' => array('y', 'ij', 'ii', 'ei'), # latin small letter y with diaeresis, U+00FF ISOlat1
+ '&#402;' => array('f'), # latin small f with hook = function = florin, U+0192 ISOtech
+ '&#338;' => array('OE'), # latin capital ligature OE, U+0152 ISOlat2
+ '&#339;' => array('oe'), # latin small ligature oe, U+0153 ISOlat2
+ '&#352;' => array('s'), # latin capital letter S with caron, U+0160 ISOlat2
+ '&#353;' => array('s'), # latin small letter s with caron, U+0161 ISOlat2
+ '&#376;' => array('Y', 'Ij', 'Ii', 'Ei'), # latin capital letter Y with diaeresis, U+0178 ISOlat2
+ '&#710;' => array(''), # modifier letter circumflex accent, U+02C6 ISOpub
+ );
+
+ $variants = array($name);
+
+ foreach($replacements as $rk => $rv) {
+ $vnew = array();
+ foreach($variants as $variant) {
+ foreach($rv as $rv1) {
+ $vnew[] = str_replace($rk, $rv1, $variant);
+ }
+ }
+ $variants = $vnew;
+ $variants = array_unique($variants);
+ }
+
+ $variants = array_filter($variants, function($a) { return false === strstr($a, "&"); } );
+
+ return $variants;
}
+function compareName($requested, $acceptable) {
+ if(empty($acceptable) || empty($requested)) {
+ return false;
+ }
+
+ $requested = normalizeName($requested);
+ $acceptable = normalizeName($acceptable);
+
+ if(0 === strcasecmp($requested, $acceptable)) {
+ return true;
+ }
+
+ $variants = expandVariants($acceptable);
+ foreach($variants as $acceptable_variant) {
+ if(0 === strcasecmp($requested, $acceptable_variant)) {
+ return true;
+ }
+ }
+
+ return false;
+}
function verifyName($name)
{
if($name == "") return 0;
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname'])) return 1; // John Doe
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname'])) return 1; // John Joseph Doe
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0]." ".$_SESSION['profile']['lname'])) return 1; // John J Doe
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0].". ".$_SESSION['profile']['lname'])) return 1; // John J. Doe
+ $q = mysql_query("SELECT HEX(CONVERT(users.fname USING utf8)) as fname, HEX(CONVERT(users.mname USING utf8)) as mname, HEX(CONVERT(users.lname USING utf8)) as lname, HEX(CONVERT(users.suffix USING UTF8)) as suffix FROM users WHERE id='" . intval($_SESSION["profile"]["id"]) . "'");
+ if( false === ($row = mysql_fetch_assoc($q)) ) {
+ return 0;
+ }
+
+ $row['fname'] = hex2bin($row['fname']);
+ $row['mname'] = hex2bin($row['mname']);
+ $row['lname'] = hex2bin($row['lname']);
+ $row['suffix'] = hex2bin($row['suffix']);
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; // John Doe Jr.
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John Joseph Doe Jr.
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0]." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John J Doe Jr.
- if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0].". ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John J. Doe Jr.
+ if(compareName($name, $row['fname']." ".$row['lname'])) return 1; // John Doe
+ if(compareName($name, $row['fname']." ".$row['mname']." ".$row['lname'])) return 1; // John Joseph Doe
+ if(compareName($name, $row['fname']." ".$row['mname'][0]." ".$row['lname'])) return 1; // John J Doe
+ if(compareName($name, $row['fname']." ".$row['mname'][0].". ".$row['lname'])) return 1; // John J. Doe
+
+ if(compareName($name, $row['fname']." ".$row['lname']." ".$row['suffix'])) return 1; // John Doe Jr.
+ if(compareName($name, $row['fname']." ".$row['mname']." ".$row['lname']." ".$row['suffix'])) return 1; //John Joseph Doe Jr.
+ if(compareName($name, $row['fname']." ".$row['mname'][0]." ".$row['lname']." ".$row['suffix'])) return 1; //John J Doe Jr.
+ if(compareName($name, $row['fname']." ".$row['mname'][0].". ".$row['lname']." ".$row['suffix'])) return 1; //John J. Doe Jr.
return 0;
}
@@ -84,8 +474,6 @@ function verifyEmail($email)
return 0;
}
-
-
$ToBeDeleted=array();
$state=0;
if($oldid == "0" && $CSR != "")
@@ -177,7 +565,7 @@ function verifyEmail($email)
if($npubs>1)
{
showheader(_("Welcome to CAcert.org"));
- echo "<font color='#ff0000'>"._("Please upload only one key at a time.")."</font>";
+ echo "<span class=\"error_indicator\">"._("Please upload only one key at a time.")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
@@ -201,7 +589,7 @@ function verifyEmail($email)
{
showheader(_("Welcome to CAcert.org"));
- echo "<font color='#ff0000'>"._("Multiple Email Adresses per UID are not allowed.")."</font>";
+ echo "<span class=\"error_indicator\">"._("Multiple Email Adresses per UID are not allowed.")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
@@ -209,7 +597,7 @@ function verifyEmail($email)
}
// Name (Comment) <Email>
- if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
+ if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(gpg_hex2bin($matches[1]));
$nocomment=0;
@@ -217,7 +605,7 @@ function verifyEmail($email)
$mail=trim(gpg_hex2bin($matches[3]));
}
// Name <EMail>
- elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
+ elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(gpg_hex2bin($matches[1]));
$nocomment=1;
@@ -230,7 +618,7 @@ function verifyEmail($email)
$nocomment=1;
$uidformatwrong=1;
}
- $nameok=verifyName($name);
+ $nameok=verifyName($name);
$emailok=verifyEmail($mail);
@@ -309,7 +697,7 @@ function verifyEmail($email)
showheader(_("Welcome to CAcert.org"));
echo $resulttable;
- echo "<font color='#ff0000'>"._("No valid UIDs found on your key")."</font>";
+ echo "<span class=\"error_indicator\">"._("No valid UIDs found on your key")."</span>";
unset($_REQUEST['process']);
$id = $oldid;
unset($oldid);
@@ -396,7 +784,7 @@ function verifyEmail($email)
}
$mail="";
- if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match)) {
+ if (preg_match("/<([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/", $bits[9],$match)) {
//echo "Found: ".$match[1];
$mail = trim(gpg_hex2bin($match[1]));
}
diff --git a/www/images/cacert4.png b/www/images/cacert4.png
index e4650a0..9da24c2 100644
--- a/www/images/cacert4.png
+++ b/www/images/cacert4.png
Binary files differ
diff --git a/www/index.php b/www/index.php
index 8c5560c..a3e4e14 100644
--- a/www/index.php
+++ b/www/index.php
@@ -53,7 +53,7 @@ require_once('../includes/notary.inc.php');
$oldid = 0;
if(array_key_exists('Q1',$_REQUEST) && $_REQUEST['Q1'])
{
- $_SESSION['lostpw']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A1']))));
+ $_SESSION['lostpw']['A1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A1']))));
if(stripslashes(strtolower($_SESSION['lostpw']['A1'])) == strtolower($_SESSION['lostpw']['user']['A1']))
$answers++;
@@ -61,7 +61,7 @@ require_once('../includes/notary.inc.php');
}
if(array_key_exists('Q2',$_REQUEST) && $_REQUEST['Q2'])
{
- $_SESSION['lostpw']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A2']))));
+ $_SESSION['lostpw']['A2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A2']))));
if(stripslashes(strtolower($_SESSION['lostpw']['A2'])) == strtolower($_SESSION['lostpw']['user']['A2']))
$answers++;
@@ -69,7 +69,7 @@ require_once('../includes/notary.inc.php');
}
if(array_key_exists('Q3',$_REQUEST) && $_REQUEST['Q3'])
{
- $_SESSION['lostpw']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A3']))));
+ $_SESSION['lostpw']['A3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A3']))));
if(stripslashes(strtolower($_SESSION['lostpw']['A3'])) == strtolower($_SESSION['lostpw']['user']['A3']))
$answers++;
@@ -77,7 +77,7 @@ require_once('../includes/notary.inc.php');
}
if(array_key_exists('Q4',$_REQUEST) && $_REQUEST['Q4'])
{
- $_SESSION['lostpw']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A4']))));
+ $_SESSION['lostpw']['A4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A4']))));
if(stripslashes(strtolower($_SESSION['lostpw']['A4'])) == strtolower($_SESSION['lostpw']['user']['A4']))
$answers++;
@@ -85,15 +85,15 @@ require_once('../includes/notary.inc.php');
}
if(array_key_exists('Q5',$_REQUEST) && $_REQUEST['Q5'])
{
- $_SESSION['lostpw']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A5']))));
+ $_SESSION['lostpw']['A5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A5']))));
if(stripslashes(strtolower($_SESSION['lostpw']['A5'])) == strtolower($_SESSION['lostpw']['user']['A5']))
$answers++;
$body .= "System: ".$_SESSION['lostpw']['user']['A5']."\nEntered: ".stripslashes(strip_tags($_SESSION['lostpw']['A5']))."\n";
}
- $_SESSION['lostpw']['pw1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['newpass1']))));
- $_SESSION['lostpw']['pw2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['newpass2']))));
+ $_SESSION['lostpw']['pw1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['newpass1']))));
+ $_SESSION['lostpw']['pw2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['newpass2']))));
if($answers < $_SESSION['lostpw']['total'] || $answers < 3)
{
@@ -130,7 +130,7 @@ require_once('../includes/notary.inc.php');
if($oldid == 5 && $process != "")
{
- $email = $_SESSION['lostpw']['email'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['email']))));
+ $email = $_SESSION['lostpw']['email'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['email']))));
$_SESSION['lostpw']['day'] = intval($_REQUEST['day']);
$_SESSION['lostpw']['month'] = intval($_REQUEST['month']);
$_SESSION['lostpw']['year'] = intval($_REQUEST['year']);
@@ -141,10 +141,17 @@ require_once('../includes/notary.inc.php');
{
$id = $oldid;
$oldid = 0;
- $_SESSION['_config']['errmsg'] = _("Unable to match your details with any user accounts on file");
+ $_SESSION['_config']['errmsg'] = _('Unable to match your details with any user accounts on file');
} else {
- $id = 6;
$_SESSION['lostpw']['user'] = mysql_fetch_assoc($res);
+ //check wether account is locked or deleted
+ if ($_SESSION['lostpw']['user']['locked'] == 1 || $_SESSION['lostpw']['user']['deleted'] != 0) {
+ $id = $oldid;
+ $oldid = 0;
+ $_SESSION['_config']['errmsg'] = sprintf(_('The account is not available, please get in contact with support (%s).'),'support@cacert.org');
+ } else {
+ $id = 6;
+ }
}
}
@@ -186,8 +193,8 @@ require_once('../includes/notary.inc.php');
$_SESSION['_config']['errmsg'] = "";
- $email = mysql_escape_string(stripslashes(strip_tags(trim($_REQUEST['email']))));
- $pword = mysql_escape_string(stripslashes(trim($_REQUEST['pword'])));
+ $email = mysql_real_escape_string(stripslashes(strip_tags(trim($_REQUEST['email']))));
+ $pword = mysql_real_escape_string(stripslashes(trim($_REQUEST['pword'])));
$query = "select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or
`password`=password('$pword')) and `verified`=1 and `deleted`=0 and `locked`=0";
$res = mysql_query($query);
@@ -210,10 +217,8 @@ require_once('../includes/notary.inc.php');
L10n::set_translation($_SESSION['profile']['language']);
L10n::init_gettext();
}
- $query = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 group by `to`";
- $res = mysql_query($query);
- $row = mysql_fetch_assoc($res);
- $_SESSION['profile']['points'] = $row['total'];
+ update_points_in_profile();
+
$_SESSION['profile']['loggedin'] = 1;
if($_SESSION['profile']['Q1'] == "" || $_SESSION['profile']['Q2'] == "" ||
$_SESSION['profile']['Q3'] == "" || $_SESSION['profile']['Q4'] == "" ||
@@ -289,26 +294,26 @@ if ($oldid == 52 )
$_SESSION['_config']['errmsg'] = "";
- $_SESSION['signup']['email'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['email']))));
- $_SESSION['signup']['fname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['fname']))));
- $_SESSION['signup']['mname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['mname']))));
- $_SESSION['signup']['lname'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['lname']))));
- $_SESSION['signup']['suffix'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['suffix']))));
+ $_SESSION['signup']['email'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['email']))));
+ $_SESSION['signup']['fname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['fname']))));
+ $_SESSION['signup']['mname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['mname']))));
+ $_SESSION['signup']['lname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['lname']))));
+ $_SESSION['signup']['suffix'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['suffix']))));
$_SESSION['signup']['day'] = intval($_REQUEST['day']);
$_SESSION['signup']['month'] = intval($_REQUEST['month']);
$_SESSION['signup']['year'] = intval($_REQUEST['year']);
- $_SESSION['signup']['pword1'] = trim(mysql_escape_string(stripslashes($_REQUEST['pword1'])));
- $_SESSION['signup']['pword2'] = trim(mysql_escape_string(stripslashes($_REQUEST['pword2'])));
- $_SESSION['signup']['Q1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q1']))));
- $_SESSION['signup']['Q2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q2']))));
- $_SESSION['signup']['Q3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q3']))));
- $_SESSION['signup']['Q4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q4']))));
- $_SESSION['signup']['Q5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['Q5']))));
- $_SESSION['signup']['A1'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A1']))));
- $_SESSION['signup']['A2'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A2']))));
- $_SESSION['signup']['A3'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A3']))));
- $_SESSION['signup']['A4'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A4']))));
- $_SESSION['signup']['A5'] = trim(mysql_escape_string(stripslashes(strip_tags($_REQUEST['A5']))));
+ $_SESSION['signup']['pword1'] = trim(mysql_real_escape_string(stripslashes($_REQUEST['pword1'])));
+ $_SESSION['signup']['pword2'] = trim(mysql_real_escape_string(stripslashes($_REQUEST['pword2'])));
+ $_SESSION['signup']['Q1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q1']))));
+ $_SESSION['signup']['Q2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q2']))));
+ $_SESSION['signup']['Q3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q3']))));
+ $_SESSION['signup']['Q4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q4']))));
+ $_SESSION['signup']['Q5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['Q5']))));
+ $_SESSION['signup']['A1'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A1']))));
+ $_SESSION['signup']['A2'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A2']))));
+ $_SESSION['signup']['A3'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A3']))));
+ $_SESSION['signup']['A4'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A4']))));
+ $_SESSION['signup']['A5'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['A5']))));
$_SESSION['signup']['general'] = intval(array_key_exists('general',$_REQUEST)?$_REQUEST['general']:0);
$_SESSION['signup']['country'] = intval(array_key_exists('country',$_REQUEST)?$_REQUEST['country']:0);
$_SESSION['signup']['regional'] = intval(array_key_exists('regional',$_REQUEST)?$_REQUEST['regional']:0);
@@ -397,7 +402,7 @@ if ($oldid == 52 )
if($score < 3)
{
$id = 1;
- $_SESSION['_config']['errmsg'] = _("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored $score points out of 6.");
+ $_SESSION['_config']['errmsg'] = sprintf(_("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. Only scored %s points out of 6."), $score);
}
if($id == 2)
diff --git a/www/robots.txt b/www/robots.txt
new file mode 100644
index 0000000..6ffbc30
--- /dev/null
+++ b/www/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+Disallow: /
+
diff --git a/www/stats.php b/www/stats.php
index d4d892d..824f19b 100644
--- a/www/stats.php
+++ b/www/stats.php
@@ -87,7 +87,7 @@
</tr>
<tr>
<td class="DataTD"><?=_("Assurers with test")?>:</td>
- <td class="DataTD"><?=$stats['aussurers_with_test'];?></td>
+ <td class="DataTD"><?=$stats['assurer_with_test'];?></td>
</tr>
<tr>
<td class="DataTD"><?=_("Points Issued")?>:</td>
@@ -102,7 +102,7 @@
<tr>
<td class="DataTD"><b><?=_("Date")?></b>
<td class="DataTD"><b><?=_("New Users")?></b>
- <td class="DataTD"><b><?=_("New Assurers")?></b>
+ <td class="DataTD"><b><?=_("New Assurers") . ' *'?></b>
<td class="DataTD"><b><?=_("New Certificates")?></b>
</tr>
<?
@@ -111,14 +111,14 @@
<tr>
<td class="DataTD"><?=$stats['growth_last_12m'][$i]['date'];?></td>
<td class="DataTD"><?=$stats['growth_last_12m'][$i]['new_users'];?></td>
- <td class="DataTD"><?=$stats['growth_last_12m'][$i]['new_assurers'];?></td>
+ <td class="DataTD"><?= $stats['growth_last_12m'][$i]['new_candidates'] . '/' . $stats['growth_last_12m'][$i]['new_assurers'];?></td>
<td class="DataTD"><?=$stats['growth_last_12m'][$i]['new_certificates'];?></td>
</tr>
<? } ?>
<tr>
<td class="DataTD"><?=_("Total")?></td>
<td class="DataTD"><?=$stats['growth_last_12m_total']['new_users'];?></td>
- <td class="DataTD"><?=$stats['growth_last_12m_total']['new_assurers'];?></td>
+ <td class="DataTD"><?=$stats['growth_last_12m_total']['new_candidates'] . '/' . $stats['growth_last_12m_total']['new_assurers'];?></td>
<td class="DataTD"><?=$stats['growth_last_12m_total']['new_certificates'];?></td>
</tr>
</table>
@@ -130,7 +130,7 @@
<tr>
<td class="DataTD"><b><?=_("Date")?></b>
<td class="DataTD"><b><?=_("New Users")?></b>
- <td class="DataTD"><b><?=_("New Assurers")?></b>
+ <td class="DataTD"><b><?=_("New Assurers") . ' *'?></b>
<td class="DataTD"><b><?=_("New Certificates")?></b>
</tr>
<?
@@ -139,21 +139,23 @@
<tr>
<td class="DataTD"><?=$stats['growth_last_years'][$i]['date'];?></td>
<td class="DataTD"><?=$stats['growth_last_years'][$i]['new_users'];?></td>
- <td class="DataTD"><?=$stats['growth_last_years'][$i]['new_assurers'];?></td>
+ <td class="DataTD"><?=$stats['growth_last_years'][$i]['new_candidates'] . '/' . $stats['growth_last_years'][$i]['new_assurers'];?></td>
<td class="DataTD"><?=$stats['growth_last_years'][$i]['new_certificates'];?></td>
</tr>
<? } ?>
<tr>
<td class="DataTD"><?=_("Total")?></td>
<td class="DataTD"><?=$stats['growth_last_years_total']['new_users'];?></td>
- <td class="DataTD"><?=$stats['growth_last_years_total']['new_assurers'];?></td>
+ <td class="DataTD"><?=$stats['growth_last_years_total']['new_candidates'] . '/' . $stats['growth_last_years_total']['new_assurers'];?></td>
<td class="DataTD"><?=$stats['growth_last_years_total']['new_certificates'];?></td>
</tr>
</table>
<br>
<div style="text-align: center;font-size: small;"><?
- printf(_("Last updated: %s"), date('Y-m-d H:i:s', $stats['timestamp']));?>
+ echo _('* user with at least 100 assurance points / assurer with CATS') . '</br>';
+ echo _('Difference of calculation of assurer between total and running total result from assurers that have been deleted from the system.') . '</br>';
+ printf(_("Last updated: %s"), date('Y-m-d H:i:s', $stats['timestamp']));?>
</div>
<? showfooter(); ?>
diff --git a/www/styles/default.css b/www/styles/default.css
index 4ddfbba..f178a37 100644
--- a/www/styles/default.css
+++ b/www/styles/default.css
@@ -21,7 +21,7 @@ body {
/******* hyperlink and anchor tag styles *******/
a:link, a:visited {
- color: #005fa9;
+ color: #a90000;
text-decoration: none;
}
@@ -34,14 +34,14 @@ a:hover {
h1 {
font: bold 120% Arial ,sans-serif;
- color: #334d55;
+ color: #550000;
margin: 0px;
padding: 0px;
}
h2 {
font: bold 114% Arial ,sans-serif;
- color: #006699;
+ color: #990000;
margin: 0px;
padding: 0px;
}
@@ -260,7 +260,7 @@ a.glink, a.glink:visited {
font-weight: bold;
margin: 0px;
padding: 2px 5px 4px 5px;
- border-right: 1px solid #8fb8bc;
+ border-right: 1px solid #BC8F8F;
}
a.glink:hover {
@@ -379,7 +379,7 @@ a.glink:hover {
}
#breadCrumb a:hover {
- color: #005fa9;
+ color: #A90000;
text-decoration: underline;
}
@@ -424,8 +424,8 @@ a.glink:hover {
.story a.capsule {
font: bold 1em Arial,sans-serif;
- color: #005FA9;
- display: block;
+ color: #A90000;
+ display:block;
padding-bottom: 5px;
}
@@ -468,12 +468,12 @@ td.storyLeft {
background-image: url("siteimages/bg_nav.jpg");
font-weight: bold;
padding: 3px 0px 3px 10px;
- color: #21536A;
+ color: #6A2121;
}
#sectionLinks a:hover {
border-top: 1px solid #cccccc;
- background-color: #DDEEFF;
+ background-color: #FFDDDD;
background-image: none;
font-weight: bold;
text-decoration: none;
@@ -619,7 +619,7 @@ td.greytxt {
}
.ac_highlight {
- background-color: #3366cc;
+ background-color: #cc3333;
color: white;
cursor: pointer;
}
@@ -644,6 +644,24 @@ td.greytxt {
font-size: 10px;
}
+/************** error and warning styles ****************/
+
+.error_fatal {
+ font-size: x-large;
+ color: #ff0000;
+ font-family: Arial,sans-serif;
+}
+
+.error_warning {
+ font-size: large;
+ color: #ffa500;
+ font-family: Arial,sans-serif;
+}
+
+.error_indicator, .warning_indicator {
+ color: #ff0000;
+}
+
/************** sponsorInfo styles ****************/
@@ -727,3 +745,21 @@ div.footerbar {
.accountdetail.suffix {
}
+
+/********* div align ********/
+.blockcenter {
+ text-align:center;
+ margin: 0 auto;
+}
+
+.blockleft {
+ text-align:left;
+ margin: 0;
+ margin-right:auto;
+}
+
+.blockright {
+ text-align:right;
+ margin: 0;
+ margin-left:auto;
+}
diff --git a/www/tverify/seclayer.php b/www/tverify/seclayer.php
deleted file mode 100644
index 50c7fb2..0000000
--- a/www/tverify/seclayer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<? /*
- LibreSSL - CAcert web application
- Copyright (C) 2004-2008 CAcert Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/ ?>
-<html>
- <head>
- <title>SecurityLayer Result</title>
- </head>
- <body>
- <h1>User: <?=htmlspecialchars($_REQUEST['user'])?></h1>
- The following is the result that your signature card has sent to CAcert. At this point, CAcert would have to parse the result and verify the signature, but this hasn't been implemented yet. Our developers might ask you to send them this data. But please be careful, since it contains your personal data!
- <pre><?=htmlspecialchars($_REQUEST['XMLResponse'])?></pre>
- </body>
- </html>
diff --git a/www/verify.php b/www/verify.php
index 6f603e4..2e409b6 100644
--- a/www/verify.php
+++ b/www/verify.php
@@ -43,7 +43,7 @@
{
$id = 1;
$emailid = intval($_REQUEST['emailid']);
- $hash = mysql_escape_string(stripslashes($_REQUEST['hash']));
+ $hash = mysql_real_escape_string(stripslashes($_REQUEST['hash']));
$query = "select * from `email` where `id`='$emailid' and hash!='' and deleted=0";
$res = mysql_query($query);
@@ -101,7 +101,7 @@
{
$id = 7;
$domainid = intval($_REQUEST['domainid']);
- $hash = mysql_escape_string(stripslashes($_REQUEST['hash']));
+ $hash = mysql_real_escape_string(stripslashes($_REQUEST['hash']));
$query = "select * from `domains` where `id`='$domainid' and hash!='' and deleted=0";
$res = mysql_query($query);
diff --git a/www/wot.php b/www/wot.php
index 35dce1f..1bcf009 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -27,7 +27,7 @@ function show_page($target,$message,$error)
if ($error != "")
$message=_("ERROR").": ".$error;
if ($message != "")
- echo "<p><font color='orange' size='+1'>".$message."</font></p>";
+ echo "<p class=\"error_warning\">".$message."</p>";
switch ($target)
{
@@ -79,6 +79,12 @@ function show_page($target,$message,$error)
case '15':
case 'MyPointsNew': includeit(15, "wot");
break;
+ case '16':
+ case 'TTPForm': includeit(16, "wot");
+ break;
+ case '17':
+ case 'AssurerCheck': includeit(17, "wot");
+ break;
}
showfooter();
@@ -121,6 +127,7 @@ function send_reminder()
if(array_key_exists('location',$_POST) && $_POST['location'] != "")
$_SESSION['_config']['location'] = $_POST['location'];
+ $id=array_key_exists('id',$_REQUEST)?intval($_REQUEST['id']):0;
$oldid=array_key_exists('oldid',$_REQUEST)?intval($_REQUEST['oldid']):0;
if($oldid == 12)
@@ -181,7 +188,7 @@ function send_reminder()
if($oldid == 5)
{
- $query = "select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' and `deleted`=0";
+ $query = "select * from `users` where `email`='".mysql_real_escape_string(stripslashes($_POST['email']))."' and `deleted`=0";
$res = mysql_query($query);
if(mysql_num_rows($res) != 1)
{
@@ -209,7 +216,7 @@ function send_reminder()
}
}
}
- $query = "select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."' and `locked`=1";
+ $query = "select * from `users` where `email`='".mysql_real_escape_string(stripslashes($_POST['email']))."' and `locked`=1";
$res = mysql_query($query);
if(mysql_num_rows($res) >= 1)
{
@@ -336,24 +343,13 @@ function send_reminder()
{
$max = maxpoints();
- $awarded = $newpoints = intval($_POST['points']);
- if($newpoints > $max)
- $newpoints = $awarded = $max;
- if($newpoints < 0)
- $newpoints = $awarded = 0;
-
- $query = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['_config']['notarise']['id'])."' and `deleted` = 0 group by `to`";
- $res = mysql_query($query);
- $drow = mysql_fetch_assoc($res);
-
- $_POST['expire'] = 0;
+ $awarded = intval($_POST['points']);
+ if($awarded > $max)
+ $awarded = $max;
+ if($awarded < 0)
+ $awarded = 0;
- if(($drow['total'] + $newpoints) > 100 && $max < 100)
- $newpoints = 100 - $drow['total'];
- if(($drow['total'] + $newpoints) > $max && $max >= 100)
- $newpoints = $max - $drow['total'];
- if($newpoints < 0)
- $newpoints = 0;
+ $drow_points = get_received_assurance_points(intval($_SESSION['_config']['notarise']['id']));
if(mysql_real_escape_string(stripslashes($_POST['date'])) == "")
$_POST['date'] = date("Y-m-d H:i:s");
@@ -376,7 +372,7 @@ function send_reminder()
{
$query = "insert into `notary` set `from`='".intval($_SESSION['profile']['id'])."',
`to`='".intval($_SESSION['_config']['notarise']['id'])."',
- `points`='".intval($newpoints)."', `awarded`='".intval($awarded)."',
+ `points`='0', `awarded`='".intval($awarded)."',
`location`='".mysql_real_escape_string(stripslashes($_POST['location']))."',
`date`='".mysql_real_escape_string(stripslashes($_POST['date']))."',
`when`=NOW()";
@@ -385,13 +381,17 @@ function send_reminder()
write_user_agreement($_SESSION['profile']['id'], "CCA", "assurance", "Assuring", 1, $_SESSION['_config']['notarise']['id']);
write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "assurance", "Being assured", 0, $_SESSION['profile']['id']);
}
- if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
+ if($_SESSION['profile']['ttpadmin'] >= 1 && $_POST['method'] == 'TTP-Assisted') {
$query .= ",\n`method`='TTP-Assisted'";
}
+ if($_SESSION['profile']['ttpadmin'] == 2 && $_POST['method'] == 'TTP-TOPUP') {
+ $query .= ",\n`method`='TTP-TOPUP'";
+ }
mysql_query($query);
- fix_assurer_flag($_SESSION['_config']['notarise']['id']);
include_once("../includes/notary.inc.php");
+ recalculate_old_assurance_points($_SESSION['_config']['notarise']['id']);
+ fix_assurer_flag($_SESSION['_config']['notarise']['id']);
if($_SESSION['profile']['points'] < 150)
{
$addpoints = 0;
@@ -416,17 +416,15 @@ function send_reminder()
L10n::set_translation($_SESSION['_config']['notarise']['language']);
$body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
- if($_POST['points'] != $newpoints)
- $body .= sprintf(_("You were issued %s points however the system has rounded this down to %s and you now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
- else
- $body .= sprintf(_("You were issued %s points and you now have %s points in total."), $newpoints, ($newpoints + $drow['total']))."\n\n";
- if(($drow['total'] + $newpoints) < 100 && ($drow['total'] + $newpoints) >= 50)
+ $body .= sprintf(_("You were issued %s assurance points and you now have %s assurance points in total."), $awarded, ($awarded + $drow_points))."\n\n";
+
+ if(($drow_points + $awarded) < 100 && ($drow_points + $awarded) >= 50)
{
$body .= _("You now have over 50 points, and can now have your name added to client certificates, and issue server certificates for up to 2 years.")."\n\n";
}
- if(($drow['total'] + $newpoints) >= 100 && $newpoints > 0)
+ if(($drow_points + $awarded) >= 100 && $drow_points < 0 && !is_assurer(intval($_SESSION['_config']['notarise']['id'])) )
{
$body .= _("You have at least 100 Assurance Points, if you want to become an assurer try the Assurer Challenge")." ( https://cats.cacert.org )\n\n";
$body .= _("To make it easier for others in your area to find you, it's helpful to list yourself as an assurer (this is voluntary), as well as a physical location where you live or work the most. You can flag your account to be listed, and add a comment to the display by going to:")."\n";
@@ -443,10 +441,7 @@ function send_reminder()
L10n::set_translation($my_translation);
$body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n";
- if($_POST['points'] != $newpoints)
- $body .= sprintf(_("You issued %s points however the system has rounded this down to %s and they now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
- else
- $body .= sprintf(_("You issued %s points and they now have %s points in total."), $newpoints, ($newpoints + $drow['total']))."\n\n";
+ $body .= sprintf(_("You issued %s assurance points."), $awarded)."\n\n";
$body .= _("Best regards")."\n";
$body .= _("CAcert Support Team");
@@ -491,9 +486,7 @@ function send_reminder()
$subject = $_REQUEST['subject'];
$userid = intval($_REQUEST['userid']);
$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($userid)."' and `listme`=1"));
- $points = mysql_num_rows(mysql_query("select sum(`points`) as `total` from `notary`
- where `to`='".intval($user['id'])."' and `deleted` = 0 group by `to` HAVING SUM(`points`) > 0"));
- if($points > 0)
+ if(is_assurer($userid) > 0)
{
$my_translation = L10n::get_translation();
L10n::set_translation($user['language']);
@@ -549,9 +542,76 @@ function send_reminder()
exit;
}
-// showheader(_("My CAcert.org Account!"));
-// echo "ID now = ".$id."/".$oldid.">>".$iecho;
-// includeit($id, "wot");
-// showfooter();
+ // Assurer Check
+ if($oldid == 17 )
+ {
+ $oldid = 0;
+ $id = 17;
+ $number = 5;
+ $email = mysql_real_escape_string(trim($_REQUEST['email']));
+ $reason = mysql_real_escape_string(trim($_REQUEST['reason']));
+ $uid = get_user_id_from_email($email);
+
+ if ($uid == 0) {
+ show_page("AssurerCheck", "", _("I'm sorry, there was no email matching what you entered in the system. Please double check your information."));
+ exit;
+ }
+
+ if ($reason == "--") {
+ show_page("AssurerCheck", "" ,_("I'm sorry, there was no reason given why you need to check the assurer status."));
+ exit;
+ }
+
+ if (get_number_of_adminlog_entries($_SESSION['profile']['id'],1000,1) > $number) {
+ show_page("AssurerCheck", "", sprintf(_("I'm sorry, you reached the maximum requests of %s per hour. Please wait until you try it again."),$number));
+ exit;
+ }
+
+ if (is_assurer($uid)) {
+ $status = _('Is assurer');
+ } else {
+ $status = _('Is no assurer');
+ }
+
+ write_se_log($uid, $_SESSION['profile']['id'], 'User Assurer status check', '', 1000);
+
+ $assurer = get_user($uid);
+
+ //mail to member
+ $my_translation = L10n::get_translation();
+ L10n::set_translation($assurer['language']);
+
+ $subject = "[CAcert.org] ". _("Assurer status report for you");
+
+ $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n";
+ $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."),
+ $_SESSION['profile']['fname'],
+ $_SESSION['profile']['lname'],
+ $_SESSION['profile']['email'],
+ $reason)."\n\n";
+ $body .= sprintf(_("The transmitted result: %s"), $status)."\n";
+ $body .= _("Best regards")."\n";
+ $body .= _("CAcert Support Team");
+
+ sendmail($assurer['email'], "[CAcert.org] ". $subject, $body,
+ "support@cacert.org", //from
+ "", //replyto
+ "", //toname
+ "CAcert Support"); //fromname
+
+ L10n::set_translation($my_translation);
+
+ showheader(_("My CAcert.org Account!"));?>
+ <p>
+ <?=sprintf(_('The assurer status for %s %s (%s) is: %s'),
+ $assurer['fname'],
+ $assurer['lname'],
+ $assurer['email'],
+ $status) . '<br/>'. _('The mail with the status request has been sent to the email address above.'); ?>
+ </p>
+ <?
+ showfooter();
+ exit;
+ }
+
show_page ($id,"","");
-?>