mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 11:13:53 +02:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Tue, 4 Feb 2020 22:17:27 +0100
|
|
Subject: [PATCH] wireguard: selftests: ensure non-addition of peers with
|
|
failed precomputation
|
|
|
|
commit f9398acba6a4ae9cb98bfe4d56414d376eff8d57 upstream.
|
|
|
|
Ensure that peers with low order points are ignored, both in the case
|
|
where we already have a device private key and in the case where we do
|
|
not. This adds points that naturally give a zero output.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
tools/testing/selftests/wireguard/netns.sh | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/tools/testing/selftests/wireguard/netns.sh
|
|
+++ b/tools/testing/selftests/wireguard/netns.sh
|
|
@@ -516,6 +516,12 @@ n0 wg set wg0 peer "$pub2" allowed-ips 0
|
|
n0 wg set wg0 peer "$pub2" allowed-ips 0.0.0.0/0
|
|
n0 wg set wg0 peer "$pub2" allowed-ips ::/0,1700::/111,5000::/4,e000::/37,9000::/75
|
|
n0 wg set wg0 peer "$pub2" allowed-ips ::/0
|
|
+n0 wg set wg0 peer "$pub2" remove
|
|
+low_order_points=( AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= 4Ot6fDtBuK4WVuP68Z/EatoJjeucMrH9hmIFFl9JuAA= X5yVvKNQjCSx0LFVnIPvWwREXMRYHI6G2CJO3dCfEVc= 7P///////////////////////////////////////38= 7f///////////////////////////////////////38= 7v///////////////////////////////////////38= )
|
|
+n0 wg set wg0 private-key /dev/null ${low_order_points[@]/#/peer }
|
|
+[[ -z $(n0 wg show wg0 peers) ]]
|
|
+n0 wg set wg0 private-key <(echo "$key1") ${low_order_points[@]/#/peer }
|
|
+[[ -z $(n0 wg show wg0 peers) ]]
|
|
ip0 link del wg0
|
|
|
|
declare -A objects
|