Skip to contentSkip to conversation

Update sample configs to use modern cipher, remove static key examples

PATCH In review Steffan Karger 2 participants 2 messages Nov 9, 2019 – Nov 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Update sample configs to use modern cipher, remove static key examples

Since these are examples, people might use them as a basis for their own configs. In the non-push/pull configs, we should specify a decent cipher.

Further, I don't think we should recommend anyone to still use a static key configuration, so remove the static key config examples.

---
 sample/sample-config-files/loopback-client    |  1 +
 sample/sample-config-files/loopback-server    |  1 +
 sample/sample-config-files/static-home.conf   | 75 -------------------
 sample/sample-config-files/static-office.conf | 72 ------------------
 sample/sample-config-files/tls-home.conf      | 12 +--
 sample/sample-config-files/tls-office.conf    |  3 +
 6 files changed, 11 insertions(+), 153 deletions(-)
 delete mode 100644 sample/sample-config-files/static-home.conf
 delete mode 100644 sample/sample-config-files/static-office.conf
sample/sample-config-files/loopback-client +1 -0
index 7117307d..1734aa8b 100644
@@ -22,5 +22,6 @@ ca sample-keys/ca.crt
 key sample-keys/client.key
 cert sample-keys/client.crt
 tls-auth sample-keys/ta.key 1
+cipher AES-256-GCM
 ping 1
 inactive 120 10000000
sample/sample-config-files/loopback-server +1 -0
index 8e1f39cd..58daeb56 100644
@@ -22,5 +22,6 @@ ca sample-keys/ca.crt
 key sample-keys/server.key
 cert sample-keys/server.crt
 tls-auth sample-keys/ta.key 0
+cipher AES-256-GCM
 ping 1
 inactive 120 10000000
sample/sample-config-files/static-home.conf deleted +0 -75

75 lines not on this page · raw message

sample/sample-config-files/static-office.conf deleted +0 -72

72 lines not on this page · raw message

sample/sample-config-files/tls-home.conf +6 -6
index daa4ea1e..3a9297cc 100644
@@ -4,12 +4,9 @@
 #
 # '#' or ';' may be used to delimit comments.
 
-# Use a dynamic tun device.
-# For Linux 2.2 or non-Linux OSes,
-# you may want to use an explicit
-# unit number such as "tun1".
-# OpenVPN also supports virtual
-# ethernet "tap" devices.
+# Use a dynamic tun device.  For non-Linux OSes, you may want to use an
+# explicit unit number such as "tun1".
+# OpenVPN also supports virtual ethernet "tap" devices.
 dev tun
 
 # Our OpenVPN peer is the office gateway.
@@ -37,6 +34,9 @@ cert home.crt
 # Our private key
 key home.key
 
+# Our data channel cipher (must match peer config)
+cipher AES-256-GCM
+
 # OpenVPN 2.0 uses UDP port 1194 by default
 # (official port assignment by iana.org 11/04).
 # OpenVPN 1.x uses UDP port 5000 by default.
sample/sample-config-files/tls-office.conf +3 -0
index d1961444..81052211 100644
@@ -37,6 +37,9 @@ cert office.crt
 # Our private key
 key office.key
 
+# Our data channel cipher (must match peer config)
+cipher AES-256-GCM
+
 # OpenVPN 2.0 uses UDP port 1194 by default
 # (official port assignment by iana.org 11/04).
 # OpenVPN 1.x uses UDP port 5000 by default.
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw

After a quick discussion in the group, we're all OK with kicking out static-key samples (only the samples, not the functionality yet) BUT we can't do the AES-256-GCM thing in 2.4 due to "RHEL6 and Debian 8" support (no AES-GCM there). So, master.

Your patch has been applied to the master branch.

commit ac10391f48e4ecc5c6db541e47bc747955ef1c93

Author: Steffan Karger
Date:   Sat Nov 9 18:42:35 2019 +0100
     Update sample configs to use modern cipher, remove static key examples

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg19081.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering