Fix some additional cases for CN->SAN handling, and move some code to a function to avoid duplication for other pending uses. Ticket #7666

1 files changed, 27 insertions, 0 deletions

diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc
index b30a607..9e85177 100644
--- a/src/etc/inc/certs.inc
+++ b/src/etc/inc/certs.inc
@@ -39,6 +39,15 @@ $openssl_crl_status = array(
 	OCSP_REVOKED_STATUS_CERTIFICATEHOLD       => "Certificate Hold"
 );
 
+global $cert_altname_types;
+$cert_altname_types = array(
+	'DNS' => gettext('FQDN or Hostname'),
+	'IP' => gettext('IP address'),
+	'URI' => gettext('URI'),
+	'email' => gettext('email address'),
+);
+
+
 function & lookup_ca($refid) {
 	global $config;
 
@@ -1011,4 +1020,22 @@ function cert_escape_x509_chars($str, $reverse = false) {
 	}
 }
 
+function cert_add_altname_type($str) {
+	$type = "";
+	if (is_ipaddr($str)) {
+		$type = "IP";
+	} elseif (is_hostname($str)) {
+		$type = "DNS";
+	} elseif (is_URL($str)) {
+		$type = "URI";
+	} elseif (filter_var($str, FILTER_VALIDATE_EMAIL)) {
+		$type = "email";
+	}
+	if (!empty($type)) {
+		return "{$type}:" . cert_escape_x509_chars($str);
+	} else {
+		return "";
+	}
+}
+
 ?>