From 71dcf959744e46707f2eaae6e567847c78d4acb5 Mon Sep 17 00:00:00 2001 From: Kyrylo Yatsenko Date: Wed, 10 Jun 2026 13:44:14 +0300 Subject: T8099: Update strongswan to 6.0.6 * Upgrade to 6.0.6 * Update 30-strongswan-configs.chroot to not change /etc/strongswan.d/charon.conf as the file is part of package strongswan-charon that should not be installed * Rebase all patches * Enable ML-KEM for Post Quantum --- .../hooks/live/30-strongswan-configs.chroot | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/data/live-build-config/hooks/live/30-strongswan-configs.chroot b/data/live-build-config/hooks/live/30-strongswan-configs.chroot index c71eefce..6bb04574 100755 --- a/data/live-build-config/hooks/live/30-strongswan-configs.chroot +++ b/data/live-build-config/hooks/live/30-strongswan-configs.chroot @@ -6,38 +6,22 @@ # Since we do not do remote access IPsec, the simplest solution # is to disable it entirely from the start. -import re - -# Disable the 'cisco_unity' option in charon.conf -with open('/etc/strongswan.d/charon.conf', 'r') as f: - charon_conf = f.read() - charon_conf = re.sub(r'# (cisco_unity = no)', r"\1", charon_conf) - -with open('/etc/strongswan.d/charon.conf', 'w') as f: - f.write(charon_conf) - - - # Prevent the 'cisco_unity' plugin from loading with open('/etc/strongswan.d/charon/unity.conf', 'r') as f: unity_conf = f.read() - unity_conf = re.sub(r'load = yes', r'load = no', unity_conf) + unity_conf = unity_conf.replace('load = yes', 'load = no') with open('/etc/strongswan.d/charon/unity.conf', 'w') as f: f.write(unity_conf) - - # Prevent the 'farp' plugin from loading with open('/etc/strongswan.d/charon/farp.conf', 'r') as f: farp_conf = f.read() - - farp_conf = re.sub(r'load = yes', r'load = no', farp_conf) + farp_conf = farp_conf.replace('load = yes', 'load = no') with open('/etc/strongswan.d/charon/farp.conf', 'w') as f: f.write(farp_conf) - # Add ike-name to logging charon_logging = """ charon { -- cgit v1.2.3