Merge pull request #710 from vktg/freeradiusecdsa

pfsense · Nov 25, 2019 · 946f638 · 946f638
2 parents 1bdb4e5 + e4c1b63
commit 946f638
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/net/pfSense-pkg-freeradius3/Makefile b/net/pfSense-pkg-freeradius3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-freeradius3
 PORTVERSION=	0.15.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradius.inc b/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradius.inc
@@ -1601,18 +1601,18 @@ EOD;
 	}
 }
 
+/* This change cannot be pulled back to RELENG_2_4_4 since it would break there.
+ * see https://redmine.pfsense.org/issues/9897
+ */
 // Gets started from freeradiuseapconf.xml
-function freeradius_get_ca_certs() {
-	global $config;
-	$ca_arr = array();
-	$ca_arr[] = array('refid' => 'none', 'descr' => 'none (auto)');
-
-	if (is_array($config['ca'])) {
-		foreach ($config['ca'] as $ca) {
-			$ca_arr[] = array('refid' => $ca['refid'], 'descr' => $ca['descr']);
-		}
-	}
-	return $ca_arr;
+function freeradius_get_ca_or_certs($type) {
+	$c_arr = array();
+	$c_arr[] = array('refid' => 'none', 'descr' => 'none (auto)');
+	$ecdsagood = cert_build_list($type, 'IPsec');
+	foreach ($ecdsagood as $refid => $descr) {
+		$c_arr[] = array('refid' => $refid, 'descr' => $descr);
+	}
+	return $c_arr;
 }
 
 // Gets started from freeradiuseapconf.xml
@@ -1629,20 +1629,6 @@ function freeradius_get_ca_crl() {
 	return $crl_arr;
 }
 
-// Gets started from freeradiuseapconf.xml
-function freeradius_get_server_certs() {
-	global $config;
-	$cert_arr = array();
-	$cert_arr[] = array('refid' => 'none', 'descr' => 'none (auto)');
-
-	if (is_array($config['cert'])) {
-		foreach ($config['cert'] as $cert) {
-			$cert_arr[] = array('refid' => $cert['refid'], 'descr' => $cert['descr']);
-		}
-	}
-	return $cert_arr;
-}
-
 function freeradius_sqlconf_resync() {
 	global $config;
 	$conf = '';

diff --git a/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradiuseapconf.xml b/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradiuseapconf.xml
@@ -188,7 +188,7 @@
 				]]>
 			</description>
 			<type>select_source</type>
-			<source><![CDATA[freeradius_get_ca_certs()]]></source>
+			<source><![CDATA[freeradius_get_ca_or_certs('ca')]]></source>
 			<source_name>descr</source_name>
 			<source_value>refid</source_value>
 		</field>
@@ -222,7 +222,7 @@
 				]]>
 			</description>
 			<type>select_source</type>
-			<source><![CDATA[freeradius_get_server_certs()]]></source>
+			<source><![CDATA[freeradius_get_ca_or_certs('cert')]]></source>
 			<source_name>descr</source_name>
 			<source_value>refid</source_value>
 		</field>

diff --git a/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradiusmodulesldap.xml b/net/pfSense-pkg-freeradius3/files/usr/local/pkg/freeradiusmodulesldap.xml
@@ -496,7 +496,7 @@
 				]]>
 			</description>
 			<type>select_source</type>
-			<source><![CDATA[freeradius_get_ca_certs()]]></source>
+			<source><![CDATA[freeradius_get_ca_or_certs('ca')]]></source>
 			<source_name>descr</source_name>
 			<source_value>refid</source_value>
 		</field>
@@ -513,7 +513,7 @@
 				]]>
 			</description>
 			<type>select_source</type>
-			<source><![CDATA[freeradius_get_server_certs()]]></source>
+			<source><![CDATA[freeradius_get_ca_or_certs('cert')]]></source>
 			<source_name>descr</source_name>
 			<source_value>refid</source_value>
 		</field>