diff options
| author | yakatz <yehuda@ymkatz.net> | 2011-04-21 14:34:19 -0400 |
|---|---|---|
| committer | yakatz <yehuda@ymkatz.net> | 2011-04-21 14:34:19 -0400 |
| commit | a29aeb47af2b996ae4fe149e978f11f34f19e392 (patch) | |
| tree | a46446192a3b78e288ff6f411dfcb2d8b455342d /usr | |
| parent | ea7763c0d5ba9f2a19b51fba687a80922e9b134a (diff) | |
| parent | 1f0c76cfd7086aa90ea97a9775f2f024390a02ec (diff) | |
| download | pfsense-a29aeb47af2b996ae4fe149e978f11f34f19e392.zip pfsense-a29aeb47af2b996ae4fe149e978f11f34f19e392.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline.git
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/system_camanager.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 3bf1165..7fccb7e 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -153,6 +153,8 @@ if ($_POST) { gettext("Certificate data")); if ($_POST['cert'] && (!strstr($_POST['cert'], "BEGIN CERTIFICATE") || !strstr($_POST['cert'], "END CERTIFICATE"))) $input_errors[] = gettext("This certificate does not appear to be valid."); + if ($_POST['key'] && strstr($_POST['key'], "ENCRYPTED")) + $input_errors[] = gettext("Encrypted private keys are not yet supported."); } if ($pconfig['method'] == "internal") { $reqdfields = explode(" ", |
