Sync from SUSE:SLFO:Main ibmswtpm2 revision 1ddb2892615e3c417b84c2f047956e2d

ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch

@@ -1,29 +0,0 @@
-From beea0f97b3c95ec69f3e269df1af87eb2cdd3c46 Mon Sep 17 00:00:00 2001
-From: Otto Hollmann <otto@hollmann.cz>
-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
-

ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch

@@ -1,34 +0,0 @@
-From 8c160d2c7a17eb842fae82de3638b834976f2aa2 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Thu, 20 Aug 2020 16:42:54 +0200
-Subject: [PATCH] NVDynamic: Fix use of uninitialized value.
-
-There is a theoretical possibility that the cycle in NvNextByType does
-not run at all because NvNext fails immediately and never sets nvHandle.
-
-The cycle only runs and nvHandle is set on non-zero addr, and in that
-case addr remains non-zero when breaking out of the cycle.
-
-Use nvHandle only when addr is non-zero.
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
----
- src/NVDynamic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/NVDynamic.c b/src/NVDynamic.c
-index 8ede9e4..535ea03 100644
---- a/src/NVDynamic.c
-+++ b/src/NVDynamic.c
-@@ -122,7 +122,7 @@ NvNextByType(
- 	    if(HandleGetType(nvHandle) == type)
- 		break;
- 	}
--    if(handle != NULL)
-+    if(addr && (handle != NULL))
- 	*handle = nvHandle;
-     return addr;
- }
--- 
-2.42.0
-

ibmswtpm2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Apr  9 15:40:49 UTC 2024 - Michal Suchanek <msuchanek@suse.com>
+
+- Package LICENSE file.
+
+-------------------------------------------------------------------
+Thu Apr  4 08:55:49 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
+
+- Update to version 183-2024-03-27
+  * tpm: Updates to rev 180
+- Drop obsolete patches
+  * Drop ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch - addressed upstream
+  * Drop ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch - merged upstream
+
 -------------------------------------------------------------------
 Tue Dec 12 14:06:34 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
 

ibmswtpm2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ibmswtpm2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 %define suite ibmtss
-%define download_version 164-2020-192.2
+%define download_version 183-2024-03-27
 %ifarch    ppc ppc64 s390 s390x
 %define extra_ccflags -DBIG_ENDIAN_TPM=1
 %else
@@ -33,9 +33,6 @@ URL:            https://github.com/kgoldman/ibmswtpm2
 Source:         https://github.com/kgoldman/ibmswtpm2/archive/rev%{download_version}.tar.gz#/%{name}-%{download_version}.tar.gz
 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
@@ -61,6 +58,7 @@ cd src
 install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} tpm_server
 
 %files
+%license LICENSE
 %dir %{_libexecdir}/%{suite}
 %{_libexecdir}/%{suite}/tpm_server
 %doc ibmtpm.doc