From: "cron2 (Code Review)" Date: Wed, 20 Aug 2025 15:02:43 +0000 References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="HE2A0XJUx58="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Remove use of 'dh dh2048.pem' from sample configs, remove 'dh2048.pem... List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --HE2A0XJUx58= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1145?usp=3Demail to review the following change. Change subject: Remove use of 'dh dh2048.pem' from sample configs, remove '= dh2048.pem' file ...................................................................... Remove use of 'dh dh2048.pem' from sample configs, remove 'dh2048.pem' file Since commit bd9aa06feb41 (Jan 2015) OpenVPN has allowed to use '--dh none' to disable traditional Diffie Hellman, since more secure ECDH algorithms are available that do not use explicit DH parameters. If configured with a suffiently high securelevel (3+), or if running in FIPS mode, OpenSSL 3.5 will refuse 2048 bit DH files, making our tests fail. Thus, remove all the DH2048 stuff from our sample configs. Change-Id: If66438662bd862a195b2a69c4fa45f63838982b7 Signed-off-by: Gert Doering --- M sample/sample-config-files/loopback-server M sample/sample-config-files/server.conf D sample/sample-keys/dh2048.pem M sample/sample-plugins/keying-material-exporter-demo/server.ovpn 4 files changed, 3 insertions(+), 16 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/45/1145/1 diff --git a/sample/sample-config-files/loopback-server b/sample/sample-con= fig-files/loopback-server index 58daeb56..1980218 100644 --- a/sample/sample-config-files/loopback-server +++ b/sample/sample-config-files/loopback-server @@ -17,7 +17,7 @@ verb 3 reneg-sec 10 tls-server -dh sample-keys/dh2048.pem +dh none ca sample-keys/ca.crt key sample-keys/server.key cert sample-keys/server.crt diff --git a/sample/sample-config-files/server.conf b/sample/sample-config-= files/server.conf index f6d9e65..8943c34 100644 --- a/sample/sample-config-files/server.conf +++ b/sample/sample-config-files/server.conf @@ -87,11 +87,6 @@ cert server.crt key server.key # This file should be kept secret -# Diffie hellman parameters. -# Generate your own with: -# openssl dhparam -out dh2048.pem 2048 -dh dh2048.pem - # Allow to connect to really old OpenVPN versions # without AEAD support (OpenVPN 2.3.x or older) # This adds AES-256-CBC as fallback cipher and @@ -306,4 +301,4 @@ # Notify the client that when the server restarts so it # can automatically reconnect. -explicit-exit-notify 1 \ No newline at end of file +explicit-exit-notify 1 diff --git a/sample/sample-keys/dh2048.pem b/sample/sample-keys/dh2048.pem deleted file mode 100644 index d393581..0000000 --- a/sample/sample-keys/dh2048.pem +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIIBCAKCAQEAgGOVdT2c3GUITi1pF9u+yo72PRBW7I7SnNIsHmXCRYibpyPMGxKM -ROK6rduMllC0CjiXQZhMfqCg+GIca9xxBPKtTnwtKWD3eH5wgs24kw86mODITjJk -6lTNM8it2HY4UuIQoFCqCdt5f5Gwgh2nwU5+dy731md6pmw9x9jUEXoyh67CeZfb -C45x5ttzjpSBvYe5ZIiUypYKumYhdiZhk0RLefEtlUYF9oXrUExDqfYDpSO/1/X3 -oHC0O0EV3Lh1boZTG7+FjcvMYLIKYUDTmxHpII6/OAHhprg7U9ui1i7GyQRv1lze -QV3FGO4UwLntnv352iYy91b0ls2mwD+zTwIBAg=3D=3D ------END DH PARAMETERS----- diff --git a/sample/sample-plugins/keying-material-exporter-demo/server.ovp= n b/sample/sample-plugins/keying-material-exporter-demo/server.ovpn index 5c670b1..1aabcb9 100644 --- a/sample/sample-plugins/keying-material-exporter-demo/server.ovpn +++ b/sample/sample-plugins/keying-material-exporter-demo/server.ovpn @@ -8,7 +8,7 @@ ca ../../sample-keys/ca.crt cert ../../sample-keys/server.crt key ../../sample-keys/server.key -dh ../../sample-keys/dh2048.pem +dh none server 10.8.0.0 255.255.255.0 port 1194 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1145?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: If66438662bd862a195b2a69c4fa45f63838982b7 Gerrit-Change-Number: 1145 Gerrit-PatchSet: 1 Gerrit-Owner: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --HE2A0XJUx58= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

cron2 would like plaisthos and flichtenheld to review t= his change.

V= iew Change

