Accepting request 1005719 from home:dirkmueller:Factory

- update to 1682:
  * tpm: Fix cast in BnSetBit.
  * tpm2: Fix size check in CryptSecretDecrypt
  * tpm: Port Windows code for OpenSSL 3.0
  * tpm: Update to openssl 3.0.2
  * tpm: Add command and handle tracing
  * tpm: Update for openssl 3.0.1
  * tpm: Add ECC encrypt and decrypt commands
  * Fix compilation on RISC-V
  * PlatformSvc: return error on control socket failure
  * main: set a return code if StartTcpServer fails
  * tpm: Add all updates to TPM specification 164.
- drop ibmswtpm2-fix-ppc32.patch (upstream) 
- makefile.patch: refresh

OBS-URL: https://build.opensuse.org/request/show/1005719
OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=26
This commit is contained in:
Michal Suchanek 2022-10-04 14:32:52 +00:00 committed by Git OBS Bridge
parent 1f7730e110
commit 7051adbd68
7 changed files with 39 additions and 37 deletions

View File

@ -11,13 +11,13 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
src/TcpServerPosix.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c
index 20fcb29352a2..5bcc47aaeac7 100644
--- a/src/TcpServerPosix.c
+++ b/src/TcpServerPosix.c
@@ -278,7 +278,8 @@ PlatformServer(
Index: ibmswtpm2-1682/src/TcpServerPosix.c
===================================================================
--- ibmswtpm2-1682.orig/src/TcpServerPosix.c
+++ ibmswtpm2-1682/src/TcpServerPosix.c
@@ -264,7 +264,8 @@ PlatformServer(
{
UINT32 actHandle;
uint32_t actHandle;
ok = ReadUINT32(s, &actHandle);
- WriteUINT32(s, _rpc__ACT_GetSignaled(actHandle));
+ if(ok)
@ -25,6 +25,3 @@ index 20fcb29352a2..5bcc47aaeac7 100644
break;
}
default:
--
2.26.2

View File

@ -1,13 +0,0 @@
diff -ur ibmswtpm2-1637.orig/src/LibSupport.h ibmswtpm2-1637/src/LibSupport.h
--- ibmswtpm2-1637.orig/src/LibSupport.h 2020-05-27 21:35:29.000000000 +0200
+++ ibmswtpm2-1637/src/LibSupport.h 2020-09-01 14:32:06.752690872 +0200
@@ -75,7 +75,8 @@
# define RADIX_BITS 64
# elif defined(__i386__) || defined(__i386) || defined(i386) \
|| defined(_WIN32) || defined(_M_IX86) \
- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__)
+ || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) \
+ || defined(__powerpc__)
# define RADIX_BITS 32
# else
# error Unable to determine RADIX_BITS from compiler environment

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sat Sep 24 08:23:47 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1682:
* tpm: Fix cast in BnSetBit.
* tpm2: Fix size check in CryptSecretDecrypt
* tpm: Port Windows code for OpenSSL 3.0
* tpm: Update to openssl 3.0.2
* tpm: Add command and handle tracing
* tpm: Update for openssl 3.0.1
* tpm: Add ECC encrypt and decrypt commands
* Fix compilation on RISC-V
* PlatformSvc: return error on control socket failure
* main: set a return code if StartTcpServer fails
* tpm: Add all updates to TPM specification 164.
- drop ibmswtpm2-fix-ppc32.patch (upstream)
- makefile.patch: refresh
-------------------------------------------------------------------
Tue Sep 1 12:34:41 UTC 2020 - Michal Suchanek <msuchanek@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package ibmswtpm2
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,25 +17,22 @@
%define suite ibmtss
%ifarch ppc ppc64 s390 s390x
%define extra_ccflags -DBIG_ENDIAN_TPM=1
%else
%define extra_ccflags ""
%endif
Name: ibmswtpm2
Version: 1637
Version: 1682
Release: 0
Summary: IBM's Software TPM 2.0
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://sourceforge.net/projects/ibmswtpm2
Source: https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm%{version}.tar.gz
Patch: makefile.patch
Patch0: makefile.patch
Patch1: ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch
Patch2: ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch
Patch3: ibmswtpm2-fix-ppc32.patch
BuildRequires: libopenssl-devel >= 1.0
%description

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd3a4c3f7724243bc9ebcd5c39bbf87b82c696d1c1241cb8e5883534f6e2e327
size 665378

3
ibmtpm1682.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f
size 639100

View File

@ -1,6 +1,8 @@
--- ibmswtpm2-1637.orig/src/makefile 2019-12-19 23:35:43.000000000 +0100
+++ ibmswtpm2-1637/src/makefile 2020-08-17 18:56:34.607550789 +0200
@@ -40,10 +40,10 @@
Index: ibmswtpm2-1682/src/makefile
===================================================================
--- ibmswtpm2-1682.orig/src/makefile
+++ ibmswtpm2-1682/src/makefile
@@ -40,11 +40,11 @@
CC = /usr/bin/gcc
@ -8,13 +10,14 @@
+CCFLAGS += -fno-strict-aliasing -fno-aggressive-loop-optimizations -Wno-unused-result \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
- -Werror -Wsign-compare \
- -c -ggdb -O0 \
+ -Werror -Wsign-compare -Wno-unused-value -Wno-aggressive-loop-optimizations \
+ -c -ggdb \
-Wno-deprecated-declarations \
- -c -ggdb -O0 \
+ -c -ggdb \
-DTPM_POSIX \
-D_POSIX_ \
-DTPM_NUVOTON
@@ -54,7 +54,7 @@
@@ -55,7 +55,7 @@ CCFLAGS = -Wall \
# --coverage \
# -fprofile-arcs -ftest-coverage