From patchwork Wed Nov 19 11:02:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4613 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:3515:b0:7b1:439f:bdf with SMTP id ss21csp53377mab; Wed, 19 Nov 2025 03:02:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWhEyBAp2eFlGjNvZjvtf0pboerzwF66alsNdn6ReCH0bJX06CSfXkWqko0Rwdxd1IVVIk7XAw3OQs=@openvpn.net X-Google-Smtp-Source: AGHT+IFWxWQA42OtIc7S1j+H6AKU+3NStGDa5iYVPZ7UKgNWbUFjz7eE76Opb3//dKNrYNWmrEtQ X-Received: by 2002:a05:6830:245:b0:7c7:5725:2818 with SMTP id 46e09a7af769-7c757252962mr6271006a34.20.1763550174960; Wed, 19 Nov 2025 03:02:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763550174; cv=none; d=google.com; s=arc-20240605; b=D02AzN+AvivS43bb67d1tZhc4xac+Z55NsDDTb7Zd9oXuDV+B581P/0NBRW42j0Bq4 Eq3cZl16WKZdtze4U17iDwlRlpzdcQFFzrbqfWAdoWge53mtGXM72iRr+dHFnW6pBEFh jInZHFupP6Hr7BXmCrdz/+hynKeZRPZWxPxwF7Qzh7o3iZIE34gFVkMbRqR0ubQ7prZ8 VdE7PNgJod2OozcsqMdBAW0uc8gmgImIsWoBBfh/NFXyvvkez0V7WR/5s19642LD9oTN 8hf21G/b6Cr+KtQC94eNJwueBjnre2VAY65i/oEiifP5jufcnr3u0inccFQAMy5bxXFd vuFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=4ryMl7hFMBlddxk7RZosbXFZgpVGb6d55TVobOKM6hM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=GTJscpV31R8sb9/w4BNF9Ece0taERXnv7xvEpR3vKvUT7189SlKDPcbcEjxj9GVUVP /4apDRi60PYZ7qDgi5EETqdi44t1Eesyh0omKP5cGCc2LnHEWoSVtj14W0tpsGyCE2wr RD6UdKpBv9bLp3EWIwnPvEsAjNT48SHh39aKCVkY8oJw40xuTaFicxGmj9MU0nfJpyC0 7aVWtD2oJgZgcLzi9hONxe5mDYhWUmXGsXiSeaOlVlrY9N7jg6egnV9V/UGZ8CuyGXCZ 0QMLoGENWIiqiiwQOxyENxvii3PuMFXfy0eddx5Pzotfs70mQEqcHRAqOLB3KOleR1fX A3rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b="Yeg/YB9I"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=DQPaliUe; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nKYmxnGd; 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=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-7c75fafa760si3209737a34.50.2025.11.19.03.02.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2025 03:02:54 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b="Yeg/YB9I"; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=DQPaliUe; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nKYmxnGd; 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=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4ryMl7hFMBlddxk7RZosbXFZgpVGb6d55TVobOKM6hM=; b=Yeg/YB9IMQRBwNKwFZ8cigElWU C0/hnKqwvXAyfLH49P/2onEyC60PIp8g8H6z//uLDTmyWz9P07YvuD0/ldI8VibPEKu6hW7BfFa1s o/PkQtiWmoYmIPYINqD9ZrSBwVMF/n/DvL8pWroQTst+BorUwj9bmXgooBmY2WoWe6UU=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vLfxW-0003Bm-RQ; Wed, 19 Nov 2025 11:02:46 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vLfxV-0003Be-29 for openvpn-devel@lists.sourceforge.net; Wed, 19 Nov 2025 11:02:45 +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=yltoeWiv7CjWAGS/Fh7QS/nvWwr3JHFpy1iNprnTylA=; b=DQPaliUeWGCmC02audLJUalh+t VyfUfTDjHyVlVSOmVASkv8g5YfFonwcmklX5+5s8ziu8vy1pxGfOu7Cz4eQv+TIthtosHz7lRfJ1c qNPhAlbhbZ9Tw0YXhPpJLS+Ij0gwEW9jzg9RzvArzaPqg38GyqRhS+pigjUoxIXyA5dQ=; 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=yltoeWiv7CjWAGS/Fh7QS/nvWwr3JHFpy1iNprnTylA=; b=nKYmxnGdZo8zoaRvCgiqRrWZXf 3kef2uyOrq2MeADJZcRoYHmVjJXjO9nobC6MTVm6Y9Gx6kKwVCZ3N4k5LDnKUvJqX6zcGUnCERdEc 97UA3UrOzwXV3w5MJgQFjFz0Gn1L/470xVgG/tOpBQHYtyIu4Ahuzhzq5MeYZEv+EwLg=; Received: from [193.149.48.134] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vLfxT-0006EP-Of for openvpn-devel@lists.sourceforge.net; Wed, 19 Nov 2025 11:02:44 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 5AJB2Vh8014045 for ; Wed, 19 Nov 2025 12:02:31 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5AJB2VtX014044 for openvpn-devel@lists.sourceforge.net; Wed, 19 Nov 2025 12:02:31 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 19 Nov 2025 12:02:25 +0100 Message-ID: <20251119110231.13999-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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: From: Selva Nair RFC7512 patch for pkcs11-uri is rebased to current master, fixing minor conflicts. Change-Id: I032a573df6deaa44b4afce3c2d2fd54f69df6e7a Signed-off-by: Selva Nair Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openv [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1vLfxT-0006EP-Of Subject: [Openvpn-devel] [PATCH v1] vcpkg-ports/pkcs11-helper: bump version to 1.31 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1849216388502955581?= X-GMAIL-MSGID: =?utf-8?q?1849216388502955581?= From: Selva Nair RFC7512 patch for pkcs11-uri is rebased to current master, fixing minor conflicts. Change-Id: I032a573df6deaa44b4afce3c2d2fd54f69df6e7a Signed-off-by: Selva Nair Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1368 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1368 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Frank Lichtenheld diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch index 56e3486..65b159c 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch +++ b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch @@ -1,5 +1,7 @@ upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/4 +Rebased to 1.31.0 by selva.nair@gmail.com + commit 90590b02085edc3830bdfe0942a46c4e7bf3f1ab (HEAD -> master) Author: David Woodhouse Date: Thu Apr 30 14:58:24 2015 +0100 @@ -596,9 +598,9 @@ + } + certificate_id->attrCKA_ID_size = id_hex_len/2; - if ( - (rv = _pkcs11h_mem_malloc ( -@@ -430,21 +596,64 @@ pkcs11h_certificate_deserializeCertificateId ( + if (certificate_id->attrCKA_ID_size == 0) { + rv = CKR_ATTRIBUTE_VALUE_INVALID; +@@ -434,21 +600,64 @@ pkcs11h_certificate_deserializeCertificateId ( goto cleanup; } @@ -669,20 +671,17 @@ PKCS11H_LOG_DEBUG2, "PKCS#11: pkcs11h_certificate_deserializeCertificateId return rv=%lu-'%s'", diff --git a/lib/pkcs11h-util.c b/lib/pkcs11h-util.c -index 0743fd1..f90e443 100644 +index 1fcadfc..a304642 100644 --- a/lib/pkcs11h-util.c +++ b/lib/pkcs11h-util.c -@@ -110,12 +110,7 @@ _pkcs11h_util_hexToBinary ( - p++; +@@ -123,10 +123,6 @@ _pkcs11h_util_hexToBinary ( + (*p_target_size)++; } - if (*p != '\x0') { -- return CKR_ATTRIBUTE_VALUE_INVALID; +- goto cleanup; - } -- else { -- return CKR_OK; -- } -+ return CKR_OK; - } +- + ret = CKR_OK; - CK_RV + cleanup: diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index db9a5ab..af19831 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.30.0) +set(VERSION 1.31.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${VERSION}/pkcs11-helper-${VERSION}.tar.bz2" FILENAME "pkcs11-helper-${VERSION}.tar.bz2" - SHA512 19fba76e41210cc17f9efa4501d0214d4a5c777ab7b2671888fd280b150bae4a6b190c7f47fb783015f9aa40d409fd6087264e531d6f28d0bed4293dcbf8bdd5 + SHA512 0833efc59e9093dd398a54640d858b01a830ef7adfb40321c1e0ed0afa004500fc1259cc66bc49c5263935adeda0a3bfe658de538eefd66888685a71f731c484 ) vcpkg_extract_source_archive_ex( diff --git a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json index 521f754..382a3d3 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json +++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pkcs11-helper", - "version": "1.30.0", + "version": "1.31.0", "description": "pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications.", "homepage": "https://github.com/OpenSC/pkcs11-helper", "license": "BSD-3-Clause OR GPL-2.0-only"