From patchwork Wed Dec 7 00:59:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2889 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:622a:418d:b0:3a5:7962:c21f with SMTP id cd13csp2609490qtb; Tue, 6 Dec 2022 17:10:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Z7wbyW2SMav9ZnyTWJi/ExwFXZSyZaDeOzPonn+P47QGmemm01zk0b2k9GxInh1AicXjj X-Received: by 2002:a17:902:8ec3:b0:186:e68a:9aa8 with SMTP id x3-20020a1709028ec300b00186e68a9aa8mr86781543plo.104.1670375401245; Tue, 06 Dec 2022 17:10:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670375401; cv=none; d=google.com; s=arc-20160816; b=0Ay8EznXiVpoFvVXqijFey2NU7pwotqkk/coA5xCeazBqhiUutLbsJ1TOGhDoLYERm /HH1vtQnFPJz6J5Yd8RXpNbsgH/nF4YkK4U9WZWhU0poZXLW7L5pjgQzYDxQy4niWRws UQey4JloHAHP5LLuIJPxaa6bxr7LEj+U6L+9gTKWLt8deqLE93XjAuzZihADBdOxEVG6 NILz1JqKPNgD5PBsnRYjhprSm1mPjqDv4CYOZ0/YbAW5Lil70BAITICj+hNbDxehR4ag utIQ7wpDf8amCPGCSQjz9C7SqrlXtpUhekar5ocFwi+YBJq2odZcskoWEAyFLrge0fuq yf/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:reply-to:from:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:in-reply-to:references:to:content-language :mime-version:date:message-id:dkim-signature:dkim-signature; bh=bfddL0dyJgA31DUIWOxDz+eVDrXGOEfPhh70K7AKu7Q=; b=nxuPhMuGUJvyxd7AALOnqged+utu1/KcKrbThDw1Mebx4ycZXveblCnKwgXWBuSUgj ELSl/TTIV7Sj8YggGy90PW5T/OmGDvgspJy0TMlXBoM2FwnaRuJ3g1hiWHtmIj+UWXhb VG1vlaI49/6+RjXiI5xjPVNqt/F5uTMajSfqVnCuxcShCuMlE6mKRjg4gHwu+mjJOUmO OfNou5m59MrK15dAMnWwzbLp9ogOuz6ntNsgL9kaT7IexONQMqCncqYJfP0vSkjhuEk1 wgrhzlsWzLmCVSa9QKRzydB3Y9hIID/ua7OkKHxeVVc5qi/Y5fCEy5Kru23BgSHmNhhB kexw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=e8tLIbwP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=F6NIuVGn; 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=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id d25-20020aa797b9000000b00576b089cc3esi9642550pfq.159.2022.12.06.17.10.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 17:10:01 -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=e8tLIbwP; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=F6NIuVGn; 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=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=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 1p2ivw-0000yG-Ff; Wed, 07 Dec 2022 01:09:12 +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 1p2ivl-0000xg-8H for openvpn-devel@lists.sourceforge.net; Wed, 07 Dec 2022 01:09:01 +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:In-Reply-To: References:To:From:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To:Cc: 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=k54VxrTmcFstBfjRVE9ELGeI7LF4lQBBLYDmU8pBC8w=; b=e8tLIbwPmEHSJu9lUp/+UmR4+A jjxdt+hWAflFkph2LWkzMYbGoHhwK3+r7VRLkQrRnzgPi1+PqI57A85nC8vOax9MZmggCwkJRXKK7 lm5DaW2pGWF1LVPS2F8EihySxSvak/ghQv/2g7Am+AT0leMLbRS6VlcVRNOSkuEJXuaI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:To:From: Subject:MIME-Version:Date:Message-ID:Sender:Reply-To:Cc: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=k54VxrTmcFstBfjRVE9ELGeI7LF4lQBBLYDmU8pBC8w=; b=F6NIuVGnYYeslGfWdXjQ710KoQ Id/tDrC9lfHddKMIUBp0mDQiqVj9e/EBH32Bu6snGFj/bbMJALGIRg1BsuIyobFKuJoR7kuolg3kq w7zyl1fSUdM6aUejAjOP9rUBTdnTsT1ANLzNc2Ym+bigO9h0p9XYuTMe00ei6u5o3DGs=; Received: from mail.astos.de ([217.110.68.46]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1p2ivk-008aho-Dm for openvpn-devel@lists.sourceforge.net; Wed, 07 Dec 2022 01:09:01 +0000 Message-ID: Date: Wed, 7 Dec 2022 01:59:34 +0100 MIME-Version: 1.0 Content-Language: de-DE, en-US To: openvpn-devel@lists.sourceforge.net References: <1386e3cc-fc65-aa68-fa88-3639f6aec5a2@astos.de> In-Reply-To: <1386e3cc-fc65-aa68-fa88-3639f6aec5a2@astos.de> X-Spam-Score: 0.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: --- src/openvpn/pkcs11.c | 12 + 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c index 507af17c..b6ceb582 100644 --- a/src/openvpn/pkcs11.c +++ b/src/openvpn/pkcs11.c @@ -853,17 +853,7 @@ show_pkcs11_ids( goto cleanup; } Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1p2ivk-008aho-Dm Subject: [Openvpn-devel] [PATCH 1/3] unify code paths for loading PKCS11 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: , X-Patchwork-Original-From: Marc Becker via Openvpn-devel From: Marc Becker Reply-To: Marc Becker Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1751515556586827799?= X-GMAIL-MSGID: =?utf-8?q?1751515556586827799?= --- src/openvpn/pkcs11.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) provider, rv, pkcs11h_getMessage(rv)); goto cleanup; diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c index 507af17c..b6ceb582 100644 --- a/src/openvpn/pkcs11.c +++ b/src/openvpn/pkcs11.c @@ -853,17 +853,7 @@ show_pkcs11_ids( goto cleanup; } - if ( - (rv = pkcs11h_addProvider( - provider, - provider, - TRUE, - 0, - FALSE, - 0, - cert_private ? TRUE : FALSE - )) != CKR_OK - ) + if (!pkcs11_addProvider(provider, TRUE, 0, cert_private ? TRUE : FALSE)) { msg(M_FATAL, "PKCS#11: Cannot add provider '%s' %ld-'%s'",