Progress getting the Windows tools to build.

Author: dgarske

lib/wolfssl

@@ -12,7 +12,7 @@ LD      = gcc
 WOLFBOOTDIR = ../..
 WOLFDIR = $(WOLFBOOTDIR)/lib/wolfssl
 CFLAGS  = -Wall -Wextra -Werror
-CFLAGS  += -I. -DWOLFSSL_USER_SETTINGS -I$(WOLFDIR) -I$(WOLFBOOTDIR)/include -DWOLFBOOT_KEYTOOLS
+CFLAGS  += -I. -DWOLFSSL_USER_SETTINGS -I$(WOLFDIR) -I$(WOLFBOOTDIR)/include
 LDFLAGS =
 OBJDIR = ./
 LIBS =
@@ -23,25 +23,16 @@ CFLAGS+=-DML_DSA_LEVEL=$(ML_DSA_LEVEL)
 LMS_LEVELS?=1
 LMS_HEIGHT?=10
 LMS_WINTERNITZ?=8
-XMSS_PARAMS?='XMSS-SHA2_10_256'
 
 # Common to wc_lms and ext_lms.
-CFLAGS +=-DWOLFBOOT_SIGN_LMS -DWOLFSSL_HAVE_LMS \
-		 -D"LMS_LEVELS=$(LMS_LEVELS)" -D"LMS_HEIGHT=$(LMS_HEIGHT)" \
+CFLAGS +=-D"LMS_LEVELS=$(LMS_LEVELS)" \
+		 -D"LMS_HEIGHT=$(LMS_HEIGHT)" \
 		 -D"LMS_WINTERNITZ=$(LMS_WINTERNITZ)"
 
-
-# LMS flags
-CFLAGS +=-DWOLFSSL_WC_LMS
-
-# ML_DSA flags
-CFLAGS +=-DWOLFSSL_HAVE_DILITHIUM
-
 # XMSS flags
-CFLAGS +=-DWOLFBOOT_SIGN_XMSS -DWOLFSSL_HAVE_XMSS \
-		 -D"IMAGE_SIGNATURE_SIZE"=$(IMAGE_SIGNATURE_SIZE) \
+XMSS_PARAMS?='XMSS-SHA2_10_256'
+CFLAGS +=-D"IMAGE_SIGNATURE_SIZE"=$(IMAGE_SIGNATURE_SIZE) \
 		 -DWOLFBOOT_XMSS_PARAMS=\"$(XMSS_PARAMS)\"
-CFLAGS +=-D"WOLFSSL_WC_XMSS" -D"WOLFSSL_XMSS_MAX_HEIGHT=32"
 
 # When WOLFBOOT_UNIVERSAL_KEYSTORE is defined, pad store_sizes in keystore.der
 ifeq ($(WOLFBOOT_UNIVERSAL_KEYSTORE),1)

tools/keytools/Makefile

@@ -29,6 +29,7 @@
 #include <stdint.h>
 
 /* System */
+#define WOLFBOOT_KEYTOOLS
 #define SINGLE_THREADED
 #define WOLFCRYPT_ONLY
 
@@ -73,19 +74,49 @@
 #define WOLFSSL_SHA3
 #undef  NO_SHA256
 
+/* Enable experimental PQ algos */
+#define WOLFSSL_EXPERIMENTAL_SETTINGS
+
 /* ML-DSA (dilithium) */
 #define HAVE_DILITHIUM
 #define WOLFSSL_WC_DILITHIUM
-#define WOLFSSL_EXPERIMENTAL_SETTINGS
 /* Wolfcrypt builds ML-DSA (dilithium) to the FIPS 204 final
 * standard by default. Uncomment this if you want the draft
 * version instead. */
 #if 0
-  #define WOLFSSL_DILITHIUM_FIPS204_DRAFT
+    #define WOLFSSL_DILITHIUM_FIPS204_DRAFT
+#endif
+#ifndef ML_DSA_LEVEL
+    #define ML_DSA_LEVEL 5
 #endif
 /* dilithium needs these sha functions. */
 #define WOLFSSL_SHAKE128
 
+/* LMS */
+#define WOLFBOOT_SIGN_LMS
+#define WOLFSSL_HAVE_LMS
+#define WOLFSSL_WC_LMS
+#ifndef LMS_LEVELS
+    #define LMS_LEVELS 1
+#endif
+#ifndef LMS_HEIGHT
+    #define LMS_HEIGHT 10
+#endif
+#ifndef LMS_WINTERNITZ
+    #define LMS_WINTERNITZ 8
+#endif
+
+/* XMSS */
+#define WOLFBOOT_SIGN_XMSS
+#define WOLFSSL_HAVE_XMSS
+#define WOLFSSL_WC_XMSS
+#ifndef WOLFBOOT_XMSS_PARAMS
+    #define WOLFBOOT_XMSS_PARAMS "XMSS-SHA2_10_256"
+#endif
+#ifndef WOLFSSL_XMSS_MAX_HEIGHT
+    #define WOLFSSL_XMSS_MAX_HEIGHT 32
+#endif
+
 /* ASN */
 #define WOLFSSL_ASN_TEMPLATE
 

tools/keytools/user_settings.h

@@ -157,6 +157,7 @@
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\asn.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\chacha.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\coding.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\dilithium.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ecc.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ed25519.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ed448.c" />
@@ -177,6 +178,10 @@
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\sp_int.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\tfm.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_port.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_lms.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_lms_impl.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_xmss.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_xmss_impl.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wolfmath.c" />
     <ClCompile Include="keygen.c" />
   </ItemGroup>

tools/keytools/wolfBootKeygenTool.vcxproj

@@ -158,6 +158,7 @@
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\asn.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\chacha.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\coding.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\dilithium.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ecc.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ed25519.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\ed448.c" />
@@ -178,6 +179,10 @@
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\sp_int.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\tfm.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_port.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_lms.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_lms_impl.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_xmss.c" />
+    <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wc_xmss_impl.c" />
     <ClCompile Include="..\..\lib\wolfssl\wolfcrypt\src\wolfmath.c" />
     <ClCompile Include="..\..\src\delta.c" />
     <ClCompile Include="sign.c">