From patchwork Wed Dec 28 17:13:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 2957 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp3452908dyk; Wed, 28 Dec 2022 09:13:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuRXMfZL1K+xqJ9/P1nXf1GY57a5de8+7i4KVwmyL8LCpcNK87Cj8hrR9ZBLBjAsezgUvC4 X-Received: by 2002:a17:90a:eb07:b0:223:afb8:a2aa with SMTP id j7-20020a17090aeb0700b00223afb8a2aamr28030664pjz.26.1672247636395; Wed, 28 Dec 2022 09:13:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672247636; cv=none; d=google.com; s=arc-20160816; b=fsEfBrih/ttmwYCPInqx/isUeGcnPFgksRgd1xc06ngNMaGIMnujHjrkzWW0N4NgUi 0Bq0c4JEp+bNaTwA5Pb9P4dWk23sp/Yag4VwXiWBQJa1w2LEL4gaQtDwYH6g2UuqN0KI 0UKPBZlBFwksxPg3hWCAO2+aTgAreV5aPl0qq1lKL/AgzhD4JNlQrwcjnob3Utr1fJQS dP7d2MLVDRb04ligZtIj4nPqehIwkeZsbkBPKJ+aaEjZMkl7H2ZUd+CE+Vsty21z/5UN 8quKaksodmTvcT1ndq3z3HmwaMYHT8n356eg1cVnmuL7w2/bEx8OW0ORB2LYW25iod+b 1gnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature; bh=nh19N4c+U8iv+yaJ2CWfKinJfw8+BVI6v4iuMLh3Xs8=; b=0klzNGU7OBtrVtQk0Ve8yMc3BPcSnMHmy9b+h7o8JUNf0FsNTTey+XFpwI652gNicr AEhPajaJFGSPuIdSejjxfsHUUXfL9KGH56iKGfuuv+bC3JxbhwGm0EeKrqPE4ysm5tLU n9fLTxJg3CWH0QzwJuwWnv3bkva/LVSAuuF7Lf5Uu2GjMrMNu7VFMFUsHrJQ2dci73gG vhGuqaF1Hfl3oekZVPbimSJQtdi9QGinaSDygXvpDvybE7zi5p7Ry+FZtyOsfDIP8hDr Jdy2BinaVodof6K3PXztrcl7H5ARbhy054+AqYDQofMoVG/7fA5cqbxFgkSOjbPb2mmm 1OLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=BQYDB0QV; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=glmjiODe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id o23-20020a17090a421700b0022387a1f9a5si16143326pjg.134.2022.12.28.09.13.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Dec 2022 09:13:56 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=BQYDB0QV; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=glmjiODe; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pAZzj-000755-2d; Wed, 28 Dec 2022 17:13:35 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pAZzf-00074y-7Y for openvpn-devel@lists.sourceforge.net; Wed, 28 Dec 2022 17:13:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=Yav5HJRSmWk2zjLYvGvVVVAW0hQT0h5CRH9FNcVaVHQ=; b=BQYDB0QVM+xNrgD1WEtMgmpO5A i56kKwdt6qjqkOuIGlUaJjJwMHlACXfQeSUSOlu0VTqJSr/vW7G/G8FcBfMnr0+3lLhhtYha+RtF5 0kSIlJY5OiJt3QiRbS/M7SeiN/yJ/3036xn9D1o5uF25uzIw1u9nyEOY5uCf3bZKid9Y=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date: Subject:To:From:Sender:Reply-To:Cc: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=Yav5HJRSmWk2zjLYvGvVVVAW0hQT0h5CRH9FNcVaVHQ=; b=g lmjiODeYUyOkJkK/35dIt3FB73uZS66tpWE8YNNPT1IhpACzuoNaP9K5NHq4qvIw5v9ohDP8trV8U Aes4XSuXozIFhVDgDO9pSsr84FAZTs6BSZ0+fHGrevBNtLE/3S/4L0BG6KfCP02osESU5Zzmc8QMO 4ecZXhS4YMcIVLZg=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pAZza-000842-Ht for openvpn-devel@lists.sourceforge.net; Wed, 28 Dec 2022 17:13:31 +0000 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Nhylb3pqYz9sRV for ; Wed, 28 Dec 2022 18:13:15 +0100 (CET) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Wed, 28 Dec 2022 18:13:14 +0100 Message-Id: <20221228171314.133115-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Spam-Score: -0.7 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22util-spamd-2=2Ev13=2Elw=2Esourceforge=2Ecom=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__GCC_with_-O3_complains=3A_warning=3A_?= =?unknown-8bit?q?=E2=80=98=25s=E2=80=99_directive_argument?= =?unknown-8bit?q?_is_null_=5B-Wformat-overflow=3D=5D_And_indeed=3A_--cipher_?= =?unknown-8bit?q?alg_=3A_Encrypt_packets_with?= =?unknown-8bit?q?_cipher_algorithm_alg_=28default=3D=28null=29=29=2E_Since_t?= =?unknown-8bit?q?here_is_no_real_default_anymore=2C?= =?unknown-8bit?q?_remove_it=2E_While_here_also_indicate_the_somewhat-depreca?= =?unknown-8bit?q?ted_status_of_the?= =?unknown-8bit?q?_option=2E_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E7_points=2C_6=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E7_RCVD=5FIN=5FDNSWL=5FLOW______RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_low_trust?= =?unknown-8bit?q?_=5B80=2E241=2E56=2E171_listed_in_list=2Ednswl=2Eorg=5D?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_SPF=5FNONE_______________SPF=3A_sender_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= X-Headers-End: 1pAZza-000842-Ht Subject: [Openvpn-devel] [PATCH] options.c: update usage description of --cipher 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 X-GMAIL-THRID: =?utf-8?q?1753478737508944335?= X-GMAIL-MSGID: =?utf-8?q?1753478737508944335?= GCC with -O3 complains: warning: ‘%s’ directive argument is null [-Wformat-overflow=] And indeed: --cipher alg : Encrypt packets with cipher algorithm alg (default=(null)). Since there is no real default anymore, remove it. While here also indicate the somewhat-deprecated status of the option. Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- src/openvpn/options.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 7395019e..ee378304 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -543,8 +543,8 @@ static const char usage_message[] = " digest algorithm alg (default=%s).\n" " (usually adds 16 or 20 bytes per packet)\n" " Set alg=none to disable authentication.\n" - "--cipher alg : Encrypt packets with cipher algorithm alg\n" - " (default=%s).\n" + "--cipher alg : Encrypt packets with cipher algorithm alg.\n" + " You should usually use --data-ciphers instead.\n" " Set alg=none to disable encryption.\n" "--data-ciphers list : List of ciphers that are allowed to be negotiated.\n" #ifndef ENABLE_CRYPTO_MBEDTLS @@ -4779,7 +4779,7 @@ usage(void) o.ce.local_port, o.ce.remote_port, TUN_MTU_DEFAULT, TAP_MTU_EXTRA_DEFAULT, o.verbosity, - o.authname, o.ciphername, + o.authname, o.replay_window, o.replay_time, o.tls_timeout, o.renegotiate_seconds, o.handshake_window, o.transition_window);