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 bf4ba8c50072ffeb1b5d053b37d08574bcadc2d7..8cc0861ed5837e5f68637ee263a2ca65ac3bf9f4 100644 (file)
--- 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 360b29ee6de815495c638401e83e9d1884044504..6a2cc48c77d1c505378614edca2d65b7a566b5ca 100644 (file)
--- 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'});
        }