diff options
| author | jim-p <jimp@pfsense.org> | 2017-07-06 13:47:52 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-07-06 13:47:52 -0400 |
| commit | 7db120115ae10db8db1ada8430bd7a4bfc2f748b (patch) | |
| tree | ab0cc675dff1d2a6c72bef7b7b8ba25451d0fe0b /src/usr/local | |
| parent | 0c82b8c2a77bba6b2b3ab42a880c0e478ebc70f6 (diff) | |
| download | pfsense-7db120115ae10db8db1ada8430bd7a4bfc2f748b.zip pfsense-7db120115ae10db8db1ada8430bd7a4bfc2f748b.tar.gz | |
Add another possible CSR Armor string when validating. Ticket #7383
Diffstat (limited to 'src/usr/local')
| -rw-r--r-- | src/usr/local/www/system_certmanager.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 905153c..53eeebe 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -215,7 +215,9 @@ if ($_POST['save']) { gettext("Descriptive name"), gettext("CA to sign with")); - if (($_POST['csrtosign'] === "new") && (!strstr($_POST['csrpaste'], "BEGIN CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END CERTIFICATE REQUEST"))) { + if (($_POST['csrtosign'] === "new") && + ((!strstr($_POST['csrpaste'], "BEGIN CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END CERTIFICATE REQUEST")) && + (!strstr($_POST['csrpaste'], "BEGIN NEW CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END NEW CERTIFICATE REQUEST")))) { $input_errors[] = gettext("This signing request does not appear to be valid."); } |
