diff options
author | Ermal <eri@pfsense.org> | 2010-03-18 12:49:48 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-03-18 12:49:48 +0000 |
commit | 47aa4fc48cc02ead267a3e0586c884e349966a7c (patch) | |
tree | e04281d38222293d20046aa5eac6277410e3f9e1 /usr/local/www/wizards/openvpn_wizard.inc | |
parent | db67053af0da5e1ceebc60a3d5435a53bcec353f (diff) | |
download | pfsense-47aa4fc48cc02ead267a3e0586c884e349966a7c.zip pfsense-47aa4fc48cc02ead267a3e0586c884e349966a7c.tar.gz |
Merge common name fields with descriptive name. Default to 3650 days of lifetime and 2048 bits key length.
Diffstat (limited to 'usr/local/www/wizards/openvpn_wizard.inc')
-rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index 9b8d52a..956c559 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -161,7 +161,7 @@ function step7_submitphpaction() { if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) || - empty($_POST['organization']) || empty($_POST['email']) || empty($_POST['cn'])) { + empty($_POST['organization']) || empty($_POST['email'])) { $stepid--; $savemsg = "Please enter all information for the new Certificate Authority."; } else { @@ -193,7 +193,7 @@ function step9_submitphpaction() { if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) || - empty($_POST['organization']) || empty($_POST['email']) || empty($_POST['cn'])) { + empty($_POST['organization']) || empty($_POST['email'])) { $stepid--; $savemsg = "Please enter all information for the new certificate."; } else { @@ -348,7 +348,7 @@ function step12_submitphpaction() { 'localityName' => $pconfig['step6']['city'], 'organizationName' => $pconfig['step6']['organization'], 'emailAddress' => $pconfig['step6']['email'], - 'commonName' => $pconfig['step6']['cn']); + 'commonName' => $pconfig['step6']['certca']); ca_create($ca, $pconfig['step6']['keylength'], $pconfig['step6']['lifetime'], $dn); if (!is_array($config['system']['ca'])) @@ -375,7 +375,7 @@ function step12_submitphpaction() { 'localityName' => $pconfig['step9']['city'], 'organizationName' => $pconfig['step9']['organization'], 'emailAddress' => $pconfig['step9']['email'], - 'commonName' => $pconfig['step9']['cn']); + 'commonName' => $pconfig['step9']['certname']); cert_create($cert, $ca['refid'], $pconfig['step9']['keylength'], $pconfig['step9']['lifetime'], $dn); if (!is_array($config['system']['cert'])) |