Message ID | 6b941ce86c4031a5535d6c1997e6ae06c9aec7b3-HTML@gerrit.openvpn.net |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:3787:b0:d7:3b0f:3938 with SMTP id jw7csp565231dyb; Fri, 28 Jul 2023 06:04:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlEo8DFPUOpT4Utr5j/GzXEl0yN6cD/hOhjQTeU6t+WGRLBrd8pxUyu1ZS6WTtAGX3BjZJJc X-Received: by 2002:a05:6a21:6d90:b0:110:9210:f6ac with SMTP id wl16-20020a056a216d9000b001109210f6acmr1615052pzb.37.1690549450684; Fri, 28 Jul 2023 06:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690549450; cv=none; d=google.com; s=arc-20160816; b=UVBaVr6LacWQlaQl0eSUACOgG7d4deuqoXY6GhyVWAVLh5UW1D12Dg/v4fwgm5ilbT L6/W9wWThsxOMZKsNbL46hzqUQt7k0l/FQNT5omHfFeKuAl8bnxZb5fFtofi+UdpdkRf 5FXsrc0bDIvRbSCzZp6z2u+geOCVRxIK6kJmbtUasta09MmaC55pk13lB/So6BRyUEjM tqlqOdEBlFexZYfgbJD4Ouuk4zGLObwFfyh1t57i8scIntIQC6hO2x+5gvKEEIqTSl92 jDJpe1d6E9kzwDeIkbDT5TCa7H/11JJxRHt5NcIqZGT4xHB6vLvyDvh92MQ9+MbLD8ET RtlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:user-agent:mime-version :message-id:references:auto-submitted:cc:date:from:dkim-signature :dkim-signature:dkim-signature; bh=dGXTHbAtfOgMtxG8z8SOyKN7H9Gr1qjUvqL2xiFL5PA=; fh=ejqQk4evxSbcB4TOY987ChV164zUZaeCjiIZ6JGqg/c=; b=Ur9Z/1au0IdNPUOH0fvmcUrEk4EZQWTpB8Au1TYv0BCvwr3MkiU9n4FIxRFCtO8hy2 oGcTdt6+l4/Zmav738fMOQOZax2ybUM9PrwthGCWGbYAD5eK839/VNP0hflKadqjxKQn Ukaebz+y4jt7eGxTVH6vUHBNMprvz3yEGyFFn0K/fsdDik9GKghBuIQpAJ1sbl8+YJnk x2+e4YY5t1or3TNgzTnq92trH60gp4bXZh+/3xFbGFq6QDbGUfFUQvx7jrCGJx50XTz0 jMyyXRcm/j5+jAOtXYwiGzZ6MvmjY/NSSMcjXK8ffNnfRIZiA+iF2GO6+lnuuuNDoxk8 15nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=II4O3fje; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AYoeWAmd; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=hOQ56PeU; 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 y185-20020a638ac2000000b005539899e4cdsi3033871pgd.813.2023.07.28.06.04.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jul 2023 06:04:10 -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=II4O3fje; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AYoeWAmd; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=hOQ56PeU; 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) id 1qPN8I-0003ZT-Ni; Fri, 28 Jul 2023 13:03:49 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from <gerrit@openvpn.net>) id 1qPN8F-0003ZF-T2 for openvpn-devel@lists.sourceforge.net; Fri, 28 Jul 2023 13:03:46 +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:Subject:List-Unsubscribe:List-Id:Cc:Date:From :Sender:To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PEdCh94YXSxk8PvFOEmJ7DY9inBS5SAMwBSz486EmlU=; b=II4O3fjestSXim/E2oGNEnM3N8 x0BHreJi3weBpLlEeF0bYP79HkiLFXJXS4hHmNtGAmebfLeh0gths/s4U9crbCPiolody9jnDyltp a2Eb/xVbw3ydstHpbI6s3J7jOxhjqjFDaBDmUaEztM0BKFutMD5JsdVgOOJt2pMhE5AU=; 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:Subject:List-Unsubscribe:List-Id:Cc:Date:From:Sender:To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=PEdCh94YXSxk8PvFOEmJ7DY9inBS5SAMwBSz486EmlU=; b=A YoeWAmd+DNx0kZmkvH6ons4iu0YzjSXhSYSUSxY7DruyNlUKMR/EoUxgBk/2wgrSs0QJjcbL8Dr6o uOeEtdb4j0fO72E4uf3/1qWFFRByuZVN55F62RM3foX/pWROrJ5z4Tvoy3yraVsbSQ392Ox00TtZd 5at1aMLiQ6LZPdX8=; Received: from mail-wr1-f43.google.com ([209.85.221.43]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qPN84-005WCm-KO for openvpn-devel@lists.sourceforge.net; Fri, 28 Jul 2023 13:03:46 +0000 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-31771a876b5so1943373f8f.3 for <openvpn-devel@lists.sourceforge.net>; Fri, 28 Jul 2023 06:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1690549410; x=1691154210; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from:from:to:cc :subject:date:message-id:reply-to; bh=PEdCh94YXSxk8PvFOEmJ7DY9inBS5SAMwBSz486EmlU=; b=hOQ56PeUu/CZeUbJzShZJK2Iv1iBhdQsWdWnepkMj6HqKgXZc6Hs1k6vB+300iDdxf RbOxURpltJ4J+LhNyd0km/9iuBTdntKafdUEFusB6/hri5QXwgryDKnMylJIbWCWYoNp HYlHQupiAfqisZEJ8wUaVAmk2AjdFFR0oMgFx9Mqpz9xkcqzUgpNIPndlEUUjvSVj/ic i7r6Y6n0aZg5D+L3u2Y+YR1eLp3PhWxFxf3066SBw18uuFEg5S8nJZ7P/mDGGewFEPNP AEj2kHmjTPl0MkUhQ8qreHiOCdMP8jZXIr9ts5JzpQ9gTSN+0fRNSJM/H5ITXkPGT1K+ ExIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690549410; x=1691154210; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PEdCh94YXSxk8PvFOEmJ7DY9inBS5SAMwBSz486EmlU=; b=Rcne8bISEqyp7mHWgNCrT2jrbkojbz1Nw+0A6zQbB7S/Z5jRFzkzBPouY0Bk7PlXqw n6auLBWOS3mvcOA18RjH1dk24iDK3d9Z7ikQ8gRqCXrB7TsyRSivxn7bFNXc8hpHdZw2 z/heteMWCAutGDj+8B3jAeFSMQ/FM5+Iz+UBcGFGEwS7Ti5EvTp+44mN0MCMy2EAHjSX SQGCvnMldWdPrkqVzYaUwrntg35m+A3PKGNTbzWGYmyDtmWo+/IURej0NrddSu/M7Z0t sbUrt5VUVY8FJEjYrZxE0JOHl3SLXxOQpXB8sxI52kaYYU5ayMc3YaqSIzq0BqebDZRh auNg== X-Gm-Message-State: ABy/qLbpPGWeLOtPoDL2ulBU4s/2TBpCCQn975Y21mCBSH3EvMOWsc2i xZ2zkCuM3q9HekGW36ul95ezS7glGxxy7iKqsIU= X-Received: by 2002:adf:e504:0:b0:317:612e:b764 with SMTP id j4-20020adfe504000000b00317612eb764mr2043697wrm.58.1690549409971; Fri, 28 Jul 2023 06:03:29 -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 j4-20020a5d6184000000b003142c85fbcdsm4777501wru.11.2023.07.28.06.03.29 for <openvpn-devel@lists.sourceforge.net> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:03:29 -0700 (PDT) From: "flichtenheld (Code Review)" <gerrit@openvpn.net> X-Google-Original-From: "flichtenheld (Code Review)" <gerrit@gerrit.openvpn.in> X-Gerrit-PatchSet: 1 Date: Fri, 28 Jul 2023 13:03:29 +0000 Cc: openvpn-devel <openvpn-devel@lists.sourceforge.net> Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I889de8bafb581b810a026c7359fbfee94f1b5a4e X-Gerrit-Change-Number: 317 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: <http://gerrit.openvpn.net/c/openvpn/+/317?usp=email> X-Gerrit-Commit: b563f4b0c428718fb4cff85e477ce22aecae808c References: <gerrit.1690549401000.I889de8bafb581b810a026c7359fbfee94f1b5a4e@gerrit.openvpn.net> Message-ID: <6b941ce86c4031a5535d6c1997e6ae06c9aec7b3-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: 1.0 (+) 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: flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/317?usp=email ) Change subject: pkcs11_openssl: Disable unused code Content analysis details: (1.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.43 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.43 listed in list.dnswl.org] 1.2 MISSING_HEADERS Missing To: header -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: 1qPN84-005WCm-KO 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: <openvpn-devel.lists.sourceforge.net> List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe> List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel> List-Post: <mailto:openvpn-devel@lists.sourceforge.net> List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe> Reply-To: frank@lichtenheld.com, openvpn-devel@lists.sourceforge.net Content-Type: multipart/mixed; boundary="===============3746118453999455371==" 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?1772669580488802547?= |
Series |
[Openvpn-devel,XS] Change in openvpn[master]: pkcs11_openssl: Disable unused code
|
expand
|
ACK from Selva in Gerrit (and Gerrit URL recorded in the commit). Patch makes sense. Test compiled on Linux with --enable-pkcs11. Your patch has been applied to the master and release/2.6 branch. commit 38fbddc94596b6b2d8fa93a8bd0aca7dbb220def (master) commit dd0a3f3af229c62957d6a223fcb91278c6b77650 (release/2.6) Author: Frank Lichtenheld Date: Fri Jul 28 14:42:01 2023 +0200 pkcs11_openssl: Disable unused code Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Selva Nair <selva.nair@gmail.com> 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 <gert@greenie.muc.de> -- kind regards, Gert Doering
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 *
flichtenheld has uploaded this change for review. ( 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 Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- 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/1