From 0739ae938f1881cb863018e2230e0f523f073005 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 27 Sep 2024 18:53:51 +0200 Subject: [PATCH] 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 --- config/cfgroot/wireguard-functions.pl | 2 +- html/cgi-bin/wireguard.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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'}); } -- 2.39.5