From patchwork Sun Dec 11 19:14:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2896 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:622a:418d:b0:3a5:7962:c21f with SMTP id cd13csp1767919qtb; Sun, 11 Dec 2022 11:14:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf5sTm4zml/gy1khnaT1iBdEfUo338yxpkjPP5eKzjPpjraSu0Nv4u9X8+IVLqiKideGLBI9 X-Received: by 2002:a17:90a:e2c6:b0:219:5f5a:7197 with SMTP id fr6-20020a17090ae2c600b002195f5a7197mr13897187pjb.0.1670786078361; Sun, 11 Dec 2022 11:14:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670786078; cv=none; d=google.com; s=arc-20160816; b=BFzZreMsWCl9ckvpsoE84TD8MTsD35kSDYLgWAT24qvtp+P7iOvMUGe+uxIozK8qVS f8fN5xPxr4jFoksif4IdCCO18dzw4De5t3n71qhcvxYyrW8PXV0B6t9O9oTqiw4MR41g znWmeiSrehr25hrRADSAU7oCaLyyhTWQG48sj4ZzjBm+VkaJ9gSBqhKy8bBdAdr4gQcV KC6z2iw1QXJP9BFPbU8ffKMdv8HWIi9HCoVyw0YGHEL1lLBfsKD57WXJCxd+iF5gdhSq E7nNYMeMIqdZpUS4POxVP1Q/MlWp1qWw2RFdqVSHpOAz/8Uu8euSfwbM8mRaGMJAu+MC Tnvw== 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=tEmDbhmUb0gL4+fhivwvXLxcpkoyvQll9kSAgaB72gM=; b=drsXqpkcqqA5vW3Cs4CTb+P7mx88mPM56cp2h4hZOg9H8rD/LHrxz84tTY/PgPUEFk VICm/QPxNGVbG3KJ73BGt28e35FjWkjqz/NzWpu0TVPX/E9jvMsKTOEp55xDJ6HLXiHE owY1stw6p1sK+wNQhaIocPuOEnJleeI9imHHSJ0+iXr5g57TWYd+vc6T/cMNqcq3bR/s 5IxT8W6NDo79d1jJYIqMC+j6hnyU4y1I00hr07zFTjQLvU8ADMIRY+bnl620jCxXiVxA 8On9wPyIMwdLTypxUD2IUEUdolOUS/bGJc9WC14YfAXtgaM1u5/7ue+FZkIQB2ObQJjl ojUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ZQqKhkUG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=WX5OsKn4; 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 u14-20020a63790e000000b004790794f259si7820437pgc.739.2022.12.11.11.14.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Dec 2022 11:14:38 -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=ZQqKhkUG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=WX5OsKn4; 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 1p4RmD-0006QI-62; Sun, 11 Dec 2022 19:14:17 +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 1p4RmB-0006QC-HG for openvpn-devel@lists.sourceforge.net; Sun, 11 Dec 2022 19:14:15 +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=ryymd1GATClCDdVr77ff6fNgVfS2brt2nfJe09GCA40=; b=ZQqKhkUGG1srZGubAv50KtPQk5 trc+/G3+cJHGwP/hYv7GMuUKeZIw7LErrcLsEqKdlBOevMCcJaCOrWTN9DOKH5Dos6lTq5oM53apQ cYbNdxKnq3AFmTJefvCz/faa3oZToRvAZjWOkibFOr0BqZ+xy1Kn1XSodIx4Dq2Taq7Y=; 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=ryymd1GATClCDdVr77ff6fNgVfS2brt2nfJe09GCA40=; b=WX5OsKn4suNXhMaWQ2fODtp3TW c3Umg7dy6bryV1yKJ7ydo9OQL0+1IblNa629QrNK4cTb5aS0EgThuvdv8q84SqZtg6JfFsFkfhSOU S6I2jQzY2Iy5KnoPUnSntondAT3CSG+WghXVYqHM7llynRCFaUyPU09Ud2rXwNmntsu8=; 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 1p4RmA-00E3mr-KW for openvpn-devel@lists.sourceforge.net; Sun, 11 Dec 2022 19:14:15 +0000 To: openvpn-devel@lists.sourceforge.net Date: Sun, 11 Dec 2022 20:14:03 +0100 Message-Id: <20221211191403.805-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-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: The new interface in pkcs11-helper 1.28 allows decoupling of provider registration and initialization. This allows modifying more (and future) properties apart from the 6 fixed ones supported as argum [...] 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: 1p4RmA-00E3mr-KW Subject: [Openvpn-devel] [PATCH v2 2/3] use new pkcs11-helper interface to add 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?1751946182894613789?= X-GMAIL-MSGID: =?utf-8?q?1751946182894613789?= The new interface in pkcs11-helper 1.28 allows decoupling of provider registration and initialization. This allows modifying more (and future) properties apart from the 6 fixed ones supported as arguments to pkcs11h_addProvider(). With the new interface it is easier to see (from a code perspective) which option is set to which value. It's also not necessary to supply values for built-in defaults: - slot_event_method=PKCS11H_SLOTEVENT_METHOD_AUTO - slot_poll_interval=0 Signed-off-by: Marc Becker Acked-by: Selva Nair --- v2: improved code and description, no (essentially) duplicated log output --- src/openvpn/pkcs11.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c index fbc4c472..b74ac8f4 100644 --- a/src/openvpn/pkcs11.c +++ b/src/openvpn/pkcs11.c @@ -396,6 +396,38 @@ pkcs11_addProvider( provider ); +#if PKCS11H_VERSION >= ((1<<16) | (28<<8) | (0<<0)) + if ((rv = pkcs11h_registerProvider(provider)) != CKR_OK) + { + msg(M_WARN, "PKCS#11: Cannot register provider '%s' %ld-'%s'", provider, rv, pkcs11h_getMessage(rv)); + } + else + { + PKCS11H_BOOL allow_protected_auth = protected_auth; + PKCS11H_BOOL cert_is_private = cert_private; + + rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_LOCATION, provider, strlen(provider) + 1); + + if (rv == CKR_OK) + { + rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_ALLOW_PROTECTED_AUTH, &allow_protected_auth, sizeof(allow_protected_auth)); + } + if (rv == CKR_OK) + { + rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_MASK_PRIVATE_MODE, &private_mode, sizeof(private_mode)); + } + if (rv == CKR_OK) + { + rv = pkcs11h_setProviderProperty(provider, PKCS11H_PROVIDER_PROPERTY_CERT_IS_PRIVATE, &cert_is_private, sizeof(cert_is_private)); + } + + if (rv != CKR_OK || (rv = pkcs11h_initializeProvider(provider)) != CKR_OK) + { + msg(M_WARN, "PKCS#11: Cannot initialize provider '%s' %ld-'%s'", provider, rv, pkcs11h_getMessage(rv)); + pkcs11h_removeProvider(provider); + } + } +#else /* if PKCS11H_VERSION >= ((1<<16) | (28<<8) | (0<<0)) */ if ( (rv = pkcs11h_addProvider( provider, @@ -410,6 +442,7 @@ pkcs11_addProvider( { msg(M_WARN, "PKCS#11: Cannot initialize provider '%s' %ld-'%s'", provider, rv, pkcs11h_getMessage(rv)); } +#endif /* if PKCS11H_VERSION >= ((1<<16) | (28<<8) | (0<<0)) */ dmsg( D_PKCS11_DEBUG,