diff --git a/CMakeLists.txt b/CMakeLists.txt index c395263da1..f9b2e8725d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1231,9 +1231,9 @@ list( lib/wolfssl/wolfcrypt/src/tfm.c lib/wolfssl/wolfcrypt/src/wc_port.c lib/wolfssl/wolfcrypt/src/wolfmath.c - lib/wolfssl/wolfcrypt/src/dilithium.c lib/wolfssl/wolfcrypt/src/wc_lms.c lib/wolfssl/wolfcrypt/src/wc_lms_impl.c + lib/wolfssl/wolfcrypt/src/wc_mldsa.c lib/wolfssl/wolfcrypt/src/wc_xmss.c lib/wolfssl/wolfcrypt/src/wc_xmss_impl.c ) diff --git a/lib/wolfssl b/lib/wolfssl index 1d363f3adc..be67bf88f7 160000 --- a/lib/wolfssl +++ b/lib/wolfssl @@ -1 +1 @@ -Subproject commit 1d363f3adceba9d1478230ede476a37b0dcdef24 +Subproject commit be67bf88f76409022059cbe01c5571ae493d285f diff --git a/options.mk b/options.mk index 442e20143a..45fdedd85f 100644 --- a/options.mk +++ b/options.mk @@ -187,7 +187,7 @@ XMSS_EXTRA=\ -D"WOLFSSL_XMSS_VERIFY_ONLY" -D"WOLFSSL_XMSS_MAX_HEIGHT=32" ML_DSA_OBJS=\ - $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.o + $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_mldsa.o ML_DSA_EXTRA=\ -D"ML_DSA_IMAGE_SIGNATURE_SIZE"=$(IMAGE_SIGNATURE_SIZE) \ diff --git a/tools/keytools/Makefile b/tools/keytools/Makefile index 7029295ba6..d3cbd35838 100644 --- a/tools/keytools/Makefile +++ b/tools/keytools/Makefile @@ -108,7 +108,7 @@ OBJS_REAL+=\ OBJS_REAL+=\ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_xmss.o \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_xmss_impl.o -OBJS_REAL+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.o +OBJS_REAL+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_mldsa.o OBJS_VIRT=$(addprefix $(OBJDIR), $(notdir $(OBJS_REAL))) DEPS=$(OBJS_VIRT:.o=.d) sign.d keygen.d diff --git a/tools/keytools/wolfBootKeygenTool.vcxproj b/tools/keytools/wolfBootKeygenTool.vcxproj index b9fd05a5f4..0be9eb80c3 100644 --- a/tools/keytools/wolfBootKeygenTool.vcxproj +++ b/tools/keytools/wolfBootKeygenTool.vcxproj @@ -157,7 +157,7 @@ - + diff --git a/tools/keytools/wolfBootSignTool.vcxproj b/tools/keytools/wolfBootSignTool.vcxproj index 084882f016..5f1e31090f 100755 --- a/tools/keytools/wolfBootSignTool.vcxproj +++ b/tools/keytools/wolfBootSignTool.vcxproj @@ -158,7 +158,7 @@ - + diff --git a/tools/unit-tests/unit-sign-encrypted-output.mkfrag b/tools/unit-tests/unit-sign-encrypted-output.mkfrag index 69da996def..6e4626264c 100644 --- a/tools/unit-tests/unit-sign-encrypted-output.mkfrag +++ b/tools/unit-tests/unit-sign-encrypted-output.mkfrag @@ -26,5 +26,5 @@ KEYTOOLS_SIGN_SRCS=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/asn.c \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_lms_impl.c \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_xmss.c \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_xmss_impl.c \ - $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.c \ + $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/wc_mldsa.c \ ../../src/delta.c