From patchwork Fri Aug 11 15:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3319 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1457754dyb; Fri, 11 Aug 2023 08:10:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE71YOl0nFGhksAEcH41iGnfWph9jHjb5wYj0RVHLJdX3JrcJKekQJaPFvQAzkdkzcyIoOb X-Received: by 2002:a05:6a00:17a3:b0:686:9385:4642 with SMTP id s35-20020a056a0017a300b0068693854642mr2232392pfg.6.1691766628713; Fri, 11 Aug 2023 08:10:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691766628; cv=none; d=google.com; s=arc-20160816; b=d2Wdl/qsMReJM6I6IyTgXzoiOoAFFBKApi9bXSKYP9HH2y0a4Oi4NZD40brvraqcfl ikXMBfMm+pzhFbJvA8GI0ppdLdguvhCKP53yx8xypVhrp67lIEYTcR8ME4QtRrU0i/Ua V/sZ6NBXyXekOr7OvnWLZV3BP1dNvWxhDt9c1IimLClFe6OPEbEjzw4Mm6q94N0xAQWb C8VyGoOPGlTU0MzcOi5WxmHCBcQRRk4wlC3J9BRju13sbmJe9OrajD40UpIrnja/6vsB cG7K49asMs7APImG0JfHGmGFfDwnI19MzwvLbanvSrmO1Rn3v+io8QZBMX50mXXFGYOe EYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:in-reply-to:auto-submitted:to :date:from:dkim-signature:dkim-signature:dkim-signature; bh=gjJuThKRXPAGo4DILW4PQT8DQIHls9fjdYl9w77heMA=; fh=sVqyMrv5ADXHxV9kVxPsl5FGS3g6i43xgJiGhry1EJo=; b=RShGN/dXvz4OhjdY2nRSVWLOmG7psJER7+gJOq/1G4i0xCI1rtBcdRSQ/YxKwV8b6P sDM9B7CKHRQRI+NeRtXPFA9POg/izCLqrp8Xh6sF6oUFTG0CpXg5595hoU8+1bAek+zj VvuFulAFwDuv4kQWr+NLdHCgnypRyWTvUy3wyJa7L0tTuhazFtEQS47zhyJK32NfJSHW RU5jlKX+bB5CFrJLfqFvinOyyqYcdpEI2E+yI+sYfSOor7toDKdJ4Dre9ULziMvBihij isdMByo7BC0G3F2LsO539pzDVNbKAFtHpcxmUWbR+IiQOVHq1MPsx7HrLjPRGjJKhAlR UkPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=hKcKksh9; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GqZJn0Wx; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=aWqhp9Aj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id by4-20020a056a00400400b006875607bdd7si3556942pfb.385.2023.08.11.08.10.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 08:10:28 -0700 (PDT) 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=hKcKksh9; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=GqZJn0Wx; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=aWqhp9Aj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.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 1qUTmE-0008Ch-TT; Fri, 11 Aug 2023 15:10:11 +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 1qUTm8-0008CR-Bj for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:10:05 +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 :Message-ID:Reply-To:References:In-Reply-To:Subject:List-Unsubscribe:List-Id: Cc:To:Date:From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe :List-Post:List-Owner:List-Archive; bh=5J/YcGKYfberZSnsxUibpfuujsu6SdFGV9/waR4O+GA=; b=hKcKksh9pFEmz30CDhQgEis+yo 6nLdpTiIE35ruJQvGkSjArnawNHlietRFsQbViisviHRB9/kztiEb6IH1/o2WItejkTEL81WP9Hu/ fZmfjKnqDB3ALjrlXjZ6puz8/uR579zkt78y0Lr51LhD295lB3Fk1FYgTZnP/IdPsDuQ=; 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:Message-ID:Reply-To: References:In-Reply-To:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From: Sender:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=5J/YcGKYfberZSnsxUibpfuujsu6SdFGV9/waR4O+GA=; b=G qZJn0WxRkEU2zdrFQutYiOvAizI5Uf4CTxutD0Ig2GxAyDU6E3xVAYsXv7wflEeK1fgUMGIoHLjW+ 5w2vFxS2u7NYzCHzAnGNDmsdILsXBWAav1nSYGKAa3YyALlk9dH9dLnl0gIn5cG07Owly0Jt1XxVX Hc/O8a4QGpGEvIO0=; Received: from mail-wm1-f48.google.com ([209.85.128.48]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qUTm4-0001Iq-UI for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:10:05 +0000 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fe1d462762so18906245e9.0 for ; Fri, 11 Aug 2023 08:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691766594; x=1692371394; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=5J/YcGKYfberZSnsxUibpfuujsu6SdFGV9/waR4O+GA=; b=aWqhp9AjDS3W0KCSlD1ZOK4QexJqZR9fy3CqXkKA3Bc4uveMQxz2jpljb1N+s24qj8 IsXx2TYvldFNzcqxuhuJydsx+7bbKPjvww4PeV4OQzbRqUyfdwE6sKER8NLD5vatPCWq AKfShUiXGPumKQgYVVf3pSo45T0zz2ih/aRKh4KyCacOKlbxU2g8Krjlkv5miBEBTFjT +GYmSdnTTmW20CCE7FlNa693ZDIkuvS+1fxsGkNeEmp5ZnBjt/i+1aSb2PArHZPQRwzs xOkYt5420+fMxcGzlXRq7WH1jig5ah1QKpo43b9IZCORlt0kzGlOlncvws1oUC3MuRFi kLpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691766594; x=1692371394; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5J/YcGKYfberZSnsxUibpfuujsu6SdFGV9/waR4O+GA=; b=iuRYfaz6Yf+anHuv/iqx9og+Ry6yBZbHYRv2joTl+Wgtb5uoL+yrSU+qooHHSwWn/8 t6uZ5FcXrNouMoaolseX4lvoI4sbriiCeU531gfRuSLnTmVzBxXaiGWVGl96IGC0yspP GYfNIefuR5E6YgO6ln3ZMzWGuV+muZnLp9Ui6DYhxfqh31WKXEKaW8bWdTveV9DOg7rn nY7aMxpatf3ZhykI/fpT45CP0gp4SufOa3XkWmVUXmrJNvC6zCmbYqVnMNRUt2NIvBFX dNoDeK3Z7mHH4PrluU+gohgl2qTBsfo18A/LlkbiltfF9p/JHyCRwg4X2+EZLu3+Y+iX iLHg== X-Gm-Message-State: AOJu0YxckWiamlECvUUPO+BG99VaDwUz9e29YgURCZji7nZRvYRlhbih RByYyDpbo9A920U9yRDrHS51GCV1ttMkqp5Pba4= X-Received: by 2002:a7b:cd02:0:b0:3fe:21b9:806 with SMTP id f2-20020a7bcd02000000b003fe21b90806mr1796986wmj.0.1691766594407; Fri, 11 Aug 2023 08:09:54 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id l18-20020a1ced12000000b003fc01f7a42dsm5532803wmh.8.2023.08.11.08.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 08:09:53 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 15:09:52 +0000 To: flichtenheld , selvanair Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset X-Gerrit-Change-Id: I889de8bafb581b810a026c7359fbfee94f1b5a4e X-Gerrit-Change-Number: 317 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 38fbddc94596b6b2d8fa93a8bd0aca7dbb220def In-Reply-To: References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/317?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by selvanair Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.48 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.48 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.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qUTm4-0001Iq-UI Subject: [Openvpn-devel] [XS] Change in openvpn[master]: pkcs11_openssl: Disable unused code 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: , Reply-To: selva.nair@gmail.com, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1772669580488802547?= X-GMAIL-MSGID: =?utf-8?q?1773945884554714977?= cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/317?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by selvanair Change subject: pkcs11_openssl: Disable unused code ...................................................................... pkcs11_openssl: Disable unused code Coverity: CID 1539183 (#1 of 1): Structurally dead code (UNREACHABLE) Change-Id: I889de8bafb581b810a026c7359fbfee94f1b5a4e Gerrit: http://gerrit.openvpn.net/c/openvpn/+/317 Signed-off-by: Frank Lichtenheld Acked-by: Selva Nair Message-Id: <6b941ce86c4031a5535d6c1997e6ae06c9aec7b3-HTML@gerrit.openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26901.html Signed-off-by: Gert Doering --- M src/openvpn/pkcs11_openssl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/17/317/2 diff --git a/src/openvpn/pkcs11_openssl.c b/src/openvpn/pkcs11_openssl.c index 7c07152..40080ef 100644 --- a/src/openvpn/pkcs11_openssl.c +++ b/src/openvpn/pkcs11_openssl.c @@ -331,8 +331,7 @@ #ifdef HAVE_XKEY_PROVIDER return (xkey_load_from_pkcs11h(certificate, ssl_ctx) == 0); /* inverts the return value */ -#endif - +#else int ret = 1; X509 *x509 = NULL; @@ -402,6 +401,7 @@ openssl_session = NULL; } return ret; +#endif /* ifdef HAVE_XKEY_PROVIDER */ } char *