From patchwork Mon Jul 27 01:09:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 1339 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id OI32JTG2Hl8PcQAAIUCqbw for ; Mon, 27 Jul 2020 07:10:41 -0400 Received: from proxy18.mail.iad3b.rsapps.net ([172.31.255.6]) by director12.mail.ord1d.rsapps.net with LMTP id kDyRJDG2Hl+0YgAAIasKDg (envelope-from ) for ; Mon, 27 Jul 2020 07:10:41 -0400 Received: from smtp20.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.iad3b.rsapps.net with LMTP id AFJoHTG2Hl/4JwAA3NpJmQ ; Mon, 27 Jul 2020 07:10:41 -0400 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: smtp20.gate.iad3b.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=foxcrypto.com; dmarc=fail (p=none; dis=none) header.from=foxcrypto.com X-Suspicious-Flag: YES X-Classification-ID: ce4ec0f8-cff9-11ea-a577-525400497f28-1-1 Received: from [216.105.38.7] ([216.105.38.7:42936] helo=lists.sourceforge.net) by smtp20.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id C1/5C-08831-036BE1F5; Mon, 27 Jul 2020 07:10:41 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1k011A-0002yw-6u; Mon, 27 Jul 2020 11:10:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0118-0002yl-W3 for openvpn-devel@lists.sourceforge.net; Mon, 27 Jul 2020 11:10:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Date:Subject:CC:To:From:Sender:Reply-To:Message-ID: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=R1b++S6+yXVw56PMgCBUopNU15hYL1bvi/lYKMYkCn4=; b=K6XAyVE9Qq3WNAAixJklO9tfUj i1bZ0tklrld7cc6VXy8uvMAbZ4CfjIu+PIFwE0ldklNLnxAUY1dLGCVg8HgSBZsVAP5qTqG+6cYGq mawCL52SDV9QSPOPpdxfVnj7Gzsl3oLG0B9y96sKqawh16RipgiZqsoMykQJ+fj99U60=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Date:Subject:CC:To: From:Sender:Reply-To:Message-ID: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=R1b++S6+yXVw56PMgCBUopNU15hYL1bvi/lYKMYkCn4=; b=h V3l9L3qmiXoI5QmkVHpmbHKb2+ej1n24ieIkWUsKkgr9nuBUmAGwaoxW2elxRNIpOy8w2pYAZ4J66 riqdP4q/gwDnQkac13pD9R+wFBU5WIIxMIMEPcS3eE3kYKx2m6FQEUOZp8GEGXO9RXKWkLOQGRaVf K69eXoSy5wLcvG+E=; Received: from nl-dft-mx-01.fox-it.com ([178.250.144.135]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1k0116-0010D3-Kl for openvpn-devel@lists.sourceforge.net; Mon, 27 Jul 2020 11:10:02 +0000 From: Steffan Karger To: Date: Mon, 27 Jul 2020 13:09:24 +0200 X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-ClientProxiedBy: FOXDFT1EX01.FOX.local (10.0.0.129) To FOXDFT1EX01.FOX.local (10.0.0.129) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; d=foxcrypto.com; s=NL-DFT-MX-01; c=relaxed/relaxed; h=from:to:cc:subject:date:mime-version:content-type; bh=R1b++S6+yXVw56PMgCBUopNU15hYL1bvi/lYKMYkCn4=; b=jKl1Vgg0RJKx67hEVe4GpWLq5W1VFOv9j8j/eUO3KR/vU7aLTB1tsVQsc9QmRjzOXEwQbbrFDY/8 uRTKk32S+o66VmMZEW1kQxf4g3/v911lQJpqBIiQomYtOZHdI6LZ2AWPsnd5X5FYsGWqmSnS1HM3 Ye+aT3dZQTx5+5QSLfigiqv/Tzofofcb4UAK2YkEzQuskD8KuPhC1CPaEnjPigGmA/uwZga52Tt6 VihDqK/zFk+utnUFqtB8tqqsVTdcR5AFQqH26R5zPs2zXB4QaHzUw8Xz5eTH9194Ypjp+6OPe4NN etW9VXS95IDdxpHaBx6SkyWBfsrjS4U+YXboVg== X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -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_AU Message has a valid DKIM or DK signature from author's domain -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 1.0 MISSING_MID Missing Message-Id: header X-Headers-End: 1k0116-0010D3-Kl Subject: [Openvpn-devel] [PATCH] Gently push users towards --data-ciphers in --show-ciphers output 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 Message-Id: X-getmail-retrieved-from-mailbox: Inbox Also: * fix a typo in the openssl output ("may be use*d*") * mention GCM before CBC (we prefer AEAD modes) Signed-off-by: Steffan Karger Acked-By: Arne Schwabe --- src/openvpn/crypto_mbedtls.c | 5 +++-- src/openvpn/crypto_openssl.c | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index 19a87eb4..fbb1f120 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -149,8 +149,9 @@ show_available_ciphers(void) #ifndef ENABLE_SMALL printf("The following ciphers and cipher modes are available for use\n" "with " PACKAGE_NAME ". Each cipher shown below may be used as a\n" - "parameter to the --cipher option. Using a CBC or GCM mode is\n" - "recommended. In static key mode only CBC mode is allowed.\n\n"); + "parameter to the --data-ciphers (or --cipher) option. Using a\n" + "GCM or CBC mode is recommended. In static key mode only CBC\n" + "mode is allowed.\n\n"); #endif while (*ciphers != 0) diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index c47c2f3c..c60d4a54 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -287,11 +287,11 @@ show_available_ciphers(void) size_t num_ciphers = 0; #ifndef ENABLE_SMALL printf("The following ciphers and cipher modes are available for use\n" - "with " PACKAGE_NAME ". Each cipher shown below may be use as a\n" - "parameter to the --cipher option. The default key size is\n" - "shown as well as whether or not it can be changed with the\n" - "--keysize directive. Using a CBC or GCM mode is recommended.\n" - "In static key mode only CBC mode is allowed.\n\n"); + "with " PACKAGE_NAME ". Each cipher shown below may be used as a\n" + "parameter to the --data-ciphers (or --cipher) option. The\n" + "default key size is shown as well as whether or not it can be\n" + "changed with the --keysize directive. Using a GCM or CBC mode\n" + "is recommended. In static key mode only CBC mode is allowed.\n\n"); #endif for (nid = 0; nid < 10000; ++nid)