Remove use of 'dh dh2048.pem' from sample configs, r=
emove 'dh2048.pem' file

Since commit bd9aa06feb41 (Jan 2015)= OpenVPN has allowed to use
'--dh none' to disable traditional D= iffie Hellman, since more secure
ECDH algorithms are available that do n= ot use explicit DH parameters.

If configured with a suffiently high = securelevel (3+), or if running in
FIPS mode, OpenSSL 3.5 will refuse 20= 48 bit DH files, making our tests
fail.

Thus, remove all the DH20= 48 stuff from our sample configs.

Change-Id: If66438662bd862a195b2a6= 9c4fa45f63838982b7
Signed-off-by: Gert Doering <gert@...1296...>---
M sample/sample-config-files/loopback-server
M sample/sample-co= nfig-files/server.conf
D sample/sample-keys/dh2048.pem
M sample/sampl= e-plugins/keying-material-exporter-demo/server.ovpn
4 files changed, 3 i= nsertions(+), 16 deletions(-)

git pull ssh://gerrit.openvpn.net:2=
9418/openvpn refs/changes/45/1145/1
diff --git a/sample/sample-conf=
ig-files/loopback-server b/sample/sample-config-files/loopback-server
index 58daeb56..1980218 100644
--- a/sample/samp= le-config-files/loopback-server
+++ b/sample/sample-config-= files/loopback-server
@@ -17,7 +17,7 @@
ve= rb 3
reneg-sec 10
tls-server
-dh sample-keys/dh2048.pem
+dh none
ca = sample-keys/ca.crt
key sample-keys/server.key
cert sample-keys/server.crt
diff --git a/sample/sample= -config-files/server.conf b/sample/sample-config-files/server.confindex f6d9e65..8943c34 100644
--- a/sample/sample-c= onfig-files/server.conf
+++ b/sample/sample-config-files/se= rver.conf
@@ -87,11 +87,6 @@
cert server.c= rt
key server.key # This file should be kept secret

-# Diffie = hellman parameters.
-# = Generate your own with:
-# openssl dhparam -out dh2048.pem 2048
-dh dh2048.pem
-
# Allow to connect to really old OpenVPN ver= sions
# without AEAD support (OpenVPN 2.3.x or older)
# This adds AES-256-CBC as fallback cipher and
@@ -306,4 +301,4 @@


# Notify the client= that when the server restarts so it
# can automatically r= econnect.
-explicit-exi= t-notify 1
\ No newline at end of file
+explicit-exit-notify 1
d= iff --git a/sample/sample-keys/dh2048.pem b/sample/sample-keys/dh2048.pem
deleted file mode 100644
index d393581..0000= 000
--- a/sample/sample-keys/dh2048.pem
+++= /dev/null
@@ -1,8 +0,0 @@
------BEGIN DH P= ARAMETERS-----
-MIIBCAK= CAQEAgGOVdT2c3GUITi1pF9u+yo72PRBW7I7SnNIsHmXCRYibpyPMGxKM
-ROK6rduMllC0CjiXQZhMfqCg+GIca9xxBPKtTnw= tKWD3eH5wgs24kw86mODITjJk
-6lTNM8it2HY4UuIQoFCqCdt5f5Gwgh2nwU5+dy731md6pmw9x9jUEXoyh67CeZfb=
-C45x5ttzjpSBvYe5ZIiUypYKumYh= diZhk0RLefEtlUYF9oXrUExDqfYDpSO/1/X3
-oHC0O0EV3Lh1boZTG7+FjcvMYLIKYUDTmxHpII6/OAHhprg7U9ui1i7GyQRv= 1lze
-QV3FGO4UwLntnv352= iYy91b0ls2mwD+zTwIBAg=3D=3D
------END DH PARAMETERS-----

diff --git a/sample/sample-plugins/keying-material-exporter-d= emo/server.ovpn b/sample/sample-plugins/keying-material-exporter-demo/serve= r.ovpn
index 5c670b1..1aabcb9 100644
--- a/= sample/sample-plugins/keying-material-exporter-demo/server.ovpn
<= span>+++ b/sample/sample-plugins/keying-material-exporter-demo/server.ovpn<= /span>
@@ -8,7 +8,7 @@
ca ../../sample-keys/c= a.crt
cert ../../sample-keys/server.crt
= key ../../sample-keys/server.key
-dh ../../sample-keys/dh2048.pem
+dh none

server 10.8.0.0 255.255.255.0
port 1194

To view, visit change 1145. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If66438662bd862a195b2a69c4fa= 45f63838982b7
Gerrit-Change-Number: 1145
Gerrit-PatchSet: 1
Gerrit-Owner: cron2 <gert@...1296...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--HE2A0XJUx58=--