mirrors/meta-security
1
0 Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-10-15 17:27:01 +00:00
Code Issues Projects Releases Wiki Activity

trousers: Fix build with OpenSSL 4.x

Browse Source 
OpenSSL 4.0 completes the opaquing of struct asn1_string_st, so
src/tspi/tspi_asn1.c no longer builds:

  src/tspi/tspi_asn1.c:240:33: error: incomplete definition of type
      'ASN1_OCTET_STRING' (aka 'struct asn1_string_st')
    240 |    memcpy(rawBlob, tssBlob->blob->data, decBlobSize);
        |                    ~~~~~~~~~~~~~^

Add a patch using the ASN1_STRING_get0_data() accessor, which has been
available since OpenSSL 1.1.0 and is the documented replacement for
reaching into ->data. The rest of the file already goes through
accessors (ASN1_INTEGER_get(), ASN1_OCTET_STRING_set()), so this keeps
it consistent. No functional change.

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 authored and Scott Murray committed 2026-09-14 20:53:36 +03:00
1 parent 66cb831bbb
commit f3d7d2e6d4
2 files changed
+46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta-tpm/recipes-tpm1/trousers/files/0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch
+45
View File
@@ -0,0 +1,45 @@
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Sun, 6 Sep 2026 20:05:00 -0700
Subject: [PATCH] tspi_asn1: use ASN1_STRING_get0_data() accessor
OpenSSL 4.0 completes the opaquing of struct asn1_string_st, so reaching
into ASN1_OCTET_STRING directly no longer compiles:
src/tspi/tspi_asn1.c:240:33: error: incomplete definition of type
'ASN1_OCTET_STRING' (aka 'struct asn1_string_st')
240 | memcpy(rawBlob, tssBlob->blob->data, decBlobSize);
| ~~~~~~~~~~~~~^
Use the ASN1_STRING_get0_data() accessor instead. It has been available
since OpenSSL 1.1.0 and is the documented replacement for touching the
->data member; the rest of this file already goes through accessors
(ASN1_INTEGER_get(), ASN1_OCTET_STRING_set()).
No functional change.
Upstream-Status: Inappropriate [upstream is dormant; git.code.sf.net
master is still at 94144b0 "Bumped version to 0.3.15" from 2020-11-03,
which is the SRCREV this recipe already pins]
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
src/tspi/tspi_asn1.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tspi/tspi_asn1.c b/src/tspi/tspi_asn1.c
index f17ce41..14d216b 100644
--- a/src/tspi/tspi_asn1.c
+++ b/src/tspi/tspi_asn1.c
@@ -237,7 +237,8 @@ Tspi_DecodeBER_TssBlob(UINT32 berBlobSize, /* in */
if (*rawBlobSize != 0) {
if (decBlobSize <= *rawBlobSize) {
- memcpy(rawBlob, tssBlob->blob->data, decBlobSize);
+ memcpy(rawBlob, ASN1_STRING_get0_data(tssBlob->blob),
+ decBlobSize);
}
else {
TSS_BLOB_free(tssBlob);
--
2.51.0
meta-tpm/recipes-tpm1/trousers/trousers_git.bb
+1
View File
@@ -16,6 +16,7 @@ SRC_URI = " \
file://tcsd.service \
file://get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch \
file://0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch \
file://0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch \
"
inherit autotools pkgconfig useradd update-rc.d ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}