Sync from SUSE:SLFO:1.1 libtpms revision 4039469a4134c42f5e999d29f497c743

libtpms.changes

@@ -1,41 +1,9 @@
--------------------------------------------------------------------
-Fri Dec  6 09:03:46 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use gcc/g++-13 on Leap to fix the following failure:
-  "tpm2_setprofile.c:49:24: error: initializer element is not constant"
-
--------------------------------------------------------------------
-Wed Dec  4 10:30:30 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
-
-- Add tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch
-- Update to 0.10.0:
-  * tpm2: Support for profiles: default-v1 & custom
-  * tpm2: Add new API call TPMLIB_SetProfile to enable user to set a
-    profile
-  * tpm2: Extende TPMLIB_GetInfo to return profiles-related info
-  * tpm2: Implemented crypto tests and restrictions on crypto related
-    to FIPS-140-3; can be enabled with profiles
-  * tpm2: Enable Camellia-192 and AES-192
-  * tpm2: Implement TPMLIB_WasManufactured API call
-  * tpm2: Fixes for issues detected by static analyzers
-  * tpm2: Use OpenSSL-based KDFe implementation if possible
-  * tpm2: Update to TPM 2 spec rev 183 (many changes)
-  * tpm2: Better support for OpenSSL 3.x
-  * tpm2: Use Carmichael function for RSA priv. exponent D (>= 2048
-    bits)
-  * tpm2: Fixes for CVE-2023-1017 and CVE-2023-1018
-  * tpm2: Fix of SignedCompareB().
-- NOTE: This fix may result in backwards compatibility issues with PCR
-  policies used by TPM2_PolicyCounterTimer and TPM2_PolicyNV when
-  upgrading from v0.9 to v0.10.
-
 -------------------------------------------------------------------
 Mon Mar  6 16:32:02 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>
 
 - Update to 0.9.6:
   * CVE-2023-1018: tpm2: Fixed out of bounds read in CryptParameterDecryption (bsc#1206023)
   * CVE-2023-1017: tpm2: Fixed out of bounds write in CryptParameterDecryption (bsc#1206022)
-- 0001-tpm2-Check-size-of-buffer-before-accessing-it-CVE-20.patch: upstreamed
 
 -------------------------------------------------------------------
 Sat Dec  3 09:56:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
@@ -77,10 +45,6 @@ Thu Dec  9 19:57:51 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
   * tpm2: bug fixes
 - Drop upstream fixed libtpms-CVE-2021-3746.patch
 - Fixed CVE-2021-3623 (bsc#1187767)
-- Used in SLE:
-  0001-tpm2-Reset-TPM2B-buffer-sizes-after-test-fails-for-v.patch
-  0002-tpm2-Add-maxSize-parameter-to-TPM2B_Marshal-for-sani.patch
-  0003-tpm2-Restore-original-value-if-unmarsalled-value-was.patch
 
 -------------------------------------------------------------------
 Tue Aug 31 16:36:31 UTC 2021 - pgajdos@suse.com

libtpms.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libtpms
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,23 +18,17 @@
 
 %define lname libtpms0
 Name:           libtpms
-Version:        0.10.0
+Version:        0.9.6
 Release:        0
 Summary:        Library providing Trusted Platform Module (TPM) functionality
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/stefanberger/libtpms
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch gh#stefanberger/libtpms#476
-Patch0:         tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
-%if 0%{is_opensuse} && 0%{?suse_version} < 1599
-BuildRequires:  gcc13-c++
-%else
 BuildRequires:  gcc-c++
-%endif
 BuildRequires:  libtool
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  openssl-devel
@@ -67,10 +61,6 @@ Libtpms header files and documentation.
 
 %build
 autoreconf -fiv
-%if 0%{?suse_version} < 1599
-export CC=gcc-13
-export CXX=g++-13
-%endif
 %configure         \
     --with-tpm2    \
     --with-openssl \

tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch

@@ -1,27 +0,0 @@
-From 806141196296150c03e5d826ab7e6c3602f41b98 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.ibm.com>
-Date: Fri, 15 Nov 2024 08:07:23 -0500
-Subject: [PATCH] tpm2: Add padding to OBJECT for 32bit targets
-
-The nvram_offsets test fails on 32bit targets due to an unexpected size
-of an OBJECT. This was due to missing padding.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- src/tpm2/Global.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/tpm2/Global.h b/src/tpm2/Global.h
-index 910b940e3..c4d7176f3 100644
---- a/src/tpm2/Global.h
-+++ b/src/tpm2/Global.h
-@@ -265,6 +265,9 @@ typedef struct OBJECT
-     // this field carries additional metadata
-     // needed to derive the proof value for
-     // the object.
-+#if __LONG_WIDTH__ == 32
-+    UINT8               _pad1[4]; /* 32 bit targets need padding */
-+#endif
- 
-     // libtpms added: SEED_COMPAT_LEVEL to use for deriving child keys
-     SEED_COMPAT_LEVEL   seedCompatLevel;