mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
tests:tpm2d: add missing start_sw_tpm.sh script
* tests/tpm2dtests/start_sw_tpm.sh: New. * tests/tpm2dtests/Makefile.am: Add. -- This accidentally got left out of the initial commit for testing 6720f1343 ("tpm2d: add tests for the tpm2daemon") Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Added to Makefile and wrote tiny ChangeLog. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
1523b5f76f
commit
a788f2e830
@ -61,7 +61,7 @@ xcheck: tpm_server_found
|
||||
tpm_server_found:
|
||||
@if [ -z "$(TPMSERVER)" -a -z "$(SWTPM)" -a -z "$(FORCE)" ]; then echo "ERROR: No Software TPM has been found, cannot run TPM tests. Set FORCE=1 to force using the physical TPM"; exit 1; fi
|
||||
|
||||
EXTRA_DIST = defs.scm shell.scm all-tests.scm
|
||||
EXTRA_DIST = defs.scm shell.scm all-tests.scm start_sw_tpm.sh
|
||||
|
||||
CLEANFILES = gpg.conf gpg-agent.conf S.gpg-agent \
|
||||
pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
|
||||
|
35
tests/tpm2dtests/start_sw_tpm.sh
Executable file
35
tests/tpm2dtests/start_sw_tpm.sh
Executable file
@ -0,0 +1,35 @@
|
||||
#!/bin/bash
|
||||
|
||||
# remove any prior TPM contents
|
||||
rm -f NVChip h*.bin *.permall
|
||||
if [ -x "${SWTPM}" ]; then
|
||||
${SWTPM} socket --tpm2 --server type=tcp,port=2321 \
|
||||
--ctrl type=tcp,port=2322 --tpmstate dir=`pwd` &
|
||||
else
|
||||
${TPMSERVER} > /dev/null 2>&1 &
|
||||
fi
|
||||
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
|
||||
if [ -x "${SWTPM_IOCTL}" ]; then
|
||||
${SWTPM_IOCTL} --tcp 127.0.0.1:2322 -i > /dev/null 2>&1
|
||||
else
|
||||
tsspowerup > /dev/null 2>&1
|
||||
fi
|
||||
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
|
Loading…
x
Reference in New Issue
Block a user