From patchwork Sun Dec 11 19:09:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2895 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:622a:418d:b0:3a5:7962:c21f with SMTP id cd13csp1766733qtb; Sun, 11 Dec 2022 11:10:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf7RhfnRLliVvs216ohVaxnE5TmmWzvP6tY2q+CtgqwSUr5Jyji9zBMSJpbAAILCEyix0fFP X-Received: by 2002:a17:90a:9382:b0:218:6dc6:bb98 with SMTP id q2-20020a17090a938200b002186dc6bb98mr13607157pjo.2.1670785848980; Sun, 11 Dec 2022 11:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670785848; cv=none; d=google.com; s=arc-20160816; b=pjnIGkHmNJH9Q8VTLCByusGtvQx+z+j+uup+8zZkPKOaeg2jbLmhDINFsdzzg1IFLU wLokH9NTk0oILDyhO6lvBDLkEZ0+Iy3QBSeYz6TvPnPaMG9JHDrPgwVr3VlFzCzfOXTC qaVxnPqVQatokSz4Wz9GtPnWnl/bSBA0yuOJNZmJr6Ik6zr8EU2gANDjqxwmKb7AQFZx 4EpcMIF1XKOf8jToFhRGq1J1wKTIKlyNpQHjpFR5gCLNprwB+8/D3WzhDPyjLqaLABAj y7ycAhIuwsNAJlWTAZEoH08YiYw2JYqUIUFVwdvuUM5/fsH60vQg1MJAvMeMQ5UBnOzC i7Mw== 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:mime-version:references:in-reply-to:message-id :date:to:dkim-signature:dkim-signature; bh=7s5b7DaqE6G/LDpNSGRptIaMsNNFyyho0J56V/Czkk4=; b=Dki++Q9WCPtfculTNa2CRl4tzw77QBUZEdffzuVjBwGFIrB1c/Etk3Ak2unz7StcF6 Z2uNm8qsQNH53rzTYuoN5C4DvnocoNz3UOeFWAL1W23qK2yOyjrproe8bk984Z0jnRcV ykoBuJO/LzWjN9iDHnGINFg0faUyyiOLxjfyM58r5pne6/cn2RFiNb+0S9vJPA/v2XC2 hCoKu5MDocLHhSIiaUk2vE6WvFCbMWspHeJcKH5VNdIb0xTt0Dz0+KZJGaX+caBeNDoy nN4PdCj6k3+nacR8DHPSI6uXdWoNp30utmGl0ScapVsVq03p4c8ZOovXdy000TdcTZSN em0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=im7B5o5Y; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mwnPW0IC; 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 ob3-20020a17090b390300b0020382775a6fsi8123557pjb.149.2022.12.11.11.10.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Dec 2022 11:10:48 -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=im7B5o5Y; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mwnPW0IC; 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 1p4Ri0-0006JZ-Iz; Sun, 11 Dec 2022 19:09:56 +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 1p4Rhz-0006JT-Dc for openvpn-devel@lists.sourceforge.net; Sun, 11 Dec 2022 19:09:55 +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:To:From:Sender:Reply-To:Cc: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=llG5SkC8Q4HGdNHc+6vWXTnuIz70rjZtCu/ARHawyus=; b=im7B5o5YQ14mN/KlyT02f9RRCz 5Ha9yXFoyShKva4Nk/gMbJGVa3Pe/OG4YGcYnsfIy5hoG2tksOV0BZbH9Ew9J7elhrRmxUX3LZHEF ZgaAsovj3tN/3GE5yIWyVN+a8Lt1Hv3O/XMj/cyIa7y/7dgCp1zH7pC6PjlkCkHVdvMA=; 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:To:From:Sender:Reply-To:Cc: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=llG5SkC8Q4HGdNHc+6vWXTnuIz70rjZtCu/ARHawyus=; b=mwnPW0IC7h3+SpoKLkF6mYCv99 7IaktObHI3kIrkV7F7Q4po3M//bT5UAMnMqN2hLCpVPpvB9YP6vRgYrJftbZgE6oFz2plfIlG7yvN H+YdIuNtWp0RpybKJyr1GYAybjyNO+eQ5CNI/1BmDYprWHTQlbF9Vl8ZbJypKiIk0ybM=; Received: from mail.astos.de ([217.110.68.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1p4Rhw-00063L-Nv for openvpn-devel@lists.sourceforge.net; Sun, 11 Dec 2022 19:09:55 +0000 To: openvpn-devel@lists.sourceforge.net Date: Sun, 11 Dec 2022 20:09:13 +0100 Message-Id: <20221211190913.190-1-marc.becker@astos.de> In-Reply-To: <1386e3cc-fc65-aa68-fa88-3639f6aec5a2@astos.de> References: <1386e3cc-fc65-aa68-fa88-3639f6aec5a2@astos.de> MIME-Version: 1.0 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: Use existing wrapper for pkcs11h_addProvider to have arguments with "magic values" for pkcs11-helper call in a central place. Slot event argument to pkcs11h_addProvider has NOT been a boolean for at least 15 years. Luckily the default is PKCS11H_SLOTEVENT_METHOD_AUTO=0=FALSE. 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: 1p4Rhw-00063L-Nv Subject: [Openvpn-devel] [PATCH v2 1/3] unify code path for adding PKCS#11 providers 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?1751945942288166058?= X-GMAIL-MSGID: =?utf-8?q?1751945942288166058?= Use existing wrapper for pkcs11h_addProvider to have arguments with "magic values" for pkcs11-helper call in a central place. Slot event argument to pkcs11h_addProvider has NOT been a boolean for at least 15 years. Luckily the default is PKCS11H_SLOTEVENT_METHOD_AUTO=0=FALSE. Signed-off-by: Marc Becker Acked-By: Frank Lichtenheld --- v2: propper commit message, error message without error code reference --- src/openvpn/pkcs11.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c index 507af17c..fbc4c472 100644 --- a/src/openvpn/pkcs11.c +++ b/src/openvpn/pkcs11.c @@ -853,19 +853,9 @@ 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'", provider, rv, pkcs11h_getMessage(rv)); + msg(M_FATAL, "Failed to add PKCS#11 provider '%s", provider); goto cleanup; }