Skip to content

Update submodule test #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielinux merged 1 commit into from
Nov 25, 2025
Merged

Update submodule test #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test-wolfhsm-simulator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ jobs:
echo "obj 1 0xFFFF 0x0000 \"cert CA\" ../../../../../test-dummy-ca/root-cert.der" >> $tmpfile
./Build/wh_posix_server.elf --type tcp --nvminit $tmpfile &
else
./Build/wh_posix_server.elf --type tcp --client 12 --id 255 --key ../../../../../wolfboot_signing_private_key_pub.der &
# --flags=0x100 sets the WH_NVM_FLAGS_USAGE_VERIFY flag
./Build/wh_posix_server.elf --type tcp --client 12 --id 255 --flags 0x100 --key ../../../../../wolfboot_signing_private_key_pub.der &
fi
TCP_SERVER_PID=$!
echo "TCP_SERVER_PID=$TCP_SERVER_PID" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion lib/wolfHSM
Open in desktop
Submodule wolfHSM updated 110 files
2 changes: 1 addition & 1 deletion lib/wolfPKCS11
Open in desktop
Submodule wolfPKCS11 updated 5 files
+6 −3 README.md
+3 −0 debian/rules
+300 −73 src/internal.c
+37 −42 tests/token_path_test.c
+8 −0 wolfpkcs11/internal.h
2 changes: 1 addition & 1 deletion lib/wolfssl
Open in desktop
Submodule wolfssl updated 34 files
+2 −0 .codespellexcludelines
+6 −0 .gitignore
+2 −0 .wolfssl_known_macro_extras
+2 −2 CMakeLists.txt
+73 −0 ChangeLog.md
+4 −4 IDE/WIN-SRTP-KDF-140-3/wolfssl-fips.rc
+4 −4 IDE/WIN10/wolfssl-fips.rc
+16 −1 Makefile.am
+46 −175 README
+47 −176 README.md
+50 −0 bsdkm/Makefile
+118 −0 bsdkm/bsdkm_wc_port.h
+8 −0 bsdkm/include.am
+186 −0 bsdkm/wolfkmod.c
+96 −30 configure.ac
+9 −2 linuxkm/Kbuild
+175 −63 linuxkm/Makefile
+16 −3 linuxkm/linuxkm_wc_port.h
+1 −1 linuxkm/lkcapi_sha_glue.c
+85 −56 linuxkm/module_hooks.c
+31 −0 m4/ax_bsdkm.m4
+16 −7 wolfcrypt/src/fe_operations.c
+2 −2 wolfcrypt/src/ge_operations.c
+35 −0 wolfcrypt/src/random.c
+90 −0 wolfcrypt/src/wc_port.c
+1 −1 wolfcrypt/test/include.am
+20 −14 wolfcrypt/test/test.c
+ − wolfssl.rc
+2 −2 wolfssl/version.h
+2 −0 wolfssl/wolfcrypt/logging.h
+102 −0 wolfssl/wolfcrypt/settings.h
+5 −1 wolfssl/wolfcrypt/types.h
+17 −3 wolfssl/wolfcrypt/wc_port.h
+4 −1 wolfssl/wolfio.h
1 change: 1 addition & 0 deletions options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,7 @@ ifeq ($(WOLFHSM_SERVER),1)
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_comm.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_nvm.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_nvm_flash.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_keyid.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_flash_unit.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_crypto.o \
$(WOLFBOOT_LIB_WOLFHSM)/src/wh_server.o \
Expand Down
11 changes: 6 additions & 5 deletions src/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ static void wolfBoot_verify_signature_rsa(uint8_t key_slot,
#else
whKeyId hsmKeyId = WH_KEYID_ERASED;
/* Cache the public key on the server */
ret = wh_Client_KeyCache(&hsmClientCtx, 0, NULL, 0, pubkey, pubkey_sz,
&hsmKeyId);
ret = wh_Client_KeyCache(&hsmClientCtx, WH_NVM_FLAGS_USAGE_VERIFY, NULL, 0,
pubkey, pubkey_sz, &hsmKeyId);
if (ret != WH_ERROR_OK) {
return;
}
Expand Down Expand Up @@ -2102,18 +2102,19 @@ int wolfBoot_verify_authenticity(struct wolfBoot_image *img)
"verifying cert chain and caching leaf pubkey (using DMA)\n");
hsm_ret = wh_Client_CertVerifyDmaAndCacheLeafPubKey(
&hsmClientCtx, cert_chain, cert_chain_size, hsmNvmIdCertRootCA,
&g_certLeafKeyId, &cert_verify_result);
WH_NVM_FLAGS_USAGE_VERIFY, &g_certLeafKeyId, &cert_verify_result);
#else
wolfBoot_printf("verifying cert chain and caching leaf pubkey\n");
hsm_ret = wh_Client_CertVerifyAndCacheLeafPubKey(
&hsmClientCtx, cert_chain, cert_chain_size, hsmNvmIdCertRootCA,
&g_certLeafKeyId, &cert_verify_result);
WH_NVM_FLAGS_USAGE_VERIFY, &g_certLeafKeyId, &cert_verify_result);
#endif
#elif defined(WOLFBOOT_ENABLE_WOLFHSM_SERVER)
wolfBoot_printf("verifying cert chain and caching leaf pubkey\n");
hsm_ret = wh_Server_CertVerify(
&hsmServerCtx, cert_chain, cert_chain_size, hsmNvmIdCertRootCA,
WH_CERT_FLAGS_CACHE_LEAF_PUBKEY, &g_certLeafKeyId);
WH_CERT_FLAGS_CACHE_LEAF_PUBKEY, WH_NVM_FLAGS_USAGE_VERIFY,
&g_certLeafKeyId);
if (hsm_ret == WH_ERROR_OK) {
cert_verify_result = 0;
}
Expand Down
3 changes: 2 additions & 1 deletion tools/scripts/tc3xx/wolfBoot-wolfHSM-keys.nvminit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
#
# Key format is:
# key <clientId> <keyId> <access> <flags> <label> <file>
key 0x1 0xFF 0xFF 0x00 "wolfBoot Pubkey" wolfboot_signing_private_key_pub.der
# flags: WH_NVM_FLAGS_USAGE_VERIFY=0x100
key 0x1 0xFF 0xFF 0x100 "wolfBoot Pubkey" wolfboot_signing_private_key_pub.der