mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
9353dc811a
* configure.ac (SWTPM_IOCTL): Remove. (TEST_LIBTSS): Fix the condition. * tests/tpm2dtests/Makefile.am (TESTS_ENVIRONMENT): Remove SWTPM_IOCTL. * tests/tpm2dtests/start_sw_tpm.sh: Add --flags to invoke SWTPM, not requiring SWTPM_IOCTL and TSSSTARTUP any more. -- Cherry-picked from master commit of: 227b3b14f4be2f33ed721818c2186e7fca4cebdf GnuPG-bug-id: 6052 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
38 lines
984 B
Bash
Executable File
38 lines
984 B
Bash
Executable File
#!/bin/bash
|
|
|
|
# remove any prior TPM contents
|
|
rm -f NVChip h*.bin *.permall
|
|
if [ -x "${SWTPM}" ]; then
|
|
${SWTPM} socket --tpm2 --daemon \
|
|
--pid file=swtpm.pid \
|
|
--server type=tcp,port=2321 \
|
|
--ctrl type=tcp,port=2322 \
|
|
--flags not-need-init,startup-clear \
|
|
--tpmstate dir=`pwd`
|
|
cat swtpm.pid
|
|
else
|
|
${TPMSERVER} > /dev/null 2>&1 &
|
|
pid=$!
|
|
##
|
|
# This powers on the tpm and starts it
|
|
# then we derive the RSA version of the storage seed and
|
|
# store it permanently at handle 81000001 and flush the transient
|
|
##
|
|
a=0
|
|
while [ $a -lt 10 ]; do
|
|
tsspowerup > /dev/null 2>&1
|
|
if [ $? -eq 0 ]; then
|
|
break;
|
|
fi
|
|
sleep 1
|
|
a=$[$a+1]
|
|
done
|
|
if [ $a -eq 10 ]; then
|
|
echo "Waited 10s for tpm_server to come up; exiting"
|
|
exit 1
|
|
fi
|
|
|
|
${TSSSTARTUP} || exit 1
|
|
echo -n $pid
|
|
fi
|