From patchwork Sat Nov 9 06:42:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 900 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id iDihNOD6xl2MVQAAIUCqbw for ; Sat, 09 Nov 2019 12:44:00 -0500 Received: from proxy16.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id SJh3NOD6xl1ONwAAalYnBA ; Sat, 09 Nov 2019 12:44:00 -0500 Received: from smtp12.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.ord1d.rsapps.net with LMTP id KOSNM+D6xl3OCgAAetu3IA ; Sat, 09 Nov 2019 12:44:00 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp12.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Suspicious-Flag: YES X-Classification-ID: 82dc18f4-0318-11ea-a0b9-52540070b731-1-1 Received: from [216.105.38.7] ([216.105.38.7:47934] helo=lists.sourceforge.net) by smtp12.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 32/3C-28024-0EAF6CD5; Sat, 09 Nov 2019 12:44:00 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iTUlO-0000Wu-2q; Sat, 09 Nov 2019 17:43:06 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iTUlJ-0000WZ-N1 for openvpn-devel@lists.sourceforge.net; Sat, 09 Nov 2019 17:43:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EUNp9MDry0jVS4D6Apzzxqny2jx/54LrVv/dFpvbjK4=; b=b3dx89CeGGY5KJtC8GASkXWaYM cw/Avj0BF3YvV7ZV7F0P6vWdZfqhpgSAv5HVtDIlIXdyzv1YnQIk0qQlZ/IgOQI5PnPsbRqhvgIKw KarjXCZX8pZePngaVgHwWm99HKKLaXA8l/V4/0xIQvp1WfrymT0RQAv1D7paIS8++hbo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=EUNp9MDry0jVS4D6Apzzxqny2jx/54LrVv/dFpvbjK4=; b=g 6vC3P6VscQ3y32cweEnh3/d8CAKArgs+D0ubLHQqonOfgEsEBYE93w58mW3p7SMFZEXl06hbWDRGp DdPnjx2x7s0XXhI90buy2D88bkzFGby+/kiKtzPi2xX5JzcB0l4y4DWlk/19C6npcWnoX4odioG0q whIIaThGFKefRjCk=; Received: from mail-wm1-f50.google.com ([209.85.128.50]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iTUlE-009jqX-0f for openvpn-devel@lists.sourceforge.net; Sat, 09 Nov 2019 17:43:01 +0000 Received: by mail-wm1-f50.google.com with SMTP id z26so9248872wmi.4 for ; Sat, 09 Nov 2019 09:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EUNp9MDry0jVS4D6Apzzxqny2jx/54LrVv/dFpvbjK4=; b=Xm73Kostx0gkMK2STe4Zgxc9iitvhZRexFPLevsuSEjnUlmYpemIBlgJN2ymIsCstt Q8aNrI2fKN53RFEFhEpE4KlvdlH7tOX5CD10ElfzzXjB4MVUL32xsAof8QCdHmYWQtb4 QqZHxrNaASJ3MtgZ5xnOxGgGT8losf/YvnfONwKfYZoyVCvJ2WpRBMeS2yftFZiyJqg3 kxwFxVM+tB+7BJcdBDo1jnSSHYDDjzb5t5jP+jspgRubrvlTwdSgv8mCM6y0PG3KzAe7 LOnioCBOXB2bXM+97pm4rZCGoVBo5Jl6txYAvyQUjOsS4Vx3mrFjIG6M5hfKfABP/cik H7RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EUNp9MDry0jVS4D6Apzzxqny2jx/54LrVv/dFpvbjK4=; b=pLClOk/G42NgDtJdCO2pyKbeZm8XF20dFC/nLQyG4EMR73zk9i3VVsXwJ7hIEgqxb3 pDE98EHKVBZ13YTe31IEWAohXFOTA8zHeMwUuTcfaavwuGyOMfSdUqG6poFrLf0XQ/hJ 8WDXR2fWddsT3/PeQQGQ4y67vB10bwo2GD2/EjBeW2BCPyGPwJQe43Z9eb7ITOIpFvjq 9gmUvuUIxYsDMtgpVfqryMwCASCQ4dX8ogiM8xKqjal3n5mmckfB+Lvg9a/A36RRdsqz smceieOFscodIIZCnO4YzkHBQYFjtoMtMhBwvyoVnL3eb/oNvx0pjYn6RkzCrht6cEKt BeIw== X-Gm-Message-State: APjAAAVJK8FdraP7LdizKWi+XnOBgkHLztWFKRx6pYp95InB+6zAel/t VZNfJiAZq21rw9Z7OwvtqyMM20lcp2K7oQ== X-Google-Smtp-Source: APXvYqyCsIIvre9nSpCOYhp6r0Ud+RFu3cXFagbsGFAQ9zYiNVd7jo8mrvGS8U4kVtDzAVuTwCx0tA== X-Received: by 2002:a1c:4c15:: with SMTP id z21mr12552281wmf.132.1573321368918; Sat, 09 Nov 2019 09:42:48 -0800 (PST) Received: from luna.lan (net-188-216-213-213.cust.vodafonedsl.it. [188.216.213.213]) by smtp.gmail.com with ESMTPSA id 65sm17974801wrs.9.2019.11.09.09.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 09:42:48 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sat, 9 Nov 2019 18:42:35 +0100 Message-Id: <20191109174235.20511-1-steffan@karger.me> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.50 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.50 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1iTUlE-009jqX-0f Subject: [Openvpn-devel] [PATCH] Update sample configs to use modern cipher, remove static key examples X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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. Signed-off-by: Steffan Karger Acked-by: Gert Doering --- 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 diff --git a/sample/sample-config-files/loopback-client b/sample/sample-config-files/loopback-client index 7117307d..1734aa8b 100644 --- a/sample/sample-config-files/loopback-client +++ b/sample/sample-config-files/loopback-client @@ -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 diff --git a/sample/sample-config-files/loopback-server b/sample/sample-config-files/loopback-server index 8e1f39cd..58daeb56 100644 --- a/sample/sample-config-files/loopback-server +++ b/sample/sample-config-files/loopback-server @@ -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 diff --git a/sample/sample-config-files/static-home.conf b/sample/sample-config-files/static-home.conf deleted file mode 100644 index ed0c6726..00000000 --- a/sample/sample-config-files/static-home.conf +++ /dev/null @@ -1,75 +0,0 @@ -# -# Sample OpenVPN configuration file for -# home using a pre-shared static key. -# -# '#' 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. -dev tun - -# Our OpenVPN peer is the office gateway. -remote 1.2.3.4 - -# 10.1.0.2 is our local VPN endpoint (home). -# 10.1.0.1 is our remote VPN endpoint (office). -ifconfig 10.1.0.2 10.1.0.1 - -# Our up script will establish routes -# once the VPN is alive. -up ./home.up - -# Our pre-shared static key -secret static.key - -# Cipher to use -cipher AES-256-CBC - -# 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. -# Each OpenVPN tunnel must use -# a different port number. -# lport or rport can be used -# to denote different ports -# for local and remote. -; port 1194 - -# Downgrade UID and GID to -# "nobody" after initialization -# for extra security. -; user nobody -; group nobody - -# If you built OpenVPN with -# LZO compression, uncomment -# out the following line. -; comp-lzo - -# Send a UDP ping to remote once -# every 15 seconds to keep -# stateful firewall connection -# alive. Uncomment this -# out if you are using a stateful -# firewall. -; ping 15 - -# Uncomment this section for a more reliable detection when a system -# loses its connection. For example, dial-ups or laptops that -# travel to other locations. -; ping 15 -; ping-restart 45 -; ping-timer-rem -; persist-tun -; persist-key - -# Verbosity level. -# 0 -- quiet except for fatal errors. -# 1 -- mostly quiet, but display non-fatal network errors. -# 3 -- medium output, good for normal operation. -# 9 -- verbose, good for troubleshooting -verb 3 diff --git a/sample/sample-config-files/static-office.conf b/sample/sample-config-files/static-office.conf deleted file mode 100644 index 609ddd02..00000000 --- a/sample/sample-config-files/static-office.conf +++ /dev/null @@ -1,72 +0,0 @@ -# -# Sample OpenVPN configuration file for -# office using a pre-shared static key. -# -# '#' 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. -dev tun - -# 10.1.0.1 is our local VPN endpoint (office). -# 10.1.0.2 is our remote VPN endpoint (home). -ifconfig 10.1.0.1 10.1.0.2 - -# Our up script will establish routes -# once the VPN is alive. -up ./office.up - -# Our pre-shared static key -secret static.key - -# Cipher to use -cipher AES-256-CBC - -# 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. -# Each OpenVPN tunnel must use -# a different port number. -# lport or rport can be used -# to denote different ports -# for local and remote. -; port 1194 - -# Downgrade UID and GID to -# "nobody" after initialization -# for extra security. -; user nobody -; group nobody - -# If you built OpenVPN with -# LZO compression, uncomment -# out the following line. -; comp-lzo - -# Send a UDP ping to remote once -# every 15 seconds to keep -# stateful firewall connection -# alive. Uncomment this -# out if you are using a stateful -# firewall. -; ping 15 - -# Uncomment this section for a more reliable detection when a system -# loses its connection. For example, dial-ups or laptops that -# travel to other locations. -; ping 15 -; ping-restart 45 -; ping-timer-rem -; persist-tun -; persist-key - -# Verbosity level. -# 0 -- quiet except for fatal errors. -# 1 -- mostly quiet, but display non-fatal network errors. -# 3 -- medium output, good for normal operation. -# 9 -- verbose, good for troubleshooting -verb 3 diff --git a/sample/sample-config-files/tls-home.conf b/sample/sample-config-files/tls-home.conf index daa4ea1e..3a9297cc 100644 --- a/sample/sample-config-files/tls-home.conf +++ b/sample/sample-config-files/tls-home.conf @@ -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. diff --git a/sample/sample-config-files/tls-office.conf b/sample/sample-config-files/tls-office.conf index d1961444..81052211 100644 --- a/sample/sample-config-files/tls-office.conf +++ b/sample/sample-config-files/tls-office.conf @@ -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.