summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_certmanager.php
diff options
context:
space:
mode:
authorDaniel Seebald <d.seebald@reizwerk.com>2015-09-17 10:13:03 +0200
committerDaniel Seebald <d.seebald@reizwerk.com>2015-09-17 10:13:03 +0200
commit0edcccc3982f37dd9447cdbd57bb9a2969776277 (patch)
treebe2e495185b21787888deb31235430205aefc04d /src/usr/local/www/system_certmanager.php
parente18ffac2a4d5d4baec3adf8c1a3dd2c120cf82dc (diff)
downloadpfsense-0edcccc3982f37dd9447cdbd57bb9a2969776277.zip
pfsense-0edcccc3982f37dd9447cdbd57bb9a2969776277.tar.gz
Added the possibility to use wildcard hostnames in certificate manager SAN fields
Diffstat (limited to 'src/usr/local/www/system_certmanager.php')
-rw-r--r--src/usr/local/www/system_certmanager.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index ebf96df..2e10c69 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -234,13 +234,13 @@ if ($act == "csr") {
}
if ($_POST) {
-
+
// This is just the blank altername name that is added for display purposes. We don't want to validate/save it
if($_POST['altname_value0'] == "") {
unset($_POST['altname_type0']);
unset($_POST['altname_value0']);
}
-
+
if ($_POST['save'] == gettext("Save")) {
$input_errors = array();
$pconfig = $_POST;
@@ -323,8 +323,8 @@ if ($_POST) {
foreach ($altnames as $idx => $altname) {
switch ($altname['type']) {
case "DNS":
- if (!is_hostname($altname['value'])) {
- array_push($input_errors, "DNS subjectAltName values must be valid hostnames or FQDNs");
+ if (!is_hostname($altname['value'], true)) {
+ array_push($input_errors, "DNS subjectAltName values must be valid hostnames, FQDNs or wildcard domains.");
}
break;
case "IP":
@@ -551,7 +551,7 @@ include("head.inc");
if ($input_errors)
print_input_errors($input_errors);
-
+
if ($savemsg)
print_info_box($savemsg, 'success');
@@ -1263,4 +1263,4 @@ events.push(function(){
//]]>
</script>
<?php
-include('foot.inc'); \ No newline at end of file
+include('foot.inc');
OpenPOWER on IntegriCloud