Remove two unused functions (now useless) and add a few more utility functions.

1 files changed, 48 insertions, 12 deletions

diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc
index 6bfaa7b..9ac7120 100644
--- a/etc/inc/certs.inc
+++ b/etc/inc/certs.inc
@@ -335,30 +335,66 @@ function cert_get_issuer($str_crt, $decode = true) {
 	return $issuer;
 }
 
-function get_all_user_certs($certsonly=false) {
+function is_user_cert($certref) {
 	global $config;
-	$usercerts = array();
 	if (!is_array($config['system']['user']))
 		return;
 	foreach ($config['system']['user'] as $user) {
 		if (!is_array($user['cert']))
 			continue;
 		foreach ($user['cert'] as $cert) {
-			$usercerts[] = $certsonly ? $cert['crt'] : $cert;
+			if ($certref == $cert)
+				return true;
 		}
 	}
-	return $usercerts;
+	return false;
 }
 
-function get_all_certs_tree() {
+function is_openvpn_server_cert($certref) {
 	global $config;
-	$cert_tree = array();
-	foreach ($config['ca'] as $ca)
-		$cert_tree[$ca['refid']] = $ca;
-	$usercerts = get_all_user_certs();
-	foreach ($usercerts as $cert)
-		$cert_tree[$cert['caref']]['certs'][] = $cert;
-	return $cert_tree;
+	if (!is_array($config['openvpn']['openvpn-server']))
+		return;
+	foreach ($config['openvpn']['openvpn-server'] as $ovpns) {
+		if ($ovpns['certref'] == $certref)
+			return true;
+	}
+	return false;
+}
+
+function is_openvpn_client_cert($certref) {
+	global $config;
+	if (!is_array($config['openvpn']['openvpn-client']))
+		return;
+	foreach ($config['openvpn']['openvpn-client'] as $ovpnc) {
+		if ($ovpnc['certref'] == $certref)
+			return true;
+	}
+	return false;
+}
+
+function is_ipsec_cert($certref) {
+	global $config;
+	if (!is_array($config['ipsec']['phase1']))
+		return;
+	foreach ($config['ipsec']['phase1'] as $ipsec) {
+		if ($ipsec['certref'] == $certref)
+			return true;
+	}
+	return false;
+}
+
+function is_webgui_cert($certref) {
+	global $config;
+	if ($config['system']['webgui']['ssl-certref'] == $certref)
+		return true;
+}
+
+function cert_in_use($certref) {
+	return (is_webgui_cert($certref) ||
+		is_user_cert($certref) ||
+		is_openvpn_server_cert($certref) ||
+		is_openvpn_client_cert($certref) ||
+		is_ipsec_cert($certref));
 }
 
 ?>