tpm2-pkcs11: Upgrade 1.9.2 -> 1.10.1

Fixes the build against OpenSSL 4.0, which completes the opaquing of
struct asn1_string_st:

  src/lib/ssl_util.c:201:9: error: incomplete definition of type
      'ASN1_OCTET_STRING' (aka 'struct asn1_string_st')

Upstream switched both call sites in ssl_util.c to the
ASN1_STRING_get0_data()/ASN1_STRING_length() accessors, so the upgrade
is all that is needed, no local patch.

Drop 0001-src-lib-tpm-return-NULL-for-twist-on-auth-failure.patch, it is
already applied upstream in this release (PR #923) and now fails to
apply.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
This commit is contained in:
Khem Raj
2026-09-14 20:56:10 +03:00
committed by Scott Murray
parent b289c5040c
commit d34b7b8031
2 changed files with 1 additions and 30 deletions
@@ -1,28 +0,0 @@
From 0db779aecaae93633be963ffb8fdb097c85cc166 Mon Sep 17 00:00:00 2001
From: Peter Marko <peter.marko@siemens.com>
Date: Thu, 9 Apr 2026 00:00:00 +0000
Subject: [PATCH] src/lib/tpm: return NULL for twist on auth failure
`tpm_unseal` returns `twist` (a const char pointer alias). Returning
`false` in the error path is a type mismatch that fails with stricter
compiler settings. Return `NULL` instead.
Upstream-Status: Submitted [https://github.com/tpm2-software/tpm2-pkcs11/pull/923]
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
src/lib/tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/tpm.c b/src/lib/tpm.c
index 5fff5d5..c51d984 100644
--- a/src/lib/tpm.c
+++ b/src/lib/tpm.c
@@ -1037,7 +1037,7 @@ twist tpm_unseal(tpm_ctx *ctx, uint32_t handle, twist objauth) {
bool result = set_esys_auth(ctx->esys_ctx, handle, objauth);
if (!result) {
- return false;
+ return NULL;
}
TPM2B_SENSITIVE_DATA *unsealed_data = NULL;
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fc19f620a102768d6dbd1e7166e78ab"
DEPENDS = "autoconf-archive pkgconfig sqlite3 openssl libtss2-dev tpm2-tools libyaml p11-kit python3-setuptools-native"
SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"
SRC_URI += "file://0001-src-lib-tpm-return-NULL-for-twist-on-auth-failure.patch"
SRC_URI[sha256sum] = "1bdabdaed6a5fa4ce8a1e82307f4612c30e30b0a0415e1bc7d9c30f713227480"
SRC_URI[sha256sum] = "f3315d17811f918779a1046ba20e49060a40b2b586a06ab013ff8c8da53752e4"
UPSTREAM_CHECK_URI = "https://github.com/tpm2-software/${BPN}/releases"