security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

tests:tpm2dtests: Fix tests with SWTPM.

Browse Source 
* configure.ac (TEST_LIBTSS): Fix the condition with SWTPM.
* tests/tpm2dtests/start_sw_tpm.sh: Use --daemon and --pid
to run SWTPM.

--

GnuPG-bug-id: 6052
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-10-04 18:30:33 +09:00
parent 08e529fa7c
commit 98dd6f7af6
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1627,7 +1627,7 @@ fi
AC_SUBST(LIBTSS_LIBS) AC_SUBST(LIBTSS_LIBS)
AC_SUBST(LIBTSS_CFLAGS) AC_SUBST(LIBTSS_CFLAGS)
AM_CONDITIONAL(HAVE_LIBTSS, test "$have_libtss" != no) AM_CONDITIONAL(HAVE_LIBTSS, test "$have_libtss" != no)
AM_CONDITIONAL(TEST_LIBTSS, test -n "$TPMSERVER" || test -n "$SWTPM" && test -n "$TSSSTARTUP") AM_CONDITIONAL(TEST_LIBTSS, test -n "$TPMSERVER" -o -n "$SWTPM" -a -n "$TSSSTARTUP" -a -n "$SWTPM_IOCTL")
AC_SUBST(HAVE_LIBTSS) AC_SUBST(HAVE_LIBTSS)
# #

9
tests/tpm2dtests/start_sw_tpm.sh
View File

@ -3,12 +3,15 @@
# remove any prior TPM contents # remove any prior TPM contents
rm -f NVChip h*.bin *.permall rm -f NVChip h*.bin *.permall
if [ -x "${SWTPM}" ]; then if [ -x "${SWTPM}" ]; then
${SWTPM} socket --tpm2 --server type=tcp,port=2321 \ ${SWTPM} socket --tpm2 --daemon \
--ctrl type=tcp,port=2322 --tpmstate dir=`pwd` & --pid file=swtpm.pid \
--server type=tcp,port=2321 \
--ctrl type=tcp,port=2322 --tpmstate dir=`pwd`
pid=$(cat swtpm.pid)
else else
${TPMSERVER} > /dev/null 2>&1 & ${TPMSERVER} > /dev/null 2>&1 &
pid=$!
fi fi
pid=$!
## ##
# This powers on the tpm and starts it # This powers on the tpm and starts it
# then we derive the RSA version of the storage seed and # then we derive the RSA version of the storage seed and