diff mbox series

[meta-security] trousers: Fix build with OpenSSL 4.x

Message ID 20260907042920.1478490-1-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-security] trousers: Fix build with OpenSSL 4.x | expand

Commit Message

Khem Raj Sept. 7, 2026, 4:29 a.m. UTC 
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>
---
 ...1-use-ASN1_STRING_get0_data-accessor.patch | 45 +++++++++++++++++++
 .../recipes-tpm1/trousers/trousers_git.bb     |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 meta-tpm/recipes-tpm1/trousers/files/0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch
diff mbox series

Patch

diff --git a/meta-tpm/recipes-tpm1/trousers/files/0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch b/meta-tpm/recipes-tpm1/trousers/files/0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch
new file mode 100644
index 0000000..9287450
--- /dev/null
+++ b/meta-tpm/recipes-tpm1/trousers/files/0001-tspi_asn1-use-ASN1_STRING_get0_data-accessor.patch
@@ -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
+
diff --git a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
index abbb436..ff3335f 100644
--- a/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
+++ b/meta-tpm/recipes-tpm1/trousers/trousers_git.bb
@@ -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)}