Hello community,

here is the log from the commit of package ibmswtpm2 for openSUSE:Factory 
checked in at 2020-08-20 22:33:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibmswtpm2 (Old)
 and      /work/SRC/openSUSE:Factory/.ibmswtpm2.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ibmswtpm2"

Thu Aug 20 22:33:15 2020 rev:8 rq:828221 version:1637

Changes:
--------
--- /work/SRC/openSUSE:Factory/ibmswtpm2/ibmswtpm2.changes      2020-01-12 
23:26:33.502864375 +0100
+++ /work/SRC/openSUSE:Factory/.ibmswtpm2.new.3399/ibmswtpm2.changes    
2020-08-20 22:33:36.476115437 +0200
@@ -1,0 +2,13 @@
+Mon Aug 17 16:59:04 UTC 2020 - Michal Suchanek <[email protected]>
+
+- Update to upstream version 1637
+  * fixes build of ibmtss 1.5.0
+  * Refresh makefile.patch
+  * Drop upstreamed patches
+    - ibmswtpm2-fix-uninitialized.patch
+    - ibmswtpm2-fix-empty-decrypt.patch
+  * Fix use of uninitialized value:
+    + ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch
+    + ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch
+
+-------------------------------------------------------------------

Old:
----
  ibmswtpm2-fix-empty-decrypt.patch
  ibmswtpm2-fix-uninitialized.patch
  ibmtpm1332.tar.gz

New:
----
  ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch
  ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch
  ibmtpm1637.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ibmswtpm2.spec ++++++
--- /var/tmp/diff_new_pack.Mbm5Xm/_old  2020-08-20 22:33:39.972117072 +0200
+++ /var/tmp/diff_new_pack.Mbm5Xm/_new  2020-08-20 22:33:39.976117074 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ibmswtpm2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,16 +25,16 @@
 %endif
 
 Name:           ibmswtpm2
-Version:        1332
+Version:        1637
 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
-Patch1:         makefile.patch
-Patch2:         ibmswtpm2-fix-uninitialized.patch
-Patch3:         ibmswtpm2-fix-empty-decrypt.patch
+Patch:          makefile.patch
+Patch1:         ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch
+Patch2:         ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch
 BuildRequires:  libopenssl-devel >= 1.0
 
 %description

++++++ ibmswtpm2-NVDynamic-Fix-use-of-uninitialized-value.patch ++++++
diff -ur ibmswtpm2-1637.orig/src/NVDynamic.c ibmswtpm2-1637/src/NVDynamic.c
--- ibmswtpm2-1637.orig/src/NVDynamic.c 2020-03-26 23:15:48.000000000 +0100
+++ ibmswtpm2-1637/src/NVDynamic.c      2020-08-20 16:37:09.481920068 +0200
@@ -122,7 +122,7 @@
            if(HandleGetType(nvHandle) == type)
                break;
        }
-    if(handle != NULL)
+    if(addr && (handle != NULL))
        *handle = nvHandle;
     return addr;
 }
Only in ibmswtpm2-1637/src: NVDynamic.c~
++++++ ibmswtpm2-TcpServerPosix-Fix-use-of-uninitialized-value.patch ++++++
>From 03efa66788ca4828392664c4f6123ad4f190c865 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <[email protected]>
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 <[email protected]>
---
 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(
                      {
                          UINT32 actHandle;
                          ok = ReadUINT32(s, &actHandle);
-                         WriteUINT32(s, _rpc__ACT_GetSignaled(actHandle));
+                         if(ok)
+                             WriteUINT32(s, _rpc__ACT_GetSignaled(actHandle));
                          break;
                      }
                  default:
-- 
2.26.2

++++++ ibmtpm1332.tar.gz -> ibmtpm1637.tar.gz ++++++
++++ 35205 lines of diff (skipped)

++++++ makefile.patch ++++++
--- /var/tmp/diff_new_pack.Mbm5Xm/_old  2020-08-20 22:33:40.240117198 +0200
+++ /var/tmp/diff_new_pack.Mbm5Xm/_new  2020-08-20 22:33:40.244117200 +0200
@@ -1,8 +1,6 @@
-Index: ibmswtpm2-1119/src/makefile
-===================================================================
---- ibmswtpm2-1119.orig/src/makefile   2018-01-16 12:46:54.412486803 +0100
-+++ ibmswtpm2-1119/src/makefile        2018-01-16 12:48:38.498125716 +0100
-@@ -41,17 +41,17 @@
+--- 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 @@
  
  CC = /usr/bin/gcc
  
@@ -12,15 +10,16 @@
 -      -Werror -Wsign-compare \
 -       -c -ggdb -O0                   \
 +      -Werror -Wsign-compare -Wno-unused-value 
-Wno-aggressive-loop-optimizations \
-+       -c -ggdb -O                    \
++       -c -ggdb                       \
        -DTPM_POSIX                     \
        -D_POSIX_                       \
-       -DTPM_NUVOTON                   \
-       -I../utils                      \
-       -I.
+       -DTPM_NUVOTON
+@@ -54,7 +54,7 @@
+ #     --coverage                      \
+ #     -fprofile-arcs -ftest-coverage
  
 -LNFLAGS = -ggdb                       \
 +LNFLAGS += -ggdb                      \
-       -DTPM_POSIX                     \
-       -DTPM_NUVOTON                   \
        -lcrypto                        \
+       -lpthread                       \
+       -lrt                            \


Reply via email to