diff options
| author | jim-p <jimp@pfsense.org> | 2013-02-19 09:06:32 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-02-19 09:06:32 -0500 |
| commit | 741d748d72c81f84fdeebe327c6d7ab61f843a84 (patch) | |
| tree | 00da535ffd8945e9fffa987de1472bb335d6767b /usr/local/www/system_certmanager.php | |
| parent | 1fea5ad99e477822675b2ba1edf10c34834fe55c (diff) | |
| download | pfsense-741d748d72c81f84fdeebe327c6d7ab61f843a84.zip pfsense-741d748d72c81f84fdeebe327c6d7ab61f843a84.tar.gz | |
Correct some inconsistencies in keylen/csr_keylen. Should fix csr generation errors mentioned on ticket #2820
Diffstat (limited to 'usr/local/www/system_certmanager.php')
| -rw-r--r-- | usr/local/www/system_certmanager.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 8450cf0..9a0e530 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -107,6 +107,7 @@ if ($act == "del") { if ($act == "new") { $pconfig['method'] = $_GET['method']; $pconfig['keylen'] = "2048"; + $pconfig['csr_keylen'] = "2048"; $pconfig['type'] = "user"; $pconfig['lifetime'] = "3650"; } @@ -293,7 +294,9 @@ if ($_POST) { }else if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); } - if (!in_array($_POST["keylen"], $cert_keylens)) + if (isset($_POST["keylen"]) && !in_array($_POST["keylen"], $cert_keylens)) + array_push($input_errors, gettext("Please select a valid Key Length.")); + if (isset($_POST["csr_keylen"]) && !in_array($_POST["csr_keylen"], $cert_keylens)) array_push($input_errors, gettext("Please select a valid Key Length.")); if (!in_array($_POST["digest_alg"], $openssl_digest_algs)) array_push($input_errors, gettext("Please select a valid Digest Algorithm.")); @@ -842,11 +845,11 @@ function internalca_change() { <td width="78%" class="vtable"> <select name='csr_keylen' class="formselect"> <?php - if (!isset($pconfig['keylen']) && isset($pconfig['csr_keylen'])) - $pconfig['keylen'] = $pconfig['csr_keylen']; + if (!isset($pconfig['csr_keylen']) && isset($pconfig['csr_keylen'])) + $pconfig['csr_keylen'] = $pconfig['csr_keylen']; foreach( $cert_keylens as $len): $selected = ""; - if ($pconfig['keylen'] == $len) + if ($pconfig['csr_keylen'] == $len) $selected = " selected"; ?> <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> |
