summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Donald2026-01-31 14:47:30 +0000
committerHauke Mehrtens2026-02-08 23:47:28 +0000
commit89d6ada56e7a8c333b99e5fa6d2d26b6e6c562a9 (patch)
tree171f07a5105d1814b4565c1f2fc012bdbedd51aa
parent3a31d73d28bb7c6677f5ef56b98d348a4e3b0c79 (diff)
downloadopenwrt-89d6ada56e7a8c333b99e5fa6d2d26b6e6c562a9.tar.gz
wireguard-tools: avoid temp file for key gen
- no longer write any temporary file for key gen Signed-off-by: Paul Donald <newtwen+github@gmail.com> Link: https://github.com/openwrt/openwrt/pull/21784 Signed-off-by: Robert Marko <robimarko@gmail.com> (cherry picked from commit 97789875d5e23ebf3bd311454846649e8fb215bc) Link: https://github.com/openwrt/openwrt/pull/21840 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--package/network/utils/wireguard-tools/files/wireguard.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/package/network/utils/wireguard-tools/files/wireguard.sh b/package/network/utils/wireguard-tools/files/wireguard.sh
index 78a432a8d1..8226c327da 100644
--- a/package/network/utils/wireguard-tools/files/wireguard.sh
+++ b/package/network/utils/wireguard-tools/files/wireguard.sh
@@ -112,16 +112,10 @@ ensure_key_is_generated() {
local private_key
private_key="$(uci get network."$1".private_key)"
- if [ "$private_key" == "generate" ]; then
- local ucitmp
- oldmask="$(umask)"
- umask 077
- ucitmp="$(mktemp -d)"
+ if [ "$private_key" = "generate" ] || [ -z "$private_key" ]; then
private_key="$("${WG}" genkey)"
- uci -q -t "$ucitmp" set network."$1".private_key="$private_key" && \
- uci -q -t "$ucitmp" commit network
- rm -rf "$ucitmp"
- umask "$oldmask"
+ uci -q set network."$1".private_key="$private_key" && \
+ uci -q commit network
fi
}