From patchwork Wed Mar 8 13:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 3109 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a5d:570f:0:0:0:0:0 with SMTP id a15csp328462wrv; Wed, 8 Mar 2023 05:38:59 -0800 (PST) X-Google-Smtp-Source: AK7set/15ferHRC02rEN094sshAJ3Ba3Z5CTqbfl8zaDAYo2gkkFx6tizYUfoaY6UEDgXhFKJ1qy X-Received: by 2002:a17:902:d504:b0:19c:e842:a9e0 with SMTP id b4-20020a170902d50400b0019ce842a9e0mr23964157plg.16.1678282739017; Wed, 08 Mar 2023 05:38:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678282739; cv=none; d=google.com; s=arc-20160816; b=AUBhycpvMHyady/eQ8sm9CdOV+OelGtCFy3zeQpd2vrKxynuwGb5QGROW1XdtqOYJ6 l10T/9wJ8lIGa779dUJEJu77iAVcI2DEIJlqT/B5U8/5NLbdyha7Wttwt3uuWqEIo2CG Qp39lh/jlE60HAC8SzVv0hdetgLBJQMOZ7EoyAQJXH5nP59tnM2mciSz6/bk5azgiHZl hD6BQC8T1dourimwRyHQuhtdTij1UbVHbgLedfjAWTd1jiZ271WIC6Uj1ogAQGe9p6Ce qNw0wqKTwcBQ+qth9gGHZiAJF0Iy6qKZorckAEZkqR3Nv5mmVkYrpMTm8YBFBao8Kw97 TgfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=sNjvVjgwkorMXnHZoYDz/XcYFo1SZxWg/yulXiKR3vw=; b=h0IfiZZIJw5pSQza+9vz6+F4fa5eC+RcC3tKGsGAHa6bmxe5sLMGpXwhKDqkn8Ql3x BJqrzAoth+RYc9wvzbj23ARezYTrwQBSDV6lg0P4naeo3dta7Q1cBjUn+PMlyURpx07C 2vUQmcWwylTlaAIoLcpjVfi4u+2siqfpxrWs2Fj0ZfbuUipxCw3i49h0XP6JupW9nuw9 x6xsBUeWK9Mf2k5NT3xuydJLyzKs/JH8h8KSttSqItCcIEyLgQ48Ddy1tJvAUmP1MyWo XQ7a/i1SNynM0wDKJhaw5QEvgwefVJ/gCz4YxmQzqqm0neHrTaC8ZbjOsim+beJtbLxz gopA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="deoKwp/q"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nPSTiSvi; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=kKKJQUlX; 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 jz6-20020a170903430600b0019e9f6cd049si11564254plb.416.2023.03.08.05.38.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2023 05:38:59 -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="deoKwp/q"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nPSTiSvi; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=kKKJQUlX; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pZtzc-0000Kj-HB; Wed, 08 Mar 2023 13:38:09 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pZtza-0000KW-1H for openvpn-devel@lists.sourceforge.net; Wed, 08 Mar 2023 13:38:07 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4khBbsDNVtYetbL2MpKggQiSMP2VLweY5E8IjxbF4z0=; b=deoKwp/qXmpDKDr6v1INptyoLw 9GRLkr/Bvj0d6A5heoOtE7YoN7kARYths05zHs9gsJz0rVvDgdDGKG4WVcZjBU2iz/OC4dmMSk8Dq Q1t5fB2af6DC9XFRxj3Jrrp2c9F+eiL5ej9Pcq5tvWkAlwz33aBjeZKnF3gh8RVgOgaU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4khBbsDNVtYetbL2MpKggQiSMP2VLweY5E8IjxbF4z0=; b=nPSTiSvihL3QfjUzQDMLON0hr3 maG0RqTOp7BHXeCWekUyWRIpq/yWMuTj7w7GEVoBHaUmpFaTVmH0B2HWzZm0qmYDj774dLIAen5gF Ot3A4fiZVc0s3354ojCaFIyU3NBIWorB3ldxiQLN09LKlzvwSk0nPjleVMIM7hEDtZY4=; Received: from mailout-l3b-97.contactoffice.com ([212.3.242.97]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pZtza-0004Hb-Uv for openvpn-devel@lists.sourceforge.net; Wed, 08 Mar 2023 13:38:07 +0000 Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by mailout-l3b-97.contactoffice.com (Postfix) with ESMTP id 3F22475F; Wed, 8 Mar 2023 14:37:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1678282679; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; l=857; bh=4khBbsDNVtYetbL2MpKggQiSMP2VLweY5E8IjxbF4z0=; b=kKKJQUlXnf3gXHW6eFbBUkSeuSLB/zEmsu+Pebx6wkeUFLG1jnYipWIusGwi5DQD VFPAM4C+TznewnVY1AX4iRxlre/8HpYJrW9vYgfEGYYXSvaSawJZv5yBGO9UelId2a1 oNnYuccWx54JGCtkmoUEqePOnN1ux3/0LLiA4fcvMMQouzn3eZxyK8aLjhHCXMbvPWy eWvHJ2XBaN4Zjvx+B0H8zgSAyvEyRZMCl4AkzXO11rvIX3IYqIOCdGUtDgKRleMobqK FuUYhMV3FyYaNrfTKngyrO3yenM6nKARnD26YD9MjkaKjnaGmns3wLFryQQtJ0lpRRx txa5zBCTqg== Received: by smtp.mailfence.com with ESMTPSA ; Wed, 8 Mar 2023 14:37:55 +0100 (CET) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Wed, 8 Mar 2023 14:37:43 +0100 Message-Id: <20230308133743.5059-1-a@unstable.cc> X-Mailer: git-send-email 2.39.2 In-Reply-To: <7e5fc5f4-a17a-0266-f465-faa683cdcf31@rfc2549.org> References: MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Status: No, hits=-2.9 required=4.7 symbols=ALL_TRUSTED, BAYES_00 device=10.2.0.1 X-ContactOffice-Account: com:375058688 X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Signed-off-by: Antonio Quartulli --- As concluded on IRC, this version does what we want it to do. We also quickly tested with some sample program to make sure we weren't making this up. Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.97 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1pZtza-0004Hb-Uv Subject: [Openvpn-devel] [PATCH v2] Avoid warning about missing braces when initialising key struct 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: , Cc: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1759755374428321269?= X-GMAIL-MSGID: =?utf-8?q?1759807001492678325?= Signed-off-by: Antonio Quartulli Acked-by: Gert Doering --- As concluded on IRC, this version does what we want it to do. We also quickly tested with some sample program to make sure we weren't making this up. src/openvpn/tls_crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c index 81098355..3b68d186 100644 --- a/src/openvpn/tls_crypt.c +++ b/src/openvpn/tls_crypt.c @@ -348,7 +348,7 @@ tls_crypt_v2_init_client_key(struct key_ctx_bi *key, struct key2 *original_key, msg(M_FATAL, "ERROR: invalid tls-crypt-v2 client key format"); } - struct key2 key2 = { .n = 2, .keys = { 0 } }; + struct key2 key2 = { .n = 2 }; if (!buf_read(&client_key, &key2.keys, sizeof(key2.keys))) { msg(M_FATAL, "ERROR: not enough data in tls-crypt-v2 client key");