mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
3888fa7880
Rather than using the clunky, old, slower wireguard-linux-compat out of tree module, this commit does a patch-by-patch backport of upstream's wireguard to 5.4. This specific backport is in widespread use, being part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's Android kernel, Gentoo's distro kernel, and probably more I've forgotten about. It's definately the "more proper" way of adding wireguard to a kernel than the ugly compat.h hell of the wireguard-linux-compat repo. And most importantly for OpenWRT, it allows using the same module configuration code for 5.10 as for 5.4, with no need for bifurcation. These patches are from the backport tree which is maintained in the open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y I'll be sending PRs to update this as needed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
From eb6a11e6d69912d8bb0b951b08f6871785cfe0e9 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 084/124] 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
|