diff options
| author | jim-p <jimp@pfsense.org> | 2017-03-08 09:57:19 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-03-08 09:57:19 -0500 |
| commit | 5ce9bcf5edf5e6b3ba8acfb3538bbb4979f0cac0 (patch) | |
| tree | c3fccaf5bc5f746579fb013e1cb06fc80923c83c /src/usr/local/www/system_camanager.php | |
| parent | 8724b1add29a71d13c8de3f5bb327b58adcf5287 (diff) | |
| download | pfsense-5ce9bcf5edf5e6b3ba8acfb3538bbb4979f0cac0.zip pfsense-5ce9bcf5edf5e6b3ba8acfb3538bbb4979f0cac0.tar.gz | |
Fix display of openssl errors when working with CA or certificate entries. Found this while looking into ticket #7370
Diffstat (limited to 'src/usr/local/www/system_camanager.php')
| -rw-r--r-- | src/usr/local/www/system_camanager.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 33c31fd..99bc84e 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -274,9 +274,11 @@ if ($_POST['save']) { $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; } if (!ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['digest_alg'])) { + $input_errors = array(); while ($ssl_err = openssl_error_string()) { - $input_errors = array(); - array_push($input_errors, "openssl library returns: " . $ssl_err); + if (strpos($ssl_err, 'NCONF_get_string:no value') === false) { + array_push($input_errors, "openssl library returns: " . $ssl_err); + } } } } else if ($pconfig['method'] == "intermediate") { @@ -291,9 +293,11 @@ if ($_POST['save']) { $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; } if (!ca_inter_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['caref'], $pconfig['digest_alg'])) { + $input_errors = array(); while ($ssl_err = openssl_error_string()) { - $input_errors = array(); - array_push($input_errors, "openssl library returns: " . $ssl_err); + if (strpos($ssl_err, 'NCONF_get_string:no value') === false) { + array_push($input_errors, "openssl library returns: " . $ssl_err); + } } } } @@ -308,9 +312,8 @@ if ($_POST['save']) { if (!$input_errors) { write_config(); + pfSenseHeader("system_camanager.php"); } - - pfSenseHeader("system_camanager.php"); } } |
