|
|
@ -230,7 +230,7 @@
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$oldid = 4;
|
|
|
|
$oldid = 4;
|
|
|
|
$_REQUEST['keytype'] = "MS";
|
|
|
|
$_REQUEST['keytype'] = "MS";
|
|
|
|
$csr = trim($_REQUEST['optionalCSR']);
|
|
|
|
$csr = clean_csr($_REQUEST['optionalCSR']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -316,8 +316,8 @@
|
|
|
|
mysql_query("update `emailcerts` set `csr_name`='$CSRname' where `id`='".intval($emailid)."'");
|
|
|
|
mysql_query("update `emailcerts` set `csr_name`='$CSRname' where `id`='".intval($emailid)."'");
|
|
|
|
} else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype'] == "VI") {
|
|
|
|
} else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype'] == "VI") {
|
|
|
|
if($csr == "")
|
|
|
|
if($csr == "")
|
|
|
|
$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".trim($_REQUEST['CSR'])."\n-----END CERTIFICATE REQUEST-----\n";
|
|
|
|
$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".clean_csr($_REQUEST['CSR'])."\n-----END CERTIFICATE REQUEST-----\n";
|
|
|
|
$tmpfname = tempnam("/tmp", "CSR");
|
|
|
|
$tmpfname = tempnam("/tmp", "id4CSR");
|
|
|
|
$fp = fopen($tmpfname, "w");
|
|
|
|
$fp = fopen($tmpfname, "w");
|
|
|
|
fputs($fp, $csr);
|
|
|
|
fputs($fp, $csr);
|
|
|
|
fclose($fp);
|
|
|
|
fclose($fp);
|
|
|
@ -355,7 +355,7 @@
|
|
|
|
if($_SESSION['_config']['SSO'] == 1)
|
|
|
|
if($_SESSION['_config']['SSO'] == 1)
|
|
|
|
$csrsubject .= "/emailAddress = ".$user['uniqueID'];
|
|
|
|
$csrsubject .= "/emailAddress = ".$user['uniqueID'];
|
|
|
|
|
|
|
|
|
|
|
|
$tmpname = tempnam("/tmp", "CSR");
|
|
|
|
$tmpname = tempnam("/tmp", "id4csr");
|
|
|
|
$do = `/usr/bin/openssl req -in $tmpfname -out $tmpname`; // -subj "$csr"`;
|
|
|
|
$do = `/usr/bin/openssl req -in $tmpfname -out $tmpname`; // -subj "$csr"`;
|
|
|
|
@unlink($tmpfname);
|
|
|
|
@unlink($tmpfname);
|
|
|
|
$csr = "";
|
|
|
|
$csr = "";
|
|
|
@ -586,8 +586,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
if($process != "" && $oldid == 10)
|
|
|
|
if($process != "" && $oldid == 10)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$CSR = str_replace("\r\n","\n",trim($_REQUEST['CSR']));
|
|
|
|
$CSR = clean_csr($_REQUEST['CSR']);
|
|
|
|
$_SESSION['_config']['tmpfname'] = tempnam("/tmp", "Id10Csr");
|
|
|
|
$_SESSION['_config']['tmpfname'] = tempnam("/tmp", "id10CSR");
|
|
|
|
$fp = fopen($_SESSION['_config']['tmpfname'], "w");
|
|
|
|
$fp = fopen($_SESSION['_config']['tmpfname'], "w");
|
|
|
|
if(strpos($CSR,"---BEGIN")===FALSE)
|
|
|
|
if(strpos($CSR,"---BEGIN")===FALSE)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1363,8 +1363,8 @@
|
|
|
|
fclose($fp);
|
|
|
|
fclose($fp);
|
|
|
|
mysql_query("update `orgemailcerts` set `csr_name`='$CSRname' where `id`='$emailid'");
|
|
|
|
mysql_query("update `orgemailcerts` set `csr_name`='$CSRname' where `id`='$emailid'");
|
|
|
|
} else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype']=="VI") {
|
|
|
|
} else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype']=="VI") {
|
|
|
|
$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".$_REQUEST['CSR']."-----END CERTIFICATE REQUEST-----\n";
|
|
|
|
$csr = "-----BEGIN CERTIFICATE REQUEST-----\n".clean_csr($_REQUEST['CSR'])."-----END CERTIFICATE REQUEST-----\n";
|
|
|
|
$tmpfname = tempnam("/tmp", "CSROrgClient");
|
|
|
|
$tmpfname = tempnam("/tmp", "id17CSR");
|
|
|
|
$fp = fopen($tmpfname, "w");
|
|
|
|
$fp = fopen($tmpfname, "w");
|
|
|
|
fputs($fp, $csr);
|
|
|
|
fputs($fp, $csr);
|
|
|
|
fclose($fp);
|
|
|
|
fclose($fp);
|
|
|
@ -1393,7 +1393,7 @@
|
|
|
|
if($org['C'])
|
|
|
|
if($org['C'])
|
|
|
|
$csrsubject .= "/countryName=".$org['C'];
|
|
|
|
$csrsubject .= "/countryName=".$org['C'];
|
|
|
|
|
|
|
|
|
|
|
|
$tmpname = tempnam("/tmp", "CSR");
|
|
|
|
$tmpname = tempnam("/tmp", "id17csr");
|
|
|
|
$do = `/usr/bin/openssl req -in $tmpfname -out $tmpname`;
|
|
|
|
$do = `/usr/bin/openssl req -in $tmpfname -out $tmpname`;
|
|
|
|
@unlink($tmpfname);
|
|
|
|
@unlink($tmpfname);
|
|
|
|
$csr = "";
|
|
|
|
$csr = "";
|
|
|
@ -1575,8 +1575,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
if($process != "" && $oldid == 20)
|
|
|
|
if($process != "" && $oldid == 20)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$CSR = trim($_REQUEST['CSR']);
|
|
|
|
$CSR = clean_csr($_REQUEST['CSR']);
|
|
|
|
$_SESSION['_config']['tmpfname'] = tempnam("/tmp", "FOO");
|
|
|
|
$_SESSION['_config']['tmpfname'] = tempnam("/tmp", "id20CSR");
|
|
|
|
$fp = fopen($_SESSION['_config']['tmpfname'], "w");
|
|
|
|
$fp = fopen($_SESSION['_config']['tmpfname'], "w");
|
|
|
|
fputs($fp, $CSR);
|
|
|
|
fputs($fp, $CSR);
|
|
|
|
fclose($fp);
|
|
|
|
fclose($fp);
|
|
|
@ -2394,7 +2394,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
if($process != "" && $oldid == 45)
|
|
|
|
if($process != "" && $oldid == 45)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$CSR = trim($CSR);
|
|
|
|
$CSR = clean_csr($CSR);
|
|
|
|
$_SESSION['_config']['CSR'] = $CSR;
|
|
|
|
$_SESSION['_config']['CSR'] = $CSR;
|
|
|
|
$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
|
|
|
|
$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
|
|
|
|
$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
|
|
|
|
$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
|
|
|
@ -2420,7 +2420,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
if($process != "" && $oldid == 46)
|
|
|
|
if($process != "" && $oldid == 46)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$CSR = $_SESSION['_config']['CSR'];
|
|
|
|
$CSR = clean_csr($_SESSION['_config']['CSR']);
|
|
|
|
$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
|
|
|
|
$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
|
|
|
|
$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
|
|
|
|
$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
|
|
|
|
foreach($bits as $val)
|
|
|
|
foreach($bits as $val)
|
|
|
|