|
|
@ -23,7 +23,7 @@
|
|
|
|
$res = mysql_query($query);
|
|
|
|
$res = mysql_query($query);
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$row[crt_name] = "../crt/email-$row[id].crt";
|
|
|
|
$row['crt_name'] = "../crt/email-".$row['id'].".crt";
|
|
|
|
$days = 365;
|
|
|
|
$days = 365;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
|
|
|
@ -59,13 +59,15 @@
|
|
|
|
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
|
|
|
|
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
|
|
|
|
$serial = $bits[1];
|
|
|
|
$serial = $bits[1];
|
|
|
|
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='".$row['id']."'";
|
|
|
|
mysql_query($query);
|
|
|
|
mysql_query($query);
|
|
|
|
$body = _("Hi")." $user[fname],\n\n";
|
|
|
|
$body = _("Hi")." $user[fname],\n\n";
|
|
|
|
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
|
|
|
|
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
|
|
|
|
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
|
|
|
|
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
|
|
|
|
$body .= _("Best regards")."\n"._("CAcert.org Support!");
|
|
|
|
$body .= _("Best regards")."\n"._("CAcert.org Support!");
|
|
|
|
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
|
|
|
|
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$query = "delete from `emailcerts` where `id`='".$row['id']."'";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -73,7 +75,7 @@
|
|
|
|
$res = mysql_query($query);
|
|
|
|
$res = mysql_query($query);
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$row[crt_name] = "../crt/email-$row[id].crt";
|
|
|
|
$row['crt_name'] = "../crt/email-".$row['id'].".crt";
|
|
|
|
$days = 365;
|
|
|
|
$days = 365;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
|
|
|
|
$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]'"));
|
|
|
|
$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]'"));
|
|
|
@ -108,13 +110,16 @@
|
|
|
|
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
|
|
|
|
$bits = explode("=", trim(`/usr/bin/openssl x509 -serial -noout -in $row[crt_name]`), 2);
|
|
|
|
$serial = $bits[1];
|
|
|
|
$serial = $bits[1];
|
|
|
|
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
$query = "update `emailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='".$row['id']."'";
|
|
|
|
mysql_query($query);
|
|
|
|
mysql_query($query);
|
|
|
|
$body = _("Hi")." $user[fname],\n\n";
|
|
|
|
$body = _("Hi")." $user[fname],\n\n";
|
|
|
|
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
|
|
|
|
$body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]);
|
|
|
|
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
|
|
|
|
$body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n";
|
|
|
|
$body .= _("Best regards")."\n"._("CAcert.org Support!");
|
|
|
|
$body .= _("Best regards")."\n"._("CAcert.org Support!");
|
|
|
|
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
|
|
|
|
mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support <duane@cacert.org>");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$query = "delete from `emailcerts` where `id`='".$row['id']."'";
|
|
|
|
|
|
|
|
mysql_query($query);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -146,7 +151,7 @@
|
|
|
|
$res = mysql_query($query);
|
|
|
|
$res = mysql_query($query);
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$row[crt_name] = "../crt/orgemail-$row[id].crt";
|
|
|
|
$row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
|
|
|
|
$days = 365;
|
|
|
|
$days = 365;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -spkac $row[csr_name] -out $row[crt_name].der -days $days -key test -batch > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl x509 -inform DER -in $row[crt_name].der -outform PEM -out $row[crt_name] -text > /dev/null 2>&1`;
|
|
|
@ -174,6 +179,9 @@
|
|
|
|
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
mysql_query($query);
|
|
|
|
mysql_query($query);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$query = "delete from `orgemailcerts` where `id`='".$row['id']."'";
|
|
|
|
|
|
|
|
mysql_query($query);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -181,7 +189,7 @@
|
|
|
|
$res = mysql_query($query);
|
|
|
|
$res = mysql_query($query);
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
while($row = mysql_fetch_assoc($res))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$row[crt_name] = "../crt/orgemail-$row[id].crt";
|
|
|
|
$row[crt_name] = "../crt/orgemail-".$row['id'].".crt";
|
|
|
|
$days = 365;
|
|
|
|
$days = 365;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
|
|
|
|
$do = `/usr/bin/openssl ca -config /etc/ssl/openssl-client.cnf -in $row[csr_name] -out $row[crt_name] -days $days -key test -batch -subj '$row[subject]' > /dev/null 2>&1`;
|
|
|
|
if(filesize($row[crt_name]) > 0)
|
|
|
|
if(filesize($row[crt_name]) > 0)
|
|
|
@ -208,6 +216,9 @@
|
|
|
|
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
$query = "update `orgemailcerts` set `crt_name`='$row[crt_name]', `modified`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
`serial`='$serial', `expire`=FROM_UNIXTIME($date) where `id`='$row[id]'";
|
|
|
|
mysql_query($query);
|
|
|
|
mysql_query($query);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$query = "delete from `orgemailcerts` where `id`='".$row['id']."'";
|
|
|
|
|
|
|
|
mysql_query($query);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|