openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-07-12 20:34:25 +04:00
Code Issues Packages Projects Releases Wiki Activity

libreswan: fix default subnet matching

Browse Source 
Match only explicit default-route subnet tokens when normalizing leftsubnets and rightsubnets.

The previous regex treated dots as wildcards.

Values such as 10.250.0.0/16 and 10.0.0.0/8 were rewritten to 0.0.0.0/0.

Fixes: https://github.com/openwrt/openwrt/issues/23795
Signed-off-by: Dharmik Parmar <dharmikparmar2004@yahoo.com>
This commit is contained in:
Dharmik Parmar
2026-06-19 19:20:32 +05:30
committed by Josef Schlehofer
parent e698f817af
commit 527c1f1183
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/libreswan/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libreswan
PKG_VERSION:=4.12
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.libreswan.org/
net/libreswan/files/etc/init.d/ipsec
+14 -6
View File
@@ -78,6 +78,14 @@ expand_phase2alg() {
phase2alg_proposal="${encryption_algorithm:+${encryption_algorithm// /+}${hash_algorithm:+-${hash_algorithm// /+}${dh_group:+-${dh_group// /+}}}}"
}
append_subnet() {
local subnet="$1"
local var="$2"
[ "$subnet" = "0.0.0.0" ] && subnet="0.0.0.0/0"
append "$var" "$subnet" ","
}
generate_tunnel_config() {
local id=$1
local config_file="$IPSEC_CONF_DIR/$id.conf"
@@ -95,8 +103,6 @@ generate_tunnel_config() {
config_get rightid "$id" rightid "$right"
config_get leftsourceip "$id" leftsourceip
config_get rightsourceip "$id" rightsourceip
config_get leftsubnets "$id" leftsubnets
config_get rightsubnets "$id" rightsubnets
config_get_bool ikev2 "$id" ikev2
[ "$ikev2" = "1" ] && ikev2=yes || ikev2=no
config_get_bool rekey "$id" rekey
@@ -111,20 +117,22 @@ generate_tunnel_config() {
config_get nflog "$id" nflog 0
[ "$nflog" = "0" ] && unset nflog
leftsubnets=""
rightsubnets=""
config_list_foreach "$id" ike expand_ike
config_list_foreach "$id" phase2alg expand_phase2alg
config_list_foreach "$id" leftsubnets append_subnet leftsubnets
config_list_foreach "$id" rightsubnets append_subnet rightsubnets
config_get authby "$id" authby
config_get psk "$id" psk
if [ -n "$leftsubnets" ]; then
[[ "$leftsubnets" =~ 0.0.0.0* ]] && leftsubnets="0.0.0.0/0"
leftsubnets="{${leftsubnets// /,}}"
leftsubnets="{${leftsubnets}}"
fi
if [ -n "$rightsubnets" ]; then
[[ "$rightsubnets" =~ 0.0.0.0* ]] && rightsubnets="0.0.0.0/0"
rightsubnets="{${rightsubnets// /,}}"
rightsubnets="{${rightsubnets}}"
fi
config_get interface "$id" interface