From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Sep 2024 16:53:51 +0000 (+0200)
Subject: wireguard.cgi: Rename function to check keys
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0739ae938f1881cb863018e2230e0f523f073005;p=people%2Fms%2Fipfire-2.x.git

wireguard.cgi: Rename function to check keys

This function can check all types of keys and not only the public key.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/cfgroot/wireguard-functions.pl b/config/cfgroot/wireguard-functions.pl
index bf4ba8c50..8cc0861ed 100644
--- a/config/cfgroot/wireguard-functions.pl
+++ b/config/cfgroot/wireguard-functions.pl
@@ -183,7 +183,7 @@ sub name_is_free($) {
 	return 1;
 }
 
-sub publickey_is_valid($) {
+sub key_is_valid($) {
 	my $key = shift;
 
 	# Try to decode the key
diff --git a/html/cgi-bin/wireguard.cgi b/html/cgi-bin/wireguard.cgi
index 360b29ee6..6a2cc48c7 100644
--- a/html/cgi-bin/wireguard.cgi
+++ b/html/cgi-bin/wireguard.cgi
@@ -180,14 +180,14 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{'save'}) {
 	}
 
 	# Check the public key
-	unless (&Wireguard::publickey_is_valid($cgiparams{'PUBLIC_KEY'})) {
+	unless (&Wireguard::key_is_valid($cgiparams{'PUBLIC_KEY'})) {
 		push(@errormessages, $Lang::tr{'wg invalid public key'});
 	}
 
 	# Check PSK
 	if ($cgiparams{'PSK'} eq '') {
 		# The PSK may be empty
-	} elsif (!&Wireguard::publickey_is_valid($cgiparams{'PSK'})) {
+	} elsif (!&Wireguard::key_is_valid($cgiparams{'PSK'})) {
 		push(@errormessages, $Lang::tr{'wg invalid psk'});
 	}