From 717b6d535344e85ba57646ec9253333471ba39421ea56e5b7abb2ae601692808 Mon Sep 17 00:00:00 2001 From: Wolfgang Frisch Date: Tue, 12 Dec 2023 14:26:29 +0000 Subject: [PATCH] Accepting request 1132696 from home:ohollmann:branches:security:tls - Add support for OpenSSL 3.2.x * Add ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch OBS-URL: https://build.opensuse.org/request/show/1132696 OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=32 --- ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch | 29 +++++++++++++++++++ ibmswtpm2.changes | 6 ++++ ibmswtpm2.spec | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch diff --git a/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch b/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch new file mode 100644 index 0000000..95787c8 --- /dev/null +++ b/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch @@ -0,0 +1,29 @@ +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 + +--- + 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 +-- +2.42.0 + diff --git a/ibmswtpm2.changes b/ibmswtpm2.changes index 8c0f7f0..329590c 100644 --- a/ibmswtpm2.changes +++ b/ibmswtpm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 12 14:06:34 UTC 2023 - Otto Hollmann + +- Add support for OpenSSL 3.2.x + * Add ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch + ------------------------------------------------------------------- Fri Dec 1 15:34:44 UTC 2023 - Michal Suchanek diff --git a/ibmswtpm2.spec b/ibmswtpm2.spec index 9ee78de..4730e19 100644 --- a/ibmswtpm2.spec +++ b/ibmswtpm2.spec @@ -34,6 +34,8 @@ Source: https://github.com/kgoldman/ibmswtpm2/archive/rev%{download_vers Patch0: makefile.patch Patch1: ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch Patch2: ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch +# PATCH-FIX-UPSTREAM https://github.com/kgoldman/ibmswtpm2/pull/13 +Patch3: ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch BuildRequires: libopenssl-devel >= 1.0 %description