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

Fix display of openssl errors when working with CA or certificate entries. Found this while looking into ticket #7370

Browse Source
This commit is contained in:
jim-p 2017-03-08 09:57:19 -05:00
parent 8724b1add2
commit 5ce9bcf5ed
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/usr/local/www/system_camanager.php
View File

@ -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");
}
}

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

@ -398,9 +398,11 @@ if ($_POST['save']) {
}
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);
}
}
}
}
@ -425,9 +427,11 @@ if ($_POST['save']) {
}
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);
}
}
}
}