diff options
| author | jim-p <jimp@pfsense.org> | 2013-06-12 13:26:23 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-06-13 12:19:34 -0400 |
| commit | 8a0f8732a51562339486d4111b8a594b4f5906f1 (patch) | |
| tree | 114d66c8725ca39d0d372c8a25389a3e0e0d07a3 | |
| parent | 46b323f053ff4c90f767d1bbd8546f03888e779d (diff) | |
| download | pfsense-8a0f8732a51562339486d4111b8a594b4f5906f1.zip pfsense-8a0f8732a51562339486d4111b8a594b4f5906f1.tar.gz | |
Don't restrict the content of descr when making CA/Certs, it's free-form.
| -rw-r--r-- | usr/local/www/system_camanager.php | 2 | ||||
| -rw-r--r-- | usr/local/www/system_certmanager.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 9b143b6..0c122a0 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -213,7 +213,7 @@ if ($_POST) { }else if ($reqdfields[$i] == 'dn_commonname'){ if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST["dn_commonname"])) array_push($input_errors, "The field 'Distinguished name Common Name' contains invalid characters."); - }else if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) + }else if (($reqdfields[$i] != "descr") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); } if (!in_array($_POST["keylen"], $ca_keylens)) diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 3e3244f..b1e2fe1 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -292,7 +292,7 @@ if ($_POST) { }else if (preg_match('/commonname/', $reqdfields[$i])){ /* dn_commonname or csr_dn_commonname */ if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST["$reqdfields[$i]"])) array_push($input_errors, "The field 'Distinguished name Common Name' contains invalid characters."); - }else if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) + }else if (($reqdfields[$i] != "descr") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); } if (isset($_POST["keylen"]) && !in_array($_POST["keylen"], $cert_keylens)) |
