[rpms/tpm2-pkcs11] f44: 1.10.0-1

[rpms/tpm2-pkcs11] f44: 1.10.0-1

[Jakub Jelen]

A new commit has been pushed.

Repo   : rpms/tpm2-pkcs11
Branch : f44
Commit : 20627ff771be9cc7b27f58485fde42dfb131b4f2
Author : Jakub Jelen <jjelen@redhat.com>
Date   : 2026-05-20T16:13:07+02:00
Stats  : +18/-57 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/tpm2-pkcs11/c/20627ff771be9cc7b27f58485fde42dfb131b4f2?branch=f44

Log:
1.10.0-1

---
diff --git a/0001-Use-ASN1_STRING-accessors-for-compatibility.patch b/0001-Use-ASN1_STRING-accessors-for-compatibility.patch
deleted file mode 100644
index caa6280..0000000
--- a/0001-Use-ASN1_STRING-accessors-for-compatibility.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 20f906e23ae9b51e0cb39aed6f3d5a7b388c09be Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Fri, 17 Apr 2026 17:05:33 -0400
-Subject: [PATCH] Use ASN1_STRING accessors for compatibility
-
-Replace direct access to the data and length members of ASN1_OCTET_STRING with
-ASN1_STRING_get0_data() and ASN1_STRING_length(). This prevents build errors
-by ensuring compatibility with OpenSSL 1.1.0 and later, which makes these
-structures opaque.
-
-Co-authored-by: Gemini <gemini@google.com>
-Signed-off-by: Simo Sorce <simo@redhat.com>
----
- src/lib/ssl_util.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/ssl_util.c b/src/lib/ssl_util.c
-index b53485b..672f884 100644
---- a/src/lib/ssl_util.c
-+++ b/src/lib/ssl_util.c
-@@ -198,7 +198,7 @@ static CK_RV get_EC_evp_pubkey(CK_ATTRIBUTE_PTR ecparams, CK_ATTRIBUTE_PTR ecpoi
-     }
- 
-     if (OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY,
--    		os->data, os->length) != 1) {
-+    		ASN1_STRING_get0_data(os), ASN1_STRING_length(os)) != 1) {
-     	SSL_UTIL_LOGE("OSSL_PARAM_BLD_push_octet_string(OSSL_PKEY_PARAM_PUB_KEY)");
-     	goto out;
-     }
-@@ -312,8 +312,8 @@ static CK_RV get_EC_evp_pubkey(CK_ATTRIBUTE_PTR ecparams, CK_ATTRIBUTE_PTR ecpoi
-     x = ecpoint->pValue;
-     ASN1_OCTET_STRING *os = d2i_ASN1_OCTET_STRING(NULL, &x, ecpoint->ulValueLen);
-     if (os) {
--        x = os->data;
--        k = o2i_ECPublicKey(&ecc, &x, os->length);
-+        x = ASN1_STRING_get0_data(os);
-+        k = o2i_ECPublicKey(&ecc, &x, ASN1_STRING_length(os));
-         ASN1_STRING_free(os);
-         if (!k) {
-             SSL_UTIL_LOGE("Could not update key with EC Points");
--- 
-2.53.0
-

diff --git a/sources b/sources
index d192352..c02fe2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tpm2-pkcs11-1.9.1.tar.gz) = c0f76ef941f51f8637906da42917596725dbe15bbd7ab56de9efdb81cbf0ec1a846e752702eb84e08d8c539098755402c519e5f95dce101ac44143de6602c393
-SHA512 (tpm2-pkcs11-1.9.1.tar.gz.asc) = 324d64b9834bb7183df1e2a778517e52d068a6e89dbcd61422cb6898a5fc4bff07f77ae8d5ecafcbb39b7e98e8e02aaa912464edd691fe53f58899bf7f148355
+SHA512 (tpm2-pkcs11-1.10.0.tar.gz) = 1b95906faffd3125894efd7bf9d5fc9aa67399c7d659a52f1b71c55f8687d5c062a61663e73df8cdaca1d11489df7e0bb8fcee29a4987c29679167d5d08d005a
+SHA512 (tpm2-pkcs11-1.10.0.tar.gz.asc) = ad5d4ec61a291abd7ebf91fcddcda27ffdf4bc4b55541945a1b796268f6f7910b58b1b6bf221e88cc4a03d80bf9c505e6ba5dbf6da38e4fb10a0fda820ff8cd3

diff --git a/tpm2-pkcs11.spec b/tpm2-pkcs11.spec
index 383bff4..cf5cfe3 100644
--- a/tpm2-pkcs11.spec
+++ b/tpm2-pkcs11.spec
@@ -1,8 +1,8 @@
 #global candidate RC0
 
 Name:		tpm2-pkcs11
-Version:	1.9.1
-Release:	8%{?candidate:.%{candidate}}%{?dist}
+Version:	1.10.0
+Release:	1%{?candidate:.%{candidate}}%{?dist}
 Summary:	PKCS#11 interface for TPM 2.0 hardware
 
 License:	BSD-2-Clause
@@ -12,9 +12,6 @@ Source1:	https://github.com/tpm2-software/%{name}/releases/download/%{version}%{
 # William Roberts (Bill Roberts) key from pgp.mit.edu
 Source2:	gpgkey-8E1F50C1.gpg
 
-# https://github.com/tpm2-software/tpm2-pkcs11/pull/929
-Patch1:         0001-Use-ASN1_STRING-accessors-for-compatibility.patch
-
 BuildRequires:	gcc
 BuildRequires:	make
 BuildRequires:	python3
@@ -70,7 +67,9 @@ popd >&2
 
 
 %build
-%configure --enable-unit --with-fapi=yes
+# the ptool checks require ancient pkcs11 module
+# https://github.com/tpm2-software/tpm2-pkcs11/issues/908
+%configure --enable-unit --with-fapi=yes --disable-ptool-checks
 %{make_build}
 pushd tools
 %pyproject_wheel
@@ -79,12 +78,14 @@ popd
 
 %install
 %make_install
-mkdir $RPM_BUILD_ROOT/%{_includedir}/
-install src/pkcs11.h $RPM_BUILD_ROOT/%{_includedir}/
-[ -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/libtpm2_pkcs11.la ] && \
-  rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/libtpm2_pkcs11.la
-[ -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/libtpm2_pkcs11.a ] && \
-  rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/libtpm2_pkcs11.a
+mkdir $RPM_BUILD_ROOT%{_includedir}/
+install src/pkcs11.h $RPM_BUILD_ROOT%{_includedir}/
+# The installation is broken since
+# https://github.com/tpm2-software/tpm2-pkcs11/pull/818
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/
+install misc/p11-kit/tpm2_pkcs11.module $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/
+mkdir $RPM_BUILD_ROOT%{_libdir}/pkcs11
+mv $RPM_BUILD_ROOT%{_libdir}/libtpm2_pkcs11.so* $RPM_BUILD_ROOT%{_libdir}/pkcs11
 
 pushd tools
 %pyproject_install
@@ -114,6 +115,9 @@ make check
 
 
 %changelog
+* Wed May 20 2026 Jakub Jelen <jjelen@redhat.com> - 1.10.0-1}
+- New upstream release (#2400481)
+
 * Fri Apr 17 2026 Simo Sorce <ssorce@redhat.com> - 1.9.1-8
 - OpenSSL 4 build fixes