bateast/wireguard-tools
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipc: uniformly ignore preshared keys that are zero

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2021-03-11 15:35:15 -07:00
parent f51349c52b
commit 4e4867dc95
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ipc-freebsd.h
View File

@ -136,7 +136,8 @@ static int kernel_get_device(struct wgdevice **device, const char *ifname)
binary = nvlist_get_binary(nvl_peers[i], "preshared-key", &size); binary = nvlist_get_binary(nvl_peers[i], "preshared-key", &size);
if (binary && size == sizeof(peer->preshared_key)) { if (binary && size == sizeof(peer->preshared_key)) {
memcpy(peer->preshared_key, binary, sizeof(peer->preshared_key)); memcpy(peer->preshared_key, binary, sizeof(peer->preshared_key));
peer->flags |= WGPEER_HAS_PRESHARED_KEY; if (!key_is_zero(peer->preshared_key))
peer->flags |= WGPEER_HAS_PRESHARED_KEY;
} }
} }
if (nvlist_exists_number(nvl_peers[i], "persistent-keepalive-interval")) { if (nvlist_exists_number(nvl_peers[i], "persistent-keepalive-interval")) {

3
src/ipc-openbsd.h
View File

@ -129,7 +129,8 @@ static int kernel_get_device(struct wgdevice **device, const char *iface)
if (wg_peer->p_flags & WG_PEER_HAS_PSK) { if (wg_peer->p_flags & WG_PEER_HAS_PSK) {
memcpy(peer->preshared_key, wg_peer->p_psk, sizeof(peer->preshared_key)); memcpy(peer->preshared_key, wg_peer->p_psk, sizeof(peer->preshared_key));
peer->flags |= WGPEER_HAS_PRESHARED_KEY; if (!key_is_zero(peer->preshared_key))
peer->flags |= WGPEER_HAS_PRESHARED_KEY;
} }
if (wg_peer->p_flags & WG_PEER_HAS_PKA) { if (wg_peer->p_flags & WG_PEER_HAS_PKA) {