summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Donald2026-01-31 14:47:30 +0000
committerRobert Marko2026-02-02 11:25:52 +0000
commit97789875d5e23ebf3bd311454846649e8fb215bc (patch)
tree9f03ea3f853e22a245d26641076d5f9cc056d5fe
parent400742a855e2d3e2288ba3b224037bc464dbbdf2 (diff)
downloadopenwrt-97789875d5e23ebf3bd311454846649e8fb215bc.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>
-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
}