Skip to content

Commit e1e578e

Browse files
committed
Add wolfPKCS11_TokenRepair
1 parent 54a50da commit e1e578e

File tree

6 files changed

+1741
-203
lines changed

6 files changed

+1741
-203
lines changed

.github/workflows/tpm-object-upgrade-regression.yml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
WOLFSSL_VERSION: v5.8.0-stable
9-
BASE_REF: v1.3.0-stable
9+
BASE_REF: 1a7f7d71b98dbffbfd4ad77f0c77c8c573a2c5d2
1010
TOKEN_PATH: ${{ github.workspace }}/tpm-upgrade-store
1111
METADATA_FILE: ${{ github.workspace }}/tpm-upgrade-store/tpm-upgrade-metadata.txt
1212

@@ -72,7 +72,7 @@ jobs:
7272
sudo make install
7373
sudo ldconfig
7474
75-
- name: Build wolfPKCS11 base (v1.3.0) with TPM store
75+
- name: Build wolfPKCS11 base (prepare reference) with TPM store
7676
working-directory: ./base-branch
7777
run: |
7878
./autogen.sh
@@ -95,7 +95,7 @@ jobs:
9595
echo $! > "${GITHUB_WORKSPACE}/tpm-server.pid"
9696
sleep 2
9797
98-
- name: Prepare TPM objects using v1.3.0 library
98+
- name: Prepare TPM objects using base reference library
9999
working-directory: ./pr-branch
100100
env:
101101
LD_LIBRARY_PATH: ${{ github.workspace }}/base-branch/src/.libs:/usr/local/lib
@@ -110,6 +110,30 @@ jobs:
110110
--metadata-file "${METADATA_FILE}" \
111111
--prepare --verbose
112112
113+
- name: Kill soft TPM after prepare
114+
run: |
115+
if [ -f "${GITHUB_WORKSPACE}/tpm-server.pid" ]; then
116+
TPM_PID="$(cat "${GITHUB_WORKSPACE}/tpm-server.pid")"
117+
kill "${TPM_PID}" || true
118+
wait "${TPM_PID}" 2>/dev/null || true
119+
rm -f "${GITHUB_WORKSPACE}/tpm-server.pid"
120+
fi
121+
pkill -f tpm_server || true
122+
sleep 1
123+
124+
- name: Upload NVChip artifact
125+
uses: actions/upload-artifact@v4
126+
with:
127+
name: tpm-nvchip
128+
path: ibmswtpm2/src/NVChip
129+
130+
- name: Restart soft TPM
131+
run: |
132+
cd ibmswtpm2/src
133+
./tpm_server >>"${GITHUB_WORKSPACE}/tpm-server.log" 2>&1 &
134+
echo $! > "${GITHUB_WORKSPACE}/tpm-server.pid"
135+
sleep 2
136+
113137
- name: Verify TPM objects using PR library
114138
working-directory: ./pr-branch
115139
env:

0 commit comments

Comments
 (0)