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:58:20 -0500 |
commit | ddfa8daa985ce4781bd9dccec012d37cc59e2675 (patch) | |
tree | d15e85ecaad2f259ce6440ee1118d14442c3979b | |
parent | 27c86938cbf49ddbf937badcd61fc17cd7d898aa (diff) | |
download | pfsense-ddfa8daa985ce4781bd9dccec012d37cc59e2675.zip pfsense-ddfa8daa985ce4781bd9dccec012d37cc59e2675.tar.gz |
Fix display of openssl errors when working with CA or certificate entries. Found this while looking into ticket #7370
-rw-r--r-- | src/usr/local/www/system_camanager.php | 15 | ||||
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 12 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 65a9bf5..2d2ab19 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -305,9 +305,11 @@ if ($_POST) { $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") { @@ -322,9 +324,11 @@ if ($_POST) { $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); + } } } } @@ -339,9 +343,8 @@ if ($_POST) { if (!$input_errors) { write_config(); + pfSenseHeader("system_camanager.php"); } - - pfSenseHeader("system_camanager.php"); } } diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index c0de277..bd3efe3 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -436,9 +436,11 @@ if ($_POST) { } if (!cert_create($cert, $pconfig['caref'], $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['type'], $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); + } } } } @@ -463,9 +465,11 @@ if ($_POST) { } if (!csr_generate($cert, $pconfig['csr_keylen'], $dn, $pconfig['csr_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); + } } } } |