Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package swtpm for openSUSE:Factory checked
in at 2021-09-26 21:48:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swtpm (Old)
and /work/SRC/openSUSE:Factory/.swtpm.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swtpm"
Sun Sep 26 21:48:17 2021 rev:7 rq:920852 version:0.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/swtpm/swtpm.changes 2021-08-19
13:06:44.679975636 +0200
+++ /work/SRC/openSUSE:Factory/.swtpm.new.1899/swtpm.changes 2021-09-26
21:48:52.714791887 +0200
@@ -1,0 +2,17 @@
+Wed Sep 22 09:33:29 UTC 2021 - Marcus Meissner <meiss...@suse.com>
+
+- Update to version 0.6.1:
+ - swtpm:
+ - Clear keys from stack and heap
+ - swtpm-localca:
+ - Add missing else branch for pkcs11 and PIN
+ - swtpm_setup:
+ - Initialize Gerror and free it
+ - Replace '\\s' in regex with [[:space:]] to fix cygwin
+ - tests:
+ - Kill tpm2-abrmd with SIGKILL rather SIGTERM
+ - build-sys:
+ - Use -DOPENSSL_SUPPRESS_DEPRECATED to suppress deprecation warnings (OSSL
3)
+ - Enable configuring with CFLAGS and passing additional CFLAGS on build
+
+-------------------------------------------------------------------
Old:
----
swtpm-0.6.0.tar.gz
New:
----
swtpm-0.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swtpm.spec ++++++
--- /var/tmp/diff_new_pack.Vkqam7/_old 2021-09-26 21:48:53.218792448 +0200
+++ /var/tmp/diff_new_pack.Vkqam7/_new 2021-09-26 21:48:53.222792453 +0200
@@ -24,7 +24,7 @@
%define modulename2 swtpm_svirt
%define modulename3 swtpmcuse
Name: swtpm
-Version: 0.6.0
+Version: 0.6.1
Release: 0
Summary: Software TPM emulator
License: BSD-3-Clause
++++++ swtpm-0.6.0.tar.gz -> swtpm-0.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/CHANGES new/swtpm-0.6.1/CHANGES
--- old/swtpm-0.6.0/CHANGES 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/CHANGES 2021-09-20 13:26:56.000000000 +0200
@@ -1,5 +1,19 @@
CHANGES - changes for swtpm
+version 0.6.1:
+ - swtpm:
+ - Clear keys from stack and heap
+ - swtpm-localca:
+ - Add missing else branch for pkcs11 and PIN
+ - swtpm_setup:
+ - Initialize Gerror and free it
+ - Replace '\\s' in regex with [[:space:]] to fix cygwin
+ - tests:
+ - Kill tpm2-abrmd with SIGKILL rather SIGTERM
+ - build-sys:
+ - Use -DOPENSSL_SUPPRESS_DEPRECATED to suppress deprecation warnings (OSSL
3)
+ - Enable configuring with CFLAGS and passing additional CFLAGS on build
+
version 0.6.0:
- swtpm:
- Fix --print-capabilities for 'swtpm chardev'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/configure.ac new/swtpm-0.6.1/configure.ac
--- old/swtpm-0.6.0/configure.ac 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/configure.ac 2021-09-20 13:26:56.000000000 +0200
@@ -23,10 +23,10 @@
# This file is derived from tpm-tool's configure.in.
#
-AC_INIT(swtpm, 0.6.0)
-AC_PREREQ(2.12)
+AC_INIT([swtpm], [0.6.1])
+AC_PREREQ([2.69])
AC_CONFIG_SRCDIR(Makefile.am)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
SWTPM_VER_MAJOR=`echo $PACKAGE_VERSION | cut -d "." -f1`
SWTPM_VER_MINOR=`echo $PACKAGE_VERSION | cut -d "." -f2`
@@ -50,7 +50,7 @@
DEBUG=""
AC_MSG_CHECKING([for debug-enabled build])
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [create a debug build]),
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[create a debug build]),
[if test "$enableval" = "yes"; then
DEBUG="yes"
AC_MSG_RESULT([yes])
@@ -73,12 +73,10 @@
CFLAGS="$CFLAGS -O0 -g -DDEBUG"
fi
-AC_HEADER_STDC
AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
AC_PROG_CC
AC_PROG_INSTALL
@@ -153,6 +151,8 @@
AC_MSG_RESULT([Building with openssl crypto library])
LIBCRYPTO_LIBS=$(pkg-config --libs libcrypto)
AC_SUBST([LIBCRYPTO_LIBS])
+ LIBCRYPTO_EXTRA_CFLAGS="-DOPENSSL_SUPPRESS_DEPRECATED"
+ AC_SUBST([LIBCRYPTO_EXTRA_CFLAGS])
;;
esac
@@ -199,8 +199,7 @@
AC_MSG_CHECKING([for whether to build with CUSE interface])
AC_ARG_WITH([cuse],
- AC_HELP_STRING([--with-cuse],
- [build with CUSE interface]),
+ AS_HELP_STRING([--with-cuse],[build with CUSE interface]),
[],
[with_cuse=check]
)
@@ -276,8 +275,7 @@
AC_MSG_RESULT($with_cuse)
AC_ARG_WITH([gnutls],
- AC_HELP_STRING([--with-gnutls],
- [build with gnutls library]),
+ AS_HELP_STRING([--with-gnutls],[build with gnutls library]),
[],
[with_gnutls=check]
)
@@ -431,15 +429,13 @@
fi
AC_ARG_WITH([tss-user],
- AC_HELP_STRING([--with-tss-user=TSS_USER],
- [The tss user to use]),
+ AS_HELP_STRING([--with-tss-user=TSS_USER],[The tss user to use]),
[TSS_USER="$withval"],
[TSS_USER="tss"]
)
AC_ARG_WITH([tss-group],
- AC_HELP_STRING([--with-tss-group=TSS_GROUP],
- [The tss group to use]),
+ AS_HELP_STRING([--with-tss-group=TSS_GROUP],[The tss group to
use]),
[TSS_GROUP="$withval"],
[TSS_GROUP="tss"]
)
@@ -518,8 +514,7 @@
AC_MSG_CHECKING([for whether to build with seccomp profile])
AC_ARG_WITH([seccomp],
- AC_HELP_STRING([--with-seccomp],
- [build with seccomp profile]),
+ AS_HELP_STRING([--with-seccomp],[build with seccomp profile]),
AC_MSG_RESULT([$with_seccomp]),
[with_seccomp=$with_seccomp_default]
AC_MSG_RESULT([$with_seccomp])
@@ -539,10 +534,10 @@
[whether to build in seccomp profile (Linux only)])
fi
-AM_CFLAGS="$CFLAGS"
-AM_LDFLAGS="$LDFLAGS"
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_LDFLAGS])
+MY_CFLAGS="$CFLAGS"
+MY_LDFLAGS="$LDFLAGS"
+AC_SUBST([MY_CFLAGS])
+AC_SUBST([MY_LDFLAGS])
AC_CONFIG_FILES([Makefile \
debian/swtpm-tools.postinst \
@@ -584,10 +579,10 @@
echo "Version to build : $PACKAGE_VERSION"
echo "Crypto library : $cryptolib"
echo
-echo " AM_CFLAGS = $AM_CFLAGS"
+echo " MY_CFLAGS = $MY_CFLAGS"
echo " HARDENING_CFLAGS = $HARDENING_CFLAGS"
echo "HARDENING_LDFLAGS = $HARDENING_LDFLAGS"
-echo " AM_LDFLAGS = $AM_LDFLAGS"
+echo " MY_LDFLAGS = $MY_LDFLAGS"
echo " LIBSECCOMP_LIBS = $LIBSECCOMP_LIBS"
echo " JSON_GLIB_CFLAGS = $JSON_GLIB_CFLAGS"
echo " JSON_GLIB_LIBS = $JSON_GLIB_LIBS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/debian/changelog
new/swtpm-0.6.1/debian/changelog
--- old/swtpm-0.6.0/debian/changelog 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/debian/changelog 2021-09-20 13:26:56.000000000 +0200
@@ -1,3 +1,9 @@
+swtpm (0.6.1) RELEASED; urgency=low
+
+ * Stable relase
+
+ -- Stefan Berger <stef...@linux.ibm.com> Mon, 20 Sep 2021 09:00:00 -0500
+
swtpm (0.6.0) RELEASED; urgency=medium
* Stable release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/samples/swtpm_localca.c
new/swtpm-0.6.1/samples/swtpm_localca.c
--- old/swtpm-0.6.0/samples/swtpm_localca.c 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/samples/swtpm_localca.c 2021-09-20 13:26:56.000000000
+0200
@@ -807,7 +807,15 @@
if (signkey_password != NULL) {
swtpm_cert_env = g_environ_setenv(swtpm_cert_env,
"SWTPM_PKCS11_PIN",
g_strdup(signkey_password), TRUE);
- logit(gl_LOGFILE, "CA uses a PKCS#11 key; using
SWTPM_PKCSS1_PIN\n");
+ logit(gl_LOGFILE, "CA uses a PKCS#11 key; using
SWTPM_PKCS11_PIN\n");
+ } else {
+ g_autofree gchar *swtpm_pkcs11_pin = NULL;
+
+ swtpm_pkcs11_pin = get_config_value(config_file_lines,
+ "SWTPM_PKCS11_PIN",
"swtpm-tpmca");
+ swtpm_cert_env = g_environ_setenv(swtpm_cert_env,
+ "SWTPM_PKCS11_PIN",
swtpm_pkcs11_pin, TRUE);
+ logit(gl_LOGFILE, "CA uses a PKCS#11 key; using
SWTPM_PKCS11_PIN\n");
}
ret = get_config_envvars(config_file_lines, &swtpm_cert_env);
if (ret != 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/Makefile.am
new/swtpm-0.6.1/src/swtpm/Makefile.am
--- old/swtpm-0.6.0/src/swtpm/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,8 +4,8 @@
# For the license, see the COPYING file in the root directory.
#
-AM_CFLAGS = @AM_CFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
noinst_HEADERS = \
capabilities.h \
@@ -64,13 +64,15 @@
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/swtpm \
- $(AM_CFLAGS) \
+ $(MY_CFLAGS) \
+ $(CFLAGS) \
$(HARDENING_CFLAGS) \
$(GLIB_CFLAGS) \
- $(LIBSECCOMP_CFLAGS)
+ $(LIBSECCOMP_CFLAGS) \
+ $(LIBCRYPTO_EXTRA_CFLAGS)
libswtpm_libtpms_la_LDFLAGS = \
- $(AM_LDFLAGS) \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
libswtpm_libtpms_la_LIBADD = \
@@ -100,18 +102,18 @@
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/swtpm \
- $(AM_CFLAGS) \
+ $(MY_CFLAGS) \
$(HARDENING_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBFUSE_CFLAGS) \
-DHAVE_SWTPM_CUSE_MAIN
swtpm_LDFLAGS = \
- $(AM_LDFLAGS) \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
swtpm_LDADD = \
- -L$(PWD)/.libs -lswtpm_libtpms \
+ libswtpm_libtpms.la \
$(LIBFUSE_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
@@ -125,17 +127,17 @@
swtpm_cuse_CFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include/swtpm \
- $(AM_CFLAGS) \
+ $(MY_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBFUSE_CFLAGS) \
$(HARDENING_CFLAGS)
swtpm_cuse_LDFLAGS = \
- $(AM_LDFLAGS) \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
swtpm_cuse_LDADD = \
- -L$(PWD)/.libs -lswtpm_libtpms \
+ libswtpm_libtpms.la \
$(LIBFUSE_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/common.c
new/swtpm-0.6.1/src/swtpm/common.c
--- old/swtpm-0.6.0/src/swtpm/common.c 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/src/swtpm/common.c 2021-09-20 13:26:56.000000000 +0200
@@ -463,17 +463,25 @@
unsigned char key[256/8];
size_t maxkeylen = sizeof(key);
size_t keylen;
+ int ret = 0;
if (!options)
return 0;
- if (parse_key_options(options, key, maxkeylen, &keylen, &encmode) < 0)
- return -1;
-
- if (SWTPM_NVRAM_Set_FileKey(key, keylen, encmode) != TPM_SUCCESS)
- return -1;
-
- return 0;
+ if (parse_key_options(options, key, maxkeylen, &keylen, &encmode) < 0) {
+ ret = -1;
+ goto error;
+ }
+
+ if (SWTPM_NVRAM_Set_FileKey(key, keylen, encmode) != TPM_SUCCESS) {
+ ret = -1;
+ goto error;
+ }
+
+error:
+ /* Wipe to ensure we don't leave a key on the stack */
+ memset(key, 0, maxkeylen);
+ return ret;
}
/*
@@ -491,17 +499,25 @@
unsigned char key[256/8];
size_t maxkeylen = sizeof(key);
size_t keylen;
+ int ret = 0;
if (!options)
return 0;
- if (parse_key_options(options, key, maxkeylen, &keylen, &encmode) < 0)
- return -1;
-
- if (SWTPM_NVRAM_Set_MigrationKey(key, keylen, encmode) != TPM_SUCCESS)
- return -1;
-
- return 0;
+ if (parse_key_options(options, key, maxkeylen, &keylen, &encmode) < 0) {
+ ret = -1;
+ goto error;
+ }
+
+ if (SWTPM_NVRAM_Set_MigrationKey(key, keylen, encmode) != TPM_SUCCESS) {
+ ret = -1;
+ goto error;
+ }
+
+error:
+ /* Wipe to ensure we don't leave a key on the stack */
+ memset(key, 0, maxkeylen);
+ return ret;
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/cuse_tpm.c
new/swtpm-0.6.1/src/swtpm/cuse_tpm.c
--- old/swtpm-0.6.0/src/swtpm/cuse_tpm.c 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm/cuse_tpm.c 2021-09-20 13:26:56.000000000
+0200
@@ -1378,6 +1378,7 @@
pidfile_remove();
log_global_free();
tpmstate_global_free();
+ SWTPM_NVRAM_Shutdown();
}
static const struct cuse_lowlevel_ops clops = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/swtpm.c
new/swtpm-0.6.1/src/swtpm/swtpm.c
--- old/swtpm-0.6.0/src/swtpm/swtpm.c 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/src/swtpm/swtpm.c 2021-09-20 13:26:56.000000000 +0200
@@ -197,6 +197,7 @@
server_free(server);
log_global_free();
tpmstate_global_free();
+ SWTPM_NVRAM_Shutdown();
}
int swtpm_main(int argc, char **argv, const char *prgname, const char *iface)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/swtpm_chardev.c
new/swtpm-0.6.1/src/swtpm/swtpm_chardev.c
--- old/swtpm-0.6.0/src/swtpm/swtpm_chardev.c 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm/swtpm_chardev.c 2021-09-20 13:26:56.000000000
+0200
@@ -218,6 +218,7 @@
ctrlchannel_free(cc);
log_global_free();
tpmstate_global_free();
+ SWTPM_NVRAM_Shutdown();
}
#ifdef WITH_VTPM_PROXY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/swtpm_nvfile.c
new/swtpm-0.6.1/src/swtpm/swtpm_nvfile.c
--- old/swtpm-0.6.0/src/swtpm/swtpm_nvfile.c 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm/swtpm_nvfile.c 2021-09-20 13:26:56.000000000
+0200
@@ -279,6 +279,12 @@
return rc;
}
+void SWTPM_NVRAM_Shutdown(void)
+{
+ memset(&filekey, 0, sizeof(filekey));
+ memset(&migrationkey, 0, sizeof(migrationkey));
+}
+
/* Load 'data' of 'length' from the 'name'.
'data' must be freed after use.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm/swtpm_nvfile.h
new/swtpm-0.6.1/src/swtpm/swtpm_nvfile.h
--- old/swtpm-0.6.0/src/swtpm/swtpm_nvfile.h 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm/swtpm_nvfile.h 2021-09-20 13:26:56.000000000
+0200
@@ -55,6 +55,8 @@
TPM_RESULT SWTPM_NVRAM_Init(void);
+void SWTPM_NVRAM_Shutdown(void);
+
void SWTPM_NVRAM_Set_TPMVersion(TPMLIB_TPMVersion version);
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_bios/Makefile.am
new/swtpm-0.6.1/src/swtpm_bios/Makefile.am
--- old/swtpm-0.6.0/src/swtpm_bios/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm_bios/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,6 +4,9 @@
# For the license, see the LICENSE file in the root directory.
#
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
+
noinst_HEADERS = \
tpm_bios.h
@@ -13,9 +16,12 @@
swtpm_bios_CFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
+ $(MY_CFLAGS) \
+ $(CFLAGS) \
$(HARDENING_CFLAGS)
swtpm_bios_LDFLAGS = \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
swtpm_bios_SOURCES = tpm_bios.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_cert/Makefile.am
new/swtpm-0.6.1/src/swtpm_cert/Makefile.am
--- old/swtpm-0.6.0/src/swtpm_cert/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm_cert/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,6 +4,9 @@
# For the license, see the LICENSE file in the root directory.
#
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
+
noinst_HEADERS =
bin_PROGRAMS =
@@ -18,7 +21,13 @@
swtpm_cert_CFLAGS = \
-I$(top_builddir)/include \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ $(MY_CFLAGS) \
+ $(CFLAGS)
+
+swtpm_cert_LDFLAGS = \
+ $(MY_LDFLAGS) \
+ $(HARDENING_LDFLAGS)
ek-cert.o : tpm_asn1.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_ioctl/Makefile.am
new/swtpm-0.6.1/src/swtpm_ioctl/Makefile.am
--- old/swtpm-0.6.0/src/swtpm_ioctl/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm_ioctl/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,6 +4,9 @@
# For the license, see the LICENSE file in the root directory.
#
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
+
noinst_HEADERS =
bin_PROGRAMS = \
@@ -14,9 +17,12 @@
swtpm_ioctl_CFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
+ $(MY_CFLAGS) \
+ $(CFLAGS) \
$(HARDENING_CFLAGS)
swtpm_ioctl_LDFLAGS = \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
EXTRA_DIST = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_setup/Makefile.am
new/swtpm-0.6.1/src/swtpm_setup/Makefile.am
--- old/swtpm-0.6.0/src/swtpm_setup/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm_setup/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,6 +4,9 @@
# For the license, see the LICENSE file in the root directory.
#
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
+
noinst_HEADERS = \
swtpm.h \
swtpm_setup.h \
@@ -28,6 +31,7 @@
swtpm_setup_LDFLAGS = \
-L$(top_builddir)/src/utils -lswtpm_utils \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS) \
$(GLIB_LIBS) \
$(JSON_GLIB_LIBS) \
@@ -38,9 +42,12 @@
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/swtpm \
-I$(top_srcdir)/src/utils \
+ $(MY_CFLAGS) \
+ $(CFLAGS) \
$(HARDENING_CFLAGS) \
$(GLIB_CFLAGS) \
- $(JSON_GLIB_CFLAGS)
+ $(JSON_GLIB_CFLAGS) \
+ $(LIBCRYPTO_EXTRA_CFLAGS)
EXTRA_DIST = \
README
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_setup/swtpm.c
new/swtpm-0.6.1/src/swtpm_setup/swtpm.c
--- old/swtpm-0.6.0/src/swtpm_setup/swtpm.c 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/swtpm_setup/swtpm.c 2021-09-20 13:26:56.000000000
+0200
@@ -58,7 +58,7 @@
g_autofree gchar **argv = NULL;
struct stat statbuf;
gboolean success;
- GError *error;
+ GError *error = NULL;
unsigned ctr;
self->pidfile = g_strjoin(G_DIR_SEPARATOR_S,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_setup/swtpm_setup.c
new/swtpm-0.6.1/src/swtpm_setup/swtpm_setup.c
--- old/swtpm-0.6.0/src/swtpm_setup/swtpm_setup.c 2021-06-04
22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/src/swtpm_setup/swtpm_setup.c 2021-09-20
13:26:56.000000000 +0200
@@ -834,6 +834,7 @@
&standard_output, NULL, &exit_status, &error);
if (!success) {
logerr(gl_LOGFILE, "Could not start swtpm '%s': %s\n",
swtpm_prg_l[0], error->message);
+ g_error_free(error);
goto error;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/swtpm_setup/swtpm_setup_utils.c
new/swtpm-0.6.1/src/swtpm_setup/swtpm_setup_utils.c
--- old/swtpm-0.6.0/src/swtpm_setup/swtpm_setup_utils.c 2021-06-04
22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/src/swtpm_setup/swtpm_setup_utils.c 2021-09-20
13:26:56.000000000 +0200
@@ -19,7 +19,8 @@
/* Get a configuration value given its name */
gchar *get_config_value(gchar **config_file_lines, const gchar *configname)
{
- g_autofree gchar *regex = g_strdup_printf("^%s\\s*=\\s*([^#\n]*).*",
configname);
+ g_autofree gchar *regex =
g_strdup_printf("^%s[[:space:]]*=[[:space:]]*([^#\n]*).*",
+ configname);
gchar *result = NULL;
regmatch_t pmatch[2];
regex_t preg;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/src/utils/Makefile.am
new/swtpm-0.6.1/src/utils/Makefile.am
--- old/swtpm-0.6.0/src/utils/Makefile.am 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/src/utils/Makefile.am 2021-09-20 13:26:56.000000000
+0200
@@ -4,6 +4,9 @@
# For the license, see the COPYING file in the root directory.
#
+MY_CFLAGS = @MY_CFLAGS@
+MY_LDFLAGS = @MY_LDFLAGS@
+
noinst_HEADERS = \
swtpm_utils.h
@@ -11,10 +14,13 @@
libswtpm_utils.la
libswtpm_utils_la_CFLAGS = \
+ $(MY_CFLAGS) \
+ $(CFLAGS) \
$(HARDENING_CFLAGS) \
$(GLIB_CFLAGS)
libswtpm_utils_la_LDFLAGS = \
+ $(MY_LDFLAGS) \
$(HARDENING_LDFLAGS)
libswtpm_utils_la_SOURCES = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/swtpm.spec new/swtpm-0.6.1/swtpm.spec
--- old/swtpm-0.6.0/swtpm.spec 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/swtpm.spec 2021-09-20 13:26:56.000000000 +0200
@@ -7,7 +7,7 @@
Summary: TPM Emulator
Name: swtpm
-Version: 0.6.0
+Version: 0.6.1
Release: 1%{?dist}
License: BSD
Url: https://github.com/stefanberger/swtpm
@@ -172,6 +172,9 @@
%{_datadir}/swtpm/swtpm-create-tpmca
%changelog
+* Mon Sep 20 2021 Stefan Berger <stef...@linux.ibm.com> -
0.6.1-0.20210917git-------
+- v0.6.1 release
+
* Mon Jun 7 2021 Stefan Berger <stef...@linux.ibm.com> -
0.6.0-0.20210607git-------
- v0.6.0 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/swtpm.spec.in
new/swtpm-0.6.1/swtpm.spec.in
--- old/swtpm-0.6.0/swtpm.spec.in 2021-06-04 22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/swtpm.spec.in 2021-09-20 13:26:56.000000000 +0200
@@ -172,6 +172,9 @@
%{_datadir}/swtpm/swtpm-create-tpmca
%changelog
+* Mon Sep 20 2021 Stefan Berger <stef...@linux.ibm.com> -
0.6.1-0.20210917git-------
+- v0.6.1 release
+
* Mon Jun 7 2021 Stefan Berger <stef...@linux.ibm.com> -
0.6.0-0.20210607git-------
- v0.6.0 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/tests/_test_swtpm_bios
new/swtpm-0.6.1/tests/_test_swtpm_bios
--- old/swtpm-0.6.0/tests/_test_swtpm_bios 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/tests/_test_swtpm_bios 2021-09-20 13:26:56.000000000
+0200
@@ -12,7 +12,7 @@
TPM_PATH=$(mktemp -d)
STATE_FILE=$TPM_PATH/tpm-00.permall
VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
-PID_FILE=$TPM_PATH/${SWTPM}.pid
+PID_FILE=$TPM_PATH/swtpm.pid
SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/tests/_test_tpm2_swtpm_bios
new/swtpm-0.6.1/tests/_test_tpm2_swtpm_bios
--- old/swtpm-0.6.0/tests/_test_tpm2_swtpm_bios 2021-06-04 22:04:09.000000000
+0200
+++ new/swtpm-0.6.1/tests/_test_tpm2_swtpm_bios 2021-09-20 13:26:56.000000000
+0200
@@ -11,7 +11,7 @@
TPM_PATH=$(mktemp -d)
STATE_FILE=$TPM_PATH/tpm2-00.permall
VOLATILE_STATE_FILE=$TPM_PATH/tpm-00.volatilestate
-PID_FILE=$TPM_PATH/${SWTPM}.pid
+PID_FILE=$TPM_PATH/SWTPM.pid
SWTPM_INTERFACE=${SWTPM_INTERFACE:-cuse}
SWTPM_CMD_UNIX_PATH=${TPM_PATH}/unix-cmd.sock
SWTPM_CTRL_UNIX_PATH=${TPM_PATH}/unix-ctrl.sock
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/swtpm-0.6.0/tests/test_tpm2_samples_create_tpmca
new/swtpm-0.6.1/tests/test_tpm2_samples_create_tpmca
--- old/swtpm-0.6.0/tests/test_tpm2_samples_create_tpmca 2021-06-04
22:04:09.000000000 +0200
+++ new/swtpm-0.6.1/tests/test_tpm2_samples_create_tpmca 2021-09-20
13:26:56.000000000 +0200
@@ -68,7 +68,7 @@
echo "y" | tpm2_ptool destroy ${PID} &>/dev/null
fi
if [ -n "${TPM2_ABRMD_PID}" ]; then
- kill_quiet -15 ${TPM2_ABRMD_PID}
+ kill_quiet -9 ${TPM2_ABRMD_PID}
fi
if [ -n "${SWTPM_PID}" ]; then
kill_quiet -9 ${SWTPM_PID}
