From c125076da47f39eeadf54cd3d56e615f563ce95d Mon Sep 17 00:00:00 2001 From: mthielvoldt Date: Mon, 17 Feb 2025 11:39:11 -0500 Subject: [PATCH 1/2] Bugfix: Add #ifdef guard to prevent re-defining WOLFBOOT_KEYTOOLS --- tools/keytools/user_settings.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/keytools/user_settings.h b/tools/keytools/user_settings.h index 10e478236a..73870eba5e 100644 --- a/tools/keytools/user_settings.h +++ b/tools/keytools/user_settings.h @@ -29,7 +29,10 @@ #include /* System */ +#ifndef WOLFBOOT_KEYTOOLS #define WOLFBOOT_KEYTOOLS +#endif + #define SINGLE_THREADED #define WOLFCRYPT_ONLY From 4246150d546e7244da19fa3f863d133c69476622 Mon Sep 17 00:00:00 2001 From: mthielvoldt Date: Mon, 17 Feb 2025 11:37:59 -0500 Subject: [PATCH 2/2] Bugfix: add missing KEYTOOL_SOURCES in CMakeLists --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0069e7c779..288739162d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -721,6 +721,7 @@ if(NOT PYTHON_KEYTOOLS) lib/wolfssl/wolfcrypt/src/ecc.c lib/wolfssl/wolfcrypt/src/coding.c lib/wolfssl/wolfcrypt/src/chacha.c + lib/wolfssl/wolfcrypt/src/dilithium.c lib/wolfssl/wolfcrypt/src/ed25519.c lib/wolfssl/wolfcrypt/src/ed448.c lib/wolfssl/wolfcrypt/src/fe_operations.c @@ -739,7 +740,11 @@ if(NOT PYTHON_KEYTOOLS) lib/wolfssl/wolfcrypt/src/sha256.c lib/wolfssl/wolfcrypt/src/sha512.c lib/wolfssl/wolfcrypt/src/tfm.c + lib/wolfssl/wolfcrypt/src/wc_lms.c + lib/wolfssl/wolfcrypt/src/wc_lms_impl.c lib/wolfssl/wolfcrypt/src/wc_port.c + lib/wolfssl/wolfcrypt/src/wc_xmss.c + lib/wolfssl/wolfcrypt/src/wc_xmss_impl.c lib/wolfssl/wolfcrypt/src/wolfmath.c) list(