SLFO-pool/ibmtss
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main ibmtss revision ecaa4bd96bb52e475566bf96d06c79bb

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-29 09:34:02 +01:00
parent dbd3f5c181
commit 917fd09777
7 changed files with 205 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ibmtss-2.4.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch
View File

@ -1,10 +1,11 @@
From 005064b673d937a305427eb9fa4d549f93f6090a Mon Sep 17 00:00:00 2001
From 6d5c05a167d847ac21315aa4a1c171715cd816af Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 17 Aug 2020 18:21:51 +0200
Subject: [PATCH] configure.ac: Do not disable optimization for debug build.
Subject: [PATCH] configure.ac: Do not override optimization for debug build.
This conflicts with FORTIFY_SOURCE and generates completely different
assembly for debug and procuction.
-O0 conflicts with FORTIFY_SOURCE and generates completely different
assembly for debug and production. If user passes in C flags let them
override the suggested -O0.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
@ -12,17 +13,18 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 30e9254b339a..883c4bb84efa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_CHECK_FUNCS([gethostbyname memmove memset socket strerror strtoul])
@@ -67,7 +67,7 @@ AC_CHECK_FUNCS([gethostbyname memmove memset socket strerror strtoul])
# Replace autotools default optimization
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug], [Build a TSS library used for debugging]))
- AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -O0"])
+ AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -Wextra -Werror"])
+ AS_IF([test "$enable_debug" = "yes"], [CFLAGS="-O0 -g -ggdb $USER_CFLAGS -Wextra -Werror"])
# Linux requires -DTPM_POSIX
case $host_os in
--
2.26.2
2.46.1

12
ibmtss.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Oct 21 09:23:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
- Update to 2.4.0:
* Add support for EK intermediate certificates
* Support different IMA log digest algorithms
* add regtest
* html documentation
- Refresh ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch
- tss-Commit-changelog-and-autotools-version-update.patch
- utils-Update-.so-version-to-2.4.patch
-------------------------------------------------------------------
Thu Nov 30 14:36:22 UTC 2023 - Pedro Monreal <pmonreal@suse.com>

15
ibmtss.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ibmtss
#
# 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
@ -21,15 +21,17 @@
%define libpkgname %{libname}%{libversion}
Name: ibmtss
Version: 2.1.1
Version: 2.4.0
Release: 0
Summary: IBM's TPM 2.0 TSS
License: BSD-3-Clause
Group: Productivity/Security
URL: https://sourceforge.net/projects/ibmtpm20tss
Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz
URL: https://github.com/kgoldman/ibmtss
Source: https://github.com/kgoldman/ibmtss/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: 90-tpm-ibmtss.rules
Patch1: ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch
Patch2: tss-Commit-changelog-and-autotools-version-update.patch
Patch3: utils-Update-.so-version-to-2.4.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: ibmswtpm2
@ -71,8 +73,7 @@ Requires: %{name} = %{version}
Includes IBM's TPM 2.0 TSS C header files
%prep
%setup -q -c
%autopatch -p1
%autosetup -p1
%build
autoreconf -ifv
@ -107,7 +108,7 @@ find %{buildroot} -name .cvsignore | xargs rm -v
%files
%license LICENSE
%doc ibmtss.docx
%doc ibmtss.html ibmtss.docx README
%{_bindir}/tss*
%{_mandir}/man1/tss*.1%{?ext_man}

BIN
ibmtss2.1.1.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

69
tss-Commit-changelog-and-autotools-version-update.patch Normal file
View File

@ -0,0 +1,69 @@
From 851bdd1ba8f5bda7f739161ec8db27f3df383751 Mon Sep 17 00:00:00 2001
From: Ken Goldman <kgold@linux.ibm.com>
Date: Mon, 14 Oct 2024 14:05:24 -0400
Subject: [PATCH] tss: Commit changelog and autotools version update
Signed-off-by: Ken Goldman <kgold@linux.ibm.com>
---
ChangeLog | 12 ++++++++++++
configure.ac | 6 +++---
tss2.spec | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b2433926fa3e..024eda389b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+----------------
+Changes in 2.4.0
+----------------
+
+Add support for SHA-256, SHA-384, and SHA-512 IMA event logs. Add
+local command line support and update the API to support
+attestation. Add known value test to event regression tests. Change
+the -ty switch to -ealg for event log angorithms.
+
+Add support for EK intermediate certificates in the IWG standard
+locations.
+
----------------
Changes in 2.3 1
----------------
diff --git a/configure.ac b/configure.ac
index 081bc19528e0..30e9254b339a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,13 @@
# Set package release version"
# After committing set git tag version.
-AC_INIT(ibmtss, 2.3.1, kgold@linux.ibm.com)
+AC_INIT(ibmtss, 2.4.0, kgold@linux.ibm.com)
AC_PREREQ([2.63])
# Convert major.minor.micro to libtool versioning (current-revision-age)
TSSLIB_VER_MAJOR=2
-TSSLIB_VER_MINOR=3
-TSSLIB_VER_MICRO=1
+TSSLIB_VER_MINOR=4
+TSSLIB_VER_MICRO=0
TSSLIB_VERSION_INFO=`expr $TSSLIB_VER_MAJOR + $TSSLIB_VER_MINOR`:$TSSLIB_VER_MICRO:$TSSLIB_VER_MINOR
AC_SUBST([TSSLIB_VERSION_INFO], [$TSSLIB_VERSION_INFO])
diff --git a/tss2.spec b/tss2.spec
index e32583d69b11..68c2047f96f5 100644
--- a/tss2.spec
+++ b/tss2.spec
@@ -7,7 +7,7 @@
Name: tss2
# this is the release of the TSS library
-Version: 2.3.2
+Version: 2.4.0
# this is the release of the fedora package, goes back to 1 when version changes
Release: 1%{?dist}
Epoch: 1
--
2.46.1

