Skip to content

Commit 4deb576

Browse files
committed
Fix CI failures from upstream dependency drift
Add tpm2_crypto.c and tpm2_util.c to the wolftpm Visual Studio project. Recent wolftpm changes moved TPM2_KDFa_ex, TPM2_KDFe_ex, TPM2_AesCfbEncrypt, TPM2_HmacCompute, TPM2_HashCompute into tpm2_crypto.c and TPM2_GetHashDigestSize, TPM2_GetHashType, TPM2_ConstantCompare, TPM2_ForceZero, TPM2_PrintBin into tpm2_util.c, which caused unresolved external symbol errors on the Windows build. Pass --disable-anon to the wolfSSL configure step in the TPM 2.0 store test workflow. wolfSSL 5.9.1 added a settings.h check that rejects HAVE_ANON without DH, and this workflow builds wolfPKCS11 with --disable-dh.
1 parent 4621172 commit 4deb576

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/tpm2-store-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
repository: wolfssl/wolfssl
6161
ref: ${{ matrix.wolfssl_version }}
6262
path: wolfssl/
63-
configure: --enable-all CPPFLAGS=-DWC_RSA_DIRECT
63+
configure: --enable-all --disable-anon CPPFLAGS=-DWC_RSA_DIRECT
6464
check: false
6565
install: true
6666

IDE/VisualStudio/wolftpm.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@
3737
<ItemGroup>
3838
<ClCompile Include="..\..\..\wolftpm\src\tpm2.c" />
3939
<ClCompile Include="..\..\..\wolftpm\src\tpm2_asn.c" />
40+
<ClCompile Include="..\..\..\wolftpm\src\tpm2_crypto.c" />
4041
<ClCompile Include="..\..\..\wolftpm\src\tpm2_cryptocb.c" />
4142
<ClCompile Include="..\..\..\wolftpm\src\tpm2_packet.c" />
4243
<ClCompile Include="..\..\..\wolftpm\src\tpm2_param_enc.c" />
4344
<ClCompile Include="..\..\..\wolftpm\src\tpm2_swtpm.c" />
4445
<ClCompile Include="..\..\..\wolftpm\src\tpm2_tis.c" />
46+
<ClCompile Include="..\..\..\wolftpm\src\tpm2_util.c" />
4547
<ClCompile Include="..\..\..\wolftpm\src\tpm2_winapi.c" />
4648
<ClCompile Include="..\..\..\wolftpm\src\tpm2_wrap.c" />
4749
</ItemGroup>

0 commit comments

Comments
 (0)