summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2025-11-14 12:35:21 +1000
committerKhem Raj <raj.khem@gmail.com>2025-11-13 23:02:36 -0800
commit423eb6775a07a205df9e888cd0eefe3517b197bf (patch)
tree878613e4182d3c63d54b3869d6bbf9b7951e321a
parentb9370342b4ead575a0c26a67e373cc91abf238d8 (diff)
downloadmeta-openembedded-423eb6775a07a205df9e888cd0eefe3517b197bf.tar.gz
libspdm: upgrade 3.7.0 -> 3.8.1
Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch33
-rw-r--r--meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb (renamed from meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb)6
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
deleted file mode 100644
index 2df9a18c68..0000000000
--- a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 92f6c3d8fa26d9019ba27e0c1aa894517ada93b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 11 Apr 2025 17:47:05 -0700
4Subject: [PATCH] Backport API introduced in openssl 3.5.0
5
6This commit [1] introduced this new API which is used by pem.h from
7openssl and it should be provided by asn1.h which is vendored here so
8it goes out of sync and causes build errors e.g
9
10In file included from ./os_stub/cryptlib_openssl/pk/x509.c:18:
11/usr/include/openssl/pem.h:399:28: error: unknown type name 'OSSL_i2d_of_void_ctx'
12 399 | int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx,
13
14[1] https://github.com/openssl/openssl/commit/35f6e7ea02b599d5aaf220b4720cbadd946d8023
15
16Upstream-Status: Submitted [https://github.com/DMTF/libspdm/pull/3033]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 os_stub/openssllib/openssl_gen/openssl/asn1.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/os_stub/openssllib/openssl_gen/openssl/asn1.h b/os_stub/openssllib/openssl_gen/openssl/asn1.h
23index a90152ee..fcfbe42e 100644
24--- a/os_stub/openssllib/openssl_gen/openssl/asn1.h
25+++ b/os_stub/openssllib/openssl_gen/openssl/asn1.h
26@@ -368,6 +368,7 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
27
28 typedef void *d2i_of_void(void **, const unsigned char **, long);
29 typedef int i2d_of_void(const void *, unsigned char **);
30+typedef int OSSL_i2d_of_void_ctx(const void *, unsigned char **, void *vctx);
31
32 /*-
33 * The following macros and typedefs allow an ASN1_ITEM
diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb b/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb
index c6bbd1716b..431eb8fd40 100644
--- a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb
+++ b/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb
@@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7"
9 9
10DEPENDS = "openssl" 10DEPENDS = "openssl"
11 11
12SRC_URI = "git://github.com/DMTF/libspdm.git;branch=main;protocol=https \ 12SRC_URI = "git://github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https"
13 file://0001-Backport-API-introduced-in-openssl-3.5.0.patch" 13SRCREV = "d7c8c8247b4d0bd8ed75d9f35a558a4df173a4c7"
14SRCREV = "1be116c7b7713fa9003e1bd53b53a34758549eb9"
15
16 14
17inherit cmake 15inherit cmake
18 16