104
utils-Update-.so-version-to-2.4.patch Normal file
View File

@ -0,0 +1,104 @@
From 7cd742915823c0e18439c207018292c46deef513 Mon Sep 17 00:00:00 2001
From: Ken Goldman <kgold@linux.ibm.com>
Date: Thu, 17 Oct 2024 16:41:36 -0400
Subject: [PATCH] utils: Update .so version to 2.4
Signed-off-by: Ken Goldman <kgold@linux.ibm.com>
---
utils/makefile.nofile | 4 ++--
utils/makefiletpm12 | 4 ++--
utils/makefiletpm20 | 4 ++--
utils/makefiletpmc | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/utils/makefile.nofile b/utils/makefile.nofile
index 860ab6f019db..f67581cd9f8b 100644
--- a/utils/makefile.nofile
+++ b/utils/makefile.nofile
@@ -90,7 +90,7 @@ LNAFLAGS += -pie -Wl,-z,now -Wl,-rpath,.
LNALIBS += -libmtssutils -libmtssmin
# versioned shared library
-LIBTSSVERSIONED=libibmtssmin.so.2.1
+LIBTSSVERSIONED=libibmtssmin.so.2.4
# soname field of the shared library
# which will be made symbolic link to the versioned shared library
@@ -109,7 +109,7 @@ endif
# TSS utilities shared library
-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.1
+LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4
LIBTSSUTILSSONAME=libibmtssutils.so.2
LIBTSSUTILS=libibmtssutils.so
diff --git a/utils/makefiletpm12 b/utils/makefiletpm12
index 9a115cbd3003..cae10cbec301 100644
--- a/utils/makefiletpm12
+++ b/utils/makefiletpm12
@@ -103,7 +103,7 @@ LNALIBS += -libmtss
# shared library
# versioned shared library
-LIBTSSVERSIONED=libibmtss.so.2.1
+LIBTSSVERSIONED=libibmtss.so.2.4
# soname field of the shared library
# which will be made symbolic link to the versioned shared library
@@ -122,7 +122,7 @@ endif
# TSS utilities shared library
-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.1
+LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4
LIBTSSUTILSSONAME=libibmtssutils.so.2
LIBTSSUTILS=libibmtssutils.so
diff --git a/utils/makefiletpm20 b/utils/makefiletpm20
index f6e55a9e822f..88e9343b76e8 100644
--- a/utils/makefiletpm20
+++ b/utils/makefiletpm20
@@ -140,7 +140,7 @@ LNALIBS += -libmtssutils -libmtss
# shared library
# versioned shared library
-LIBTSSVERSIONED=libibmtss.so.2.3
+LIBTSSVERSIONED=libibmtss.so.2.4
# soname field of the shared library
# which will be made symbolic link to the versioned shared library
@@ -159,7 +159,7 @@ endif
# TSS utilities shared library
-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.3
+LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4
LIBTSSUTILSSONAME=libibmtssutils.so.2
LIBTSSUTILS=libibmtssutils.so
diff --git a/utils/makefiletpmc b/utils/makefiletpmc
index d2558f33b16b..00748b174bd4 100644
--- a/utils/makefiletpmc
+++ b/utils/makefiletpmc
@@ -108,7 +108,7 @@ LNALIBS += -libmtssutils -libmtss
# shared library
# versioned shared library
-LIBTSSVERSIONED=libibmtss.so.2.3
+LIBTSSVERSIONED=libibmtss.so.2.4
# soname field of the shared library
# which will be made symbolic link to the versioned shared library
@@ -127,7 +127,7 @@ endif
# TSS utilities shared library
-LIBTSSUTILSVERSIONED=libibmtssutils.so.2.3
+LIBTSSUTILSVERSIONED=libibmtssutils.so.2.4
LIBTSSUTILSSONAME=libibmtssutils.so.2
LIBTSSUTILS=libibmtssutils.so
--
2.46.1