Attempting a smaller diff

Author: padelsbach

include/target.h.in

@@ -37,13 +37,11 @@
 #ifdef WOLFBOOT_FIXED_PARTITIONS
 
 #if defined(ARCH_SIM) && !defined(WOLFBOOT_PARTITION_FILENAME)
-#ifndef __ASSEMBLER__
     #include <stdint.h>
     /* use runtime ram base for simulator */
     extern uint8_t *sim_ram_base;
     #undef  ARCH_FLASH_OFFSET
     #define ARCH_FLASH_OFFSET ((size_t)sim_ram_base)
-#endif /* !__ASSEMBLER__ */
     #define WOLFBOOT_PART_USE_ARCH_OFFSET
 #endif
 

include/user_settings.h

@@ -46,7 +46,7 @@
 /* Stdlib Types */
 #define CTYPE_USER /* don't let wolfCrypt types.h include ctype.h */
 
-#if !defined(WOLFSSL_ARMASM) && !defined(__ASSEMBLER__)
+#ifndef WOLFSSL_ARMASM
 #ifndef toupper
 extern int toupper(int c);
 #endif
@@ -353,13 +353,6 @@ extern int tolower(int c);
 #       endif
 #   else
 #       define SP_WORD_SIZE 32
-#   endif
-
-    /* x86_64 ASM 4096-bit routines use 2048-bit helpers internally,
-     * so ensure 2048-bit asm is not excluded when 4096-bit is needed */
-#   if defined(WOLFSSL_SP_X86_64_ASM) && defined(WOLFSSL_SP_4096) && \
-       defined(WOLFSSL_SP_NO_2048)
-#       undef WOLFSSL_SP_NO_2048
 #   endif
 
     /* SP Math needs to understand long long */

src/image.c

@@ -816,10 +816,9 @@ static void wolfBoot_verify_signature_ml_dsa(uint8_t key_slot,
                         ML_DSA_LEVEL);
 
         /* Finally verify signature. */
-        ret = wc_MlDsaKey_VerifyCtx(&ml_dsa, sig, ML_DSA_IMAGE_SIGNATURE_SIZE,
-                                    NULL, 0,
-                                    img->sha_hash, WOLFBOOT_SHA_DIGEST_SIZE,
-                                    &verify_res);
+        ret = wc_MlDsaKey_Verify(&ml_dsa, sig, ML_DSA_IMAGE_SIGNATURE_SIZE,
+                                 img->sha_hash, WOLFBOOT_SHA_DIGEST_SIZE,
+                                 &verify_res);
 
     #ifdef WOLFBOOT_ARMORED
         if (ret == 0) {

tools/keytools/sign.c

@@ -1088,9 +1088,8 @@ static int sign_digest(int sign, int hash_algo,
     if (sign == SIGN_ML_DSA) {
         /* Nothing else to do, ready to sign. */
         if (ret == 0) {
-            ret = wc_MlDsaKey_SignCtx(&key.ml_dsa, NULL, 0,
-                                      signature, signature_sz,
-                                      digest, digest_sz, &rng);
+            ret = wc_MlDsaKey_Sign(&key.ml_dsa, signature, signature_sz,
+                                   digest, digest_sz, &rng);
         }
         if (ret != 0) {
             fprintf(stderr, "error signing with ML-DSA: %d\n", ret);