From 0e09a4ad71db519dc94701f1e1de4ab0b46348f4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 10 Jan 2024 22:51:51 +0100 Subject: [PATCH] package/ibm-sw-tpm2: fix openssl build Fix the following build failure raised since bump of openssl to version 3.2.0 in commit 973b1eba5a4ee72f040bd471b147267e36be73ad: In file included from BnValues.h:327, from Global.h:80, from Tpm.h:78, from ACTCommands.c:62: TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version 83 | # error Untested OpenSSL version | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/f22867e71dca64d4ab5fee4db39fe9b1899f4b85 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0002-Add-support-for-OpenSSL-3-2-x.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch diff --git a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch new file mode 100644 index 0000000000..6732efce8c --- /dev/null +++ b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch @@ -0,0 +1,28 @@ +From beea0f97b3c95ec69f3e269df1af87eb2cdd3c46 Mon Sep 17 00:00:00 2001 +From: Otto Hollmann +Date: Tue, 12 Dec 2023 13:58:32 +0100 +Subject: [PATCH] Add support for OpenSSL 3.2.x + +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/13 +Signed-off-by: Fabrice Fontaine +--- + src/TpmToOsslMath.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/TpmToOsslMath.h b/src/TpmToOsslMath.h +index 0b18191..1271937 100644 +--- a/src/TpmToOsslMath.h ++++ b/src/TpmToOsslMath.h +@@ -76,10 +76,10 @@ + * As of release 3.0.0, OPENSSL_VERSION_NUMBER is a combination of the + * major (M), minor (NN) and patch (PP) version into a single integer 0xMNN00PP0L + */ +-#if OPENSSL_VERSION_NUMBER > 0x30100ff0L ++#if OPENSSL_VERSION_NUMBER > 0x30200ff0L + // Check the bignum_st definition in crypto/bn/bn_lcl.h or crypto/bn/bn_local.h and either update + // the version check or provide the new definition for this version. +-// Currently safe for all 3.1.x ++// Currently safe for all 3.2.x + # error Untested OpenSSL version + #elif OPENSSL_VERSION_NUMBER >= 0x10100000L + // from crypto/bn/bn_lcl.h