Skip to content

Commit 1a99f47

Browse files
committed
use ibmswtpm2 simulator
1 parent daa40d1 commit 1a99f47

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

.github/workflows/tpm-ssh.yml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ jobs:
3737
libcmocka-dev libssl-dev uthash-dev libglib2.0-dev \
3838
tpm2-tools
3939
40-
# Clone and build Microsoft TPM 2.0 Reference Implementation
41-
- name: Clone and Build TPM Simulator
42-
run: |
43-
git clone https://github.com/microsoft/ms-tpm-20-ref.git
44-
cd ms-tpm-20-ref/Samples/Simulator
45-
make
46-
cd ../../..
47-
4840
# Build and install wolfSSL
4941
- name: Build wolfSSL
5042
run: |
@@ -78,14 +70,14 @@ jobs:
7870
sudo ldconfig
7971
cd ..
8072
81-
# Start TPM simulator
82-
- name: Start TPM Simulator
73+
# Clone, build, and start TPM Simulator
74+
- name: Clone and Build TPM Simulator
8375
run: |
84-
cd ms-tpm-20-ref/Samples/Simulator
85-
./tpm_simulator &
86-
sleep 2 # Give the simulator time to start
87-
tpm2_getrandom --hex 8 # Verify TPM is working
88-
cd ../../../
76+
git clone https://github.com/kgoldman/ibmswtpm2
77+
cd ibmswtpm2/src
78+
make
79+
./tpm_server & sleep 2
80+
cd ../..
8981
9082
# Test TPM SSH Default Password
9183
- name: Test TPM SSH Default Password
@@ -119,13 +111,11 @@ jobs:
119111
run: |
120112
kill $SERVER_PID
121113
sleep 2
122-
pkill -f tpm_simulator
114+
pkill -f tpm_server
123115
sleep 2
124-
cd ms-tpm-20-ref/Samples/Simulator
125-
./tpm_simulator &
126-
sleep 2 # Give the simulator time to start
127-
tpm2_getrandom --hex 8 # Verify TPM is working
128-
cd ../../../
116+
cd ibmswtpm2/src
117+
./tpm_server & sleep 2
118+
cd ../..
129119
130120
# Test the TPM SSH Custom Password
131121
- name: Test TPM SSH Custom Password
@@ -156,7 +146,7 @@ jobs:
156146
157147
# Cleanup
158148
kill $SERVER_PID
159-
pkill -f tpm_simulator
149+
pkill -f tpm_server
160150
161151
# Archive artifacts for debugging
162152
- name: Archive test artifacts

0 commit comments

Comments
 (0)