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

Rework cert keylen/digest validation. Fixes #9180

Browse Source 
(cherry picked from commit ed76624bf0)
This commit is contained in:
jim-p 2018-12-07 14:15:31 -05:00
parent 806cf0618f
commit f8ce2bd498
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,21 +331,30 @@ if ($_POST['save']) {
array_push($input_errors, "The field 'Descriptive Name' contains invalid characters.");
}
if (($pconfig['method'] != "external") && isset($_POST["keylen"]) && !in_array($_POST["keylen"], $cert_keylens)) {
array_push($input_errors, gettext("Please select a valid Key Length."));
}
if (($pconfig['method'] != "external") && !in_array($_POST["digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
}
if (($pconfig['method'] == "external") && isset($_POST["csr_keylen"]) && !in_array($_POST["csr_keylen"], $cert_keylens)) {
array_push($input_errors, gettext("Please select a valid Key Length."));
}
if (($pconfig['method'] == "external") && !in_array($_POST["csr_digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
}
if (($pconfig['method'] == "sign") && !in_array($_POST["csrsign_digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
switch ($pconfig['method']) {
case "internal":
if (isset($_POST["keylen"]) && !in_array($_POST["keylen"], $cert_keylens)) {
array_push($input_errors, gettext("Please select a valid Key Length."));
}
if (!in_array($_POST["digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
}
break;
case "external":
if (isset($_POST["csr_keylen"]) && !in_array($_POST["csr_keylen"], $cert_keylens)) {
array_push($input_errors, gettext("Please select a valid Key Length."));
}
if (!in_array($_POST["csr_digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
}
break;
case "sign":
if (!in_array($_POST["csrsign_digest_alg"], $openssl_digest_algs)) {
array_push($input_errors, gettext("Please select a valid Digest Algorithm."));
}
break;
default:
break;
}
}