From 82b7f50a1c87739b08414f20b69dd1853f5ce495 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 12 Jun 2013 13:26:23 -0400 Subject: Don't restrict the content of descr when making CA/Certs, it's free-form. --- usr/local/www/system_camanager.php | 2 +- usr/local/www/system_certmanager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 4d0c961..3abc843 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -211,7 +211,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."); } diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 312aa52..95d604a 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -242,7 +242,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."); } -- cgit v1.1