diff options
| author | jim-p <jimp@pfsense.org> | 2017-07-07 17:07:42 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-07-07 17:07:42 -0400 |
| commit | 2504e3f1bc077eb788a94c9a03ec9a98f28ffcb0 (patch) | |
| tree | ca4f9d682be1c73ceefa2b7e2f0348cb1875f8b3 /src | |
| parent | 5764c3639d6bc9af05badf8711f4242758ad581a (diff) | |
| download | pfsense-2504e3f1bc077eb788a94c9a03ec9a98f28ffcb0.zip pfsense-2504e3f1bc077eb788a94c9a03ec9a98f28ffcb0.tar.gz | |
Fix CA reference so serial increases properly. Remove variable for feature that didn't work out. Ticket #7527
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/certs.inc | 2 | ||||
| -rw-r--r-- | src/usr/local/www/system_certmanager.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 9d71199..1ed1b6e 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -435,7 +435,7 @@ function csr_generate(& $cert, $keylen, $dn, $type = "user", $digest_alg = "sha2 return true; } -function csr_sign($csr, $ca, $duration, $copyattributes = true, $type = "user", $altnames) { +function csr_sign($csr, & $ca, $duration, $type = "user", $altnames) { global $config; $old_err_level = error_reporting(0); diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 53eeebe..0278b5e 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -383,7 +383,7 @@ if ($_POST['save']) { } } else if ($pconfig['method'] == "sign") { // Sign a CSR $csrid = lookup_cert($pconfig['csrtosign']); - $ca = lookup_ca($pconfig['catosignwith']); + $ca = & lookup_ca($pconfig['catosignwith']); // Read the CSR from $config, or if a new one, from the textarea if ($pconfig['csrtosign'] === "new") { @@ -398,7 +398,7 @@ if ($_POST['save']) { $altname_str = implode(",", $altnames_tmp); } - $n509 = csr_sign($csr, $ca, $pconfig['csrsign_lifetime'], ($_POST['csrsign_copy'] == "yes"), $pconfig['type'], $altname_str); + $n509 = csr_sign($csr, $ca, $pconfig['csrsign_lifetime'], $pconfig['type'], $altname_str); if ($n509) { // Gather the details required to save the new cert |
