From 9330ec33aed8ef940ed3aab678864f348590869ae296a94c903b5c76a71158f6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 4 Apr 2024 09:14:46 +0000 Subject: [PATCH] Accepting request 1164530 from home:michals - Update to version 183-2024-03-27 * Drop ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch - addressed upstream * Drop ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch - addressed upstream * Drop ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch - merged upstream OBS-URL: https://build.opensuse.org/request/show/1164530 OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=34 --- ibmswtpm2-164-2020-192.2.tar.gz | 3 -- ibmswtpm2-183-2024-03-27.tar.gz | 3 ++ ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch | 29 ---------------- ...namic-Fix-use-of-uninitialized-value.patch | 34 ------------------- ...Posix-Fix-use-of-uninitialized-value.patch | 30 ---------------- ibmswtpm2.changes | 8 +++++ ibmswtpm2.spec | 8 ++--- 7 files changed, 13 insertions(+), 102 deletions(-) delete mode 100644 ibmswtpm2-164-2020-192.2.tar.gz create mode 100644 ibmswtpm2-183-2024-03-27.tar.gz delete mode 100644 ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch delete mode 100644 ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch delete mode 100644 ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch diff --git a/ibmswtpm2-164-2020-192.2.tar.gz b/ibmswtpm2-164-2020-192.2.tar.gz deleted file mode 100644 index 43aa0e1..0000000 --- a/ibmswtpm2-164-2020-192.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07352afe88f838c4c1b0a5adf41b6742b7724639b1474ea91c75292d60740491 -size 638913 diff --git a/ibmswtpm2-183-2024-03-27.tar.gz b/ibmswtpm2-183-2024-03-27.tar.gz new file mode 100644 index 0000000..b3b58c3 --- /dev/null +++ b/ibmswtpm2-183-2024-03-27.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d4f7f9025c24f1f3a5f76863591b05c4bdac6a1acbbeafd798c6504241fde71 +size 712078 diff --git a/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch b/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch deleted file mode 100644 index 95787c8..0000000 --- a/ibmswtpm2-Add-support-for-OpenSSL-3.2.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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-NVDynamic-Fix-use-of-uninitialized-value.patch b/ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch deleted file mode 100644 index 15cb01b..0000000 --- a/ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8c160d2c7a17eb842fae82de3638b834976f2aa2 Mon Sep 17 00:00:00 2001 -From: Michal Suchanek -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 ---- - 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 - diff --git a/ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch b/ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch deleted file mode 100644 index 864a07a..0000000 --- a/ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1f64c0bf768f05bfb1980fa354d99a29b26ce99a Mon Sep 17 00:00:00 2001 -From: Michal Suchanek -Date: Mon, 17 Aug 2020 19:28:51 +0200 -Subject: [PATCH] TcpServerPosix: Fix use of uninitialized value. - -ReadUINT32 does not modify the output when it fails. Do not use the -output in that case. - -Signed-off-by: Michal Suchanek ---- - src/TcpServerPosix.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c -index ca9e2fd..b776448 100644 ---- a/src/TcpServerPosix.c -+++ b/src/TcpServerPosix.c -@@ -264,7 +264,8 @@ PlatformServer( - { - uint32_t actHandle; - ok = ReadUINT32(s, &actHandle); -- WriteUINT32(s, _rpc__ACT_GetSignaled(actHandle)); -+ if(ok) -+ WriteUINT32(s, _rpc__ACT_GetSignaled(actHandle)); - break; - } - default: --- -2.42.0 - diff --git a/ibmswtpm2.changes b/ibmswtpm2.changes index 329590c..bec6fd6 100644 --- a/ibmswtpm2.changes +++ b/ibmswtpm2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 4 08:55:49 UTC 2024 - Michal Suchanek + +- Update to version 183-2024-03-27 + * Drop ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch - addressed upstream + * 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 diff --git a/ibmswtpm2.spec b/ibmswtpm2.spec index 4730e19..66245a5 100644 --- a/ibmswtpm2.spec +++ b/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 @@ -32,10 +32,6 @@ Group: Development/Tools/Other 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