diff mbox series

[3/3] Core Update 172: Ship and apply OpenVPN Diffie-Hellman changes

Message ID 24486420-e970-17cd-7b86-5f75e91d9a59@ipfire.org
State Accepted
Headers
Series [1/3] OpenVPN: Replace existing Diffie-Hellman parameter with ffdhe4096 |

Commit Message

Peter Müller Nov. 11, 2022, 12:15 p.m. UTC 
  Inspired by https://git.ipfire.org/?p=people/ummeegge/ipfire-2.x.git;a=commit;h=2ccc799f8bd6a12c3edab5f1a89fab4d2cd05ea8.

Cc: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/core/172/filelists/files |  1 +
 config/rootfiles/core/172/update.sh       | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/config/rootfiles/core/172/filelists/files b/config/rootfiles/core/172/filelists/files
index d73430dae..8b820d594 100644
--- a/config/rootfiles/core/172/filelists/files
+++ b/config/rootfiles/core/172/filelists/files
@@ -1,3 +1,4 @@ 
+etc/ssl/ffdhe4096.pem
 usr/lib/firewall/rules.pl
 usr/local/bin/addonctrl
 usr/local/bin/openvpnctrl
diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
index f3c77fbfb..eebe37456 100644
--- a/config/rootfiles/core/172/update.sh
+++ b/config/rootfiles/core/172/update.sh
@@ -33,6 +33,8 @@  done
 
 # Stop services
 /etc/rc.d/init.d/ipsec stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 /etc/rc.d/init.d/sshd stop
 /etc/rc.d/init.d/unbound stop
 
@@ -70,7 +72,8 @@  rm -rvf \
 	/usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing.py \
 	/usr/lib/python3.10/site-packages/setuptools/config.py \
 	/usr/lib/python3.10/site-packages/setuptools_rust/utils.py \
-	/usr/libexec/ipsec/scepclient
+	/usr/libexec/ipsec/scepclient \
+	/var/ipfire/ca/dh1024.pem
 
 # Remove powertop add-on, if installed
 if [ -e "/opt/pakfire/db/installed/meta-powertop" ]; then
@@ -98,11 +101,24 @@  ldconfig
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
+# Replace existing OpenVPN Diffie-Hellman parameter by ffdhe4096, as specified in RFC 7919
+if [ -f /var/ipfire/ovpn/server.conf ]; then
+	sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf
+fi
+
+if [ -f "/var/ipfire/ovpn/n2nconf/*/*.conf" ]; then
+	sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/n2nconf/*/*.conf
+fi
+
 # Start services
 /etc/init.d/unbound start
 if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
 	/etc/init.d/sshd start
 fi
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+	/usr/local/bin/openvpnctrl -s
+	/usr/local/bin/openvpnctrl -sn2n
+fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec start
 fi