From patchwork Fri Aug 11 15:09:54 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: 3320 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1457756dyb; Fri, 11 Aug 2023 08:10:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnxWXGFv19CzM26cqRAZhtzkBvZca4LdntGBRpCen2TQk7vO8afS7Me1E4fNzBDAncNHCL X-Received: by 2002:a05:6808:4388:b0:3a1:c108:41b1 with SMTP id dz8-20020a056808438800b003a1c10841b1mr2476412oib.25.1691766629145; Fri, 11 Aug 2023 08:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691766629; cv=none; d=google.com; s=arc-20160816; b=ZaPui+fOsoGLarKIXln23y6KTpTGSAGorPC6gYhrbYIba3SuSTezlK19ZQ0mejaaRK rZjC4jxWIBB0IHraOuH2rwNVFkAsUjh2SKI5FiJevdxQ6ZpqYnkUStIMMOF24b+Jpzl3 Loeo6WH7k4zpVyZwvoEgQPlgzTGxCGUvW18Q/3KntU/BodhODvqhkv1kH2yK4Gu3pGbn dtjV7SZ2Db04FBtLMU3O3eKBJ9kgcfaHGli28EbNSdmLnWFE2VhucuPDseZtSMm0pT43 tzLtLhAZExwAzVWgaS6yKUO7fdlAinmlSUWQvTiBOZCjwqBMRlMTo4E8kpGTifgLvlQA r+rg== 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=ak34P2m5j5Xq+ksQ9J5VsGPb59xaAb3zIX+hxvMZpJo=; fh=M0Ap44DuyxvZl+pFH87nP8ejwD3egvCwtooXXL4zzfI=; b=PiVhMQ15qFtLmPwWDpzk5HwIsGUQ/HNSfHqUqy8Joh1Tb2PHb5eVRgV+8Qq2fTWMXZ Q/Eru3fFdF61OBFdfq6NzOVPOAsJQsK8B7msmbNVCwRfqPgOwsRXzl0HAI/kuxBj8Wzs SAI8KWGY1COCmzoOmNMefjEbGC0k2pYKZjYYbe4tgQAZ6mv/PA766UBM1eiY1Qu3+YEP Zidhe5PNZjZeoveTsBe2nhn6N33XRH3R5BF00V2HfZNuWb8CGObTwFieh5fBKcVvsEEY Uk4knalwMSDqjQmhEaQ2lbf+TJ6oJY7pQWcdWGy5DgeOCnskX1dL+KKyZOyMeyN+/L09 Z/fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=C19BECi7; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=CJIjX9FB; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=GMWxbsjg; 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 h132-20020a636c8a000000b00564bcae8b4dsi3526412pgc.61.2023.08.11.08.10.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 08:10:29 -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=C19BECi7; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=CJIjX9FB; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=GMWxbsjg; 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-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qUTmG-0008Gu-Or; Fri, 11 Aug 2023 15:10:12 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qUTmA-0008GO-Vc for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:10:06 +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=9U1tdL15BVPB7xYQmdQ1OxKvh9Gv/6TkoFze1Sq2cs0=; b=C19BECi7LcGUOuZWr+rHFx9aZe 9uYjJ6Z57cnoadhY9q2TthtgzDHODCaRdKt0c+6fElNbjJwTILR5nerjGQQn5Iaj2GAYhkrY/OXkR NnBqdO64/HBG/R6tV2q5CanLVQiG2DAW8Px7cCokA5VR+XCqd6WAKDylwZU3C9NlrA9Y=; 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=9U1tdL15BVPB7xYQmdQ1OxKvh9Gv/6TkoFze1Sq2cs0=; b=C JIjX9FBowdugaC3pzWNYEbHDjFc+GS7sy7DKOT7Y+P/aDot+IXOBtaqzVXowi9SLz7HU5v/DIBg99 jo0dr9f12wGlE/tYOQALP16nhVZwfUdiYrZ9AVPMpRvKcpV8I81V77mKJDZ/n0nLuERbf6l+mKPXn 4l5Qyo21FfKn/71c=; Received: from mail-wm1-f44.google.com ([209.85.128.44]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qUTm6-002bl4-4Q for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 15:10:06 +0000 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3fe4ad22eb0so19107965e9.3 for ; Fri, 11 Aug 2023 08:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691766595; x=1692371395; 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=9U1tdL15BVPB7xYQmdQ1OxKvh9Gv/6TkoFze1Sq2cs0=; b=GMWxbsjghBaolHzOAk3VgumaeOt7sR3WKlyAQcR5eCjP9+HKdXV/2r03KXOtsCQuBd zd5AVC0NHy66Js5AbyVTDkBcMCXe4oMVj7JPnDvWQNX67BvlbF05mwYTuEe93jnIk94Y Wzh50VH7unEXqMH5YE9FZiNs7GQP138xM2LuWRRAedE+VPlN7lgrF5IkNk06mA+Im2I1 LIA7zp7w+fy90am9Bla10TR9z+xXdQx2AzKiQ3Plotq7Xg5nQqJwtTvTdaj9ocgegYW5 5W/DYdMfxXeZYGdllxhwbcGpkt/l62tbT8ICBtBnaFpEasRJKU8I9x/SFIj9DhcByLyP dimA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691766595; x=1692371395; 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=9U1tdL15BVPB7xYQmdQ1OxKvh9Gv/6TkoFze1Sq2cs0=; b=MV/RscSauX1oZNMJ87ecH74LmUncAs7nhoJzPXVTUe6AZPW1E+o+zXiDA6JTkachDv SnAgRqdXZ7Vp0BH7zCK9hRF6+cQcqfj0SQa6q70zBmae03ZvFSOzjLSQxHjcz4Y9RkCu nuFIgXSabHIabennLYoWTO+ewPvbrX7rbwG6j6Z5kuAquukRrvLOjALyH9rBQpuZVQWm HenUEbHuTXDB60GzL+YARIbDVTizad0WfN2pxdaVFqW5xP9GiIKflw2Cyg/XF6OJ3Os8 X16cO9iEYOcGa4SmGgZFJsvn/d7CY/r59YxFswuB0VPsEDmBd8XT5oKL8WlEY2N8C6Fu AxBg== X-Gm-Message-State: AOJu0YwcKCudb6h7GWP9VJP0ZFG1Nbw21qPGF6v+gKADafgH22dGFCTJ 31/unjc8XdDoC9gNnbpCxdCe2Q== X-Received: by 2002:a05:600c:218:b0:3f6:9634:c8d6 with SMTP id 24-20020a05600c021800b003f69634c8d6mr1739160wmi.18.1691766595608; Fri, 11 Aug 2023 08:09:55 -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 22-20020a05600c231600b003fc015ae1e1sm5622518wmo.3.2023.08.11.08.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 08:09:55 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 15:09:54 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: merged 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-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: cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/317?usp=email ) Change subject: pkcs11_openssl: Disable unused code 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.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.44 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 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qUTm6-002bl4-4Q 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?1773945884842956837?= cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/317?usp=email ) 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(-) 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 *