mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deleted CSR key textarea - No longer required

Browse Source
This commit is contained in:
Steve Beaver 2017-03-15 11:08:24 -04:00
parent 92005dd1a5
commit d6107e1a4b
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/usr/local/www/system_certmanager.php
View File

@ -222,10 +222,6 @@ if ($_POST['save']) {
if (($_POST['csrtosign'] === "new") && (!strstr($_POST['csrpaste'], "BEGIN CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END CERTIFICATE REQUEST"))) {
$input_errors[] = gettext("This signing request does not appear to be valid.");
}
if (($_POST['csrtosign'] === "new") && (!strstr($_POST['keypaste'], "BEGIN PRIVATE KEY") || !strstr($_POST['keypaste'], "END PRIVATE KEY"))) {
$input_errors[] = gettext("This CSR key does not appear to be valid.");
}
}
if ($pconfig['method'] == "import") {
@ -402,12 +398,7 @@ if ($_POST['save']) {
$newcert['descr'] = $pconfig['descr'];
$newcert['type'] = $type;
$newcert['crt'] = base64_encode($n509);
if ($pconfig['csrtosign'] === "new") {
$newcert['prv'] = $pconfig['keypaste'];
} else {
$newcert['prv'] = $config['cert'][$pconfig['csrtosign']]['prv'];
}
$newcert['prv'] = $config['cert'][$pconfig['csrtosign']]['prv'];
$config['cert'][] = $newcert;
@ -670,7 +661,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
$idx++;
}
return ['new' => gettext('New')] + $allCsrs;
return ['new' => gettext('New CSR (Paste below)')] + $allCsrs;
}
$section = new Form_Section('Sign CSR');
@ -694,7 +685,7 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
'duration',
'*Certificate duration (days)',
'number',
$pconfig['duration'] ? $pconfig['duration']:'365'
$pconfig['duration'] ? $pconfig['duration']:'3650'
));
$section->addInput(new Form_Textarea(
@ -703,12 +694,6 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
$pconfig['csrpaste']
))->setHelp('Paste a Certificate Signing Request in X.509 PEM format here.');
$section->addInput(new Form_Textarea(
'keypaste',
'CSR key',
$pconfig['keypaste']
))->setHelp('Paste a Certificate Signing Request provate key in X.509 PEM format here.');
$form->add($section);
$section = new Form_Section('Import Certificate');
@ -1255,9 +1240,7 @@ events.push(function() {
var newcsr = ($('#csrtosign').val() == "new");
$('#csrpaste').attr('readonly', !newcsr);
$('#keypaste').attr('readonly', !newcsr);
setRequired('csrpaste', newcsr);
setRequired('keypaste', newcsr);
}
// ---------- Click checkbox handlers ---------------------------------------------------------