Fixed for sp_c64.c to be available.

Author: Shingo Morimoto

embedded/signature/README.md

@@ -6,7 +6,7 @@ This directory includes the following examples under the sub-directories.Each ha
 |---|---|---|
 |RSA|rsa_vfy_only |verify signature|
 ||rsa_buffer|sign/verify signature |
-|ECDSA|signature/ecc-sign-verify/ecc_sign_verify.c|sign msg and verify signature|
+|ECDSA|signature/ecc-sign-verify/|sign msg and verify signature|
 
 You can specify a target function of Simple example, Benchemark or Memory track program.It also has options for optimized code for MCU architectures such as Intel x86, ARM64 or a generic code by default, as well as Math library of Single Precision or TFM.
 
@@ -27,13 +27,15 @@ $ make <Function> math=<Mathlib> arch=<MCU>
 |math|Description|
 |---|---|
 |Default|Generic architecture by pure C language source code|
-|sp| SP for specified archtecture|
+|sp| SP for generic or specified  archtecture|
 |tfm|TFM for generic architecture|
 ## MCU Architectures
 NOTE:  No architecture specification is required when using TFM.
 |arch|Description|
 |---|---|
 |Default|Generic architecture by pure C language source code|
+|c32| SP using 32-bit data type |
+|c64| SP using 64-bit data type   (default)   |
 |arm64|SP for ARM64 |
 |x64|SP for x86 64bit|
 

embedded/signature/ecc-sign-verify/Makefile

@@ -1,6 +1,6 @@
 WOLFROOT = ../../../../wolfssl
 
-CFLAGS = -DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT) -Os
+CFLAGS = $(EX_CFLAGS) -DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT) -Os
 ASFLAGS = -DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT)
 
 OBJ=\
@@ -14,7 +14,6 @@ OBJ=\
 	$(WOLFROOT)/wolfcrypt/src/memory.o\
 	$(WOLFROOT)/wolfcrypt/src/wolfmath.o\
 
-
 OBJ_SP_C32 := \
 	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
 	$(WOLFROOT)/wolfcrypt/src/sp_c32.o\
@@ -27,7 +26,6 @@ OBJ_SP_ARM64 := \
 	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
 	$(WOLFROOT)/wolfcrypt/src/sp_arm64.o\
 
-
 OBJ_SP_X86_64 := \
 	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
 	$(WOLFROOT)/wolfcrypt/src/cpuid.o\
@@ -37,7 +35,7 @@ OBJ_SP_X86_64 := \
 OBJ_TFM := \
 	$(WOLFROOT)/wolfcrypt/src/tfm.o\
 
-.PHONY: all clean mem size 
+.PHONY: all clean mem size bench
 
 ifeq ($(math) $(arch),sp x64) 
 ASFLAGS+= -DSP_X86_64_FLAG
@@ -55,22 +53,22 @@ else ifeq ($(math), tfm)
 CFLAGS += -DTFM_FLAG
 OBJ += $(OBJ_TFM)
 else 
-CFLAGS += -DSP_FLAG
+CFLAGS += -DSP_C64_FLAG
 OBJ += $(OBJ_SP_C64)
 endif
 
-all : ecc_sign_verify bench
-mem:CFLAGS+= -DDEBUG_MEMORY
-mem: ecc_sign_verify 
+all : ecc_sign_verify bench mem
 
 ecc_sign_verify: $(OBJ)
 	$(CC) $(CFLAGS) -o ecc_sign_verify ecc_sign_verify.c $(OBJ)
 
 bench: $(OBJ)
-	$(CC) $(CFLAGS) -DBENCHMARK -o bench ecc_sign_verify.c $(OBJ)
+	$(CC) $(CFLAGS) -DBENCHMARK -o ecc_sign_verify_bench ecc_sign_verify.c $(OBJ)
 
+mem: $(OBJ)
+	$(CC) $(CFLAGS) -DDEBUG_MEMORY -o ecc_sign_verify_mem ecc_sign_verify.c $(OBJ)
 clean:
-	rm -f ecc_sign_verify bench $(WOLFROOT)/wolfcrypt/src/*.o
+	rm -f ecc_sign_verify ecc_sign_verify_bench ecc_sign_verify_mem $(WOLFROOT)/wolfcrypt/src/*.o
 
 size :
 	size $(OBJ) ecc_sign_verify

embedded/signature/ecc-sign-verify/README.md

@@ -67,9 +67,9 @@ make bench math=tfm
 NOTE: When using TFM, No Architecture specification is required.
 
 ## Example Output
-built with the option `math=sp arch=arm64`
+- built with the option `math=sp arch=arm64`
 ```
-./bench
+./ecc_sign_verify_bench
 ---------------------------------------------------------------
 Enabled WOLFSSL_SP_ARM64
 ---------------------------------------------------------------
@@ -95,7 +95,7 @@ make mem
 ```
 ## Example Output
 ```
-./ecc_sign_verify
+./ecc_sign_verify_mem
 Key size is 112, byteField = 14
 Successfully verified signature w/ ecc key size 112!
 Key size is 128, byteField = 16
@@ -121,10 +121,10 @@ Successfully verified signature w/ ecc key size 521!
 
 total   Allocs   =       522
 total   Deallocs =       522
-total   Bytes    =    225047
-peak    Bytes    =      5161
+total   Bytes    =    243047
+peak    Bytes    =      5557
 current Bytes    =         0
-stack used = 16752
+stack used = 14448
 ```
 
 

embedded/signature/ecc-sign-verify/ecc_sign_verify.c

@@ -20,8 +20,7 @@
  */
 
 #include <stdio.h>
-#include <wolfssl/options.h>
-
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/ssl.h>
 #include <wolfssl/wolfcrypt/ecc.h>
 #include <wolfssl/wolfcrypt/signature.h>
@@ -71,6 +70,7 @@ int ecc_sign_verify(void)
 {
     int ret = 0;
 #ifdef DEBUG_MEMORY
+    wolfCrypt_Init();
     InitMemoryTracker();
 #endif
     ret = do_sig_ver_test(ECC_KEY_SIZE_112);
@@ -102,6 +102,7 @@ int ecc_sign_verify(void)
     printf("\n");
     ShowMemoryTracker();
     CleanupMemoryTracker();
+    wolfCrypt_Cleanup();
 #endif
     return ret;
 }
@@ -149,8 +150,6 @@ int do_sig_ver_test(int eccKeySz)
         printf("Failed to allocate sig buff\n");
         return -1001;
     }
-    
-    wolfCrypt_Init();
 
 
 
@@ -205,7 +204,6 @@ printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
     wc_ecc_free(&key);
 sig_done:
     XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
-
     return ret;
 }
 
@@ -229,12 +227,14 @@ static void hexdump(const void *buffer, word32 len, byte cols)
 int main(){
 #ifdef BENCHMARK
     printf("---------------------------------------------------------------\n");
-#if defined(WOLFSSL_HAVE_SP_ECC) && !defined(SP_X86_64_FLAG) && !defined(SP_ARM64_FLAG)
-    printf("Enabled WOLFSSL_HAVE_SP_ECC \n");
+#if defined(SP_C64_FLAG)
+    printf("Enabled 64-bit SP \n");
+#elif defined(SP_C32_FLAG)
+    printf("Enabled 32-bit SP \n");
 #elif defined(SP_X86_64_FLAG)
-    printf("Enabled WOLFSSL_SP_X86_64\n");
+    printf("Enabled SP for x86_64\n");
 #elif defined(SP_ARM64_FLAG)
-    printf("Enabled WOLFSSL_SP_ARM64\n");
+    printf("Enabled SP for Arm64\n");
 #elif defined(TFM_FLAG)
     printf("Enabled TFM \n");
 #endif

embedded/signature/ecc-sign-verify/user_settings.h

@@ -28,32 +28,28 @@
 
 
 #ifdef DEBUG_MEMORY
-    // #define WOLFSSL_TRACK_MEMORY
+    #define WOLFSSL_TRACK_MEMORY
     #define HAVE_STACK_SIZE
-    #define WOLFSSL_DEBUG_MEMORY
+    // #define WOLFSSL_DEBUG_MEMORY
     // #define WOLFSSL_DEBUG_MEMORY_PRINT
+    #undef BENCHMARK
 #endif
 
 
-#ifdef SP_FLAG
+
+#ifdef SP_C32_FLAG
     #define WOLFSSL_HAVE_SP_ECC
-    #define WOLFSSL_SP_MATH
+    #define WOLFSSL_SP_MATH_ALL
+    #define SP_WORD_SIZE 32
     #undef USE_FAST_MATH
 #endif
 
-#if defined(SP_C32_FLAG)
-#define WOLFSSL_HAVE_SP_ECC
-#define WOLFSSL_SP_MATH
-#define WOLFSSL_SP_MATH_ALL
-#undef USE_FAST_MATH
-#endif
-
-#if defined(SP_C64_FLAG)
-#define WOLFSSL_HAVE_SP_ECC
-#define WOLFSSL_SP_MATH
-#define WOLFSSL_SP_MATH_ALL
-#define SP_WORD_SIZE 64
-#undef USE_FAST_MATH
+#ifdef SP_C64_FLAG
+    #define WOLFSSL_HAVE_SP_ECC
+    #define WOLFSSL_SP_MATH_ALL
+    #define SP_WORD_SIZE 64
+    #define HAVE___UINT128_T
+    #undef USE_FAST_MATH
 #endif
 
 #ifdef SP_ARM64_FLAG

embedded/signature/rsa_buffer/Makefile

@@ -1,6 +1,6 @@
 WOLFROOT = ../../../../wolfssl
 
-CFLAGS =-DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT) -Os
+CFLAGS = $(EX_CFLAGS) -DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT) -Os
 ASFLAGS=-DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT)
 
 OBJ = \
@@ -17,6 +17,10 @@ OBJ_SP_C32 := \
 	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
 	$(WOLFROOT)/wolfcrypt/src/sp_c32.o\
 
+OBJ_SP_C64 := \
+	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
+	$(WOLFROOT)/wolfcrypt/src/sp_c64.o\
+
 OBJ_SP_ARM64 := \
 	$(WOLFROOT)/wolfcrypt/src/sp_int.o\
 	$(WOLFROOT)/wolfcrypt/src/sp_arm64.o\
@@ -33,34 +37,39 @@ OBJ_TFM := \
 	$(WOLFROOT)/wolfcrypt/src/tfm.o\
 
 
-.PHONY: all clean mem size 
+.PHONY: all clean size mem bench
 
 ifeq ($(math) $(arch),sp x64) 
 ASFLAGS+= -DSP_X86_64_FLAG
 OBJ += $(OBJ_SP_X86_64)
 else ifeq ($(math) $(arch),sp arm64)
 CFLAGS += -DSP_ARM64_FLAG
 OBJ += $(OBJ_SP_ARM64)
+else ifeq ($(math) $(arch),sp c64)
+CFLAGS += -DSP_C64_FLAG
+OBJ += $(OBJ_SP_C64)
+else ifeq ($(math) $(arch),sp c32)
+CFLAGS += -DSP_C32_FLAG
+OBJ += $(OBJ_SP_C32)
 else ifeq ($(math), tfm)
 CFLAGS += -DTFM_FLAG
 OBJ += $(OBJ_TFM)
 else 
-CFLAGS += -DSP_FLAG
-OBJ += $(OBJ_SP_C32)
+CFLAGS += -DSP_C64_FLAG
+OBJ += $(OBJ_SP_C64)
 endif
 
-all: verify sign bench
-
-mem:CFLAGS+= -DDEBUG_MEMORY 
-mem: verify sign
+all: verify sign bench mem
 
 verify: $(OBJ)
 	$(CC) $(CFLAGS) -o verify verify.c $(OBJ)
 sign: $(OBJ)
 	$(CC) $(CFLAGS) -o sign sign.c $(OBJ)
 bench: $(OBJ)
-	$(CC) $(CFLAGS) -DBENCHMARK -o bench verify.c $(OBJ)
+	$(CC) $(CFLAGS) -DBENCHMARK -o verify_bench verify.c $(OBJ)
+mem: $(OBJ)
+	$(CC) $(CFLAGS) -DDEBUG_MEMORY -o verify_mem verify.c $(OBJ)
 clean:
-	rm -f verify sign bench $(WOLFROOT)/wolfcrypt/src/*.o
+	rm -f sign verify verify_bench verify_mem $(WOLFROOT)/wolfcrypt/src/*.o
 size :
-	size $(OBJ)
+	size $(OBJ) sign verify 

embedded/signature/rsa_buffer/README.md

@@ -43,9 +43,9 @@ make bench math=tfm
 ```
 NOTE: When using TFM, No Architecture specification is required.
 ## Example Output
-built with the option `math=sp arch=arm64`
+- built with the option `math=sp arch=arm64`
 ```
-./bench
+./verify_bench
 ---------------------------------------------------------------
 Enabled WOLFSSL_SP_ARM64
 ---------------------------------------------------------------
@@ -56,8 +56,9 @@ Finished Benchmark
 ```
 
 
-built with the option `math=tfm`
+- built with the option `math=tfm`
 ```
+./verify_bench
 ---------------------------------------------------------------
 Enabled TFM
 ---------------------------------------------------------------
@@ -75,14 +76,14 @@ make mem
 ```
 ## Example Output
 ```
-./verify
+./verify_mem
 Verified
 total   Allocs   =         0
 total   Deallocs =         0
 total   Bytes    =         0
 peak    Bytes    =         0
 current Bytes    =         0
-stack used = 13528
+stack used = 12392
 ```
 
 

embedded/signature/rsa_buffer/user_settings.h

@@ -25,9 +25,6 @@
 #define WOLFSSL_NO_ASN_STRICT 
 
 
-
-
-
 #ifdef DEBUG_MEMORY
     #define WOLFSSL_TRACK_MEMORY
     #define HAVE_STACK_SIZE
@@ -36,16 +33,23 @@
 #endif
 
 
-#ifdef SP_FLAG  /* Use multi-platform SP (sp_c32.c) by default*/
+#ifdef SP_C32_FLAG  /* Use multi-platform SP (sp_c32.c) by default*/
     #define WOLFSSL_HAVE_SP_RSA
-    #define WOLFSSL_SP_MATH
     #define WOLFSSL_SP_MATH_ALL
     #undef USE_FAST_MATH
 #endif 
 
+#ifdef SP_C64_FLAG
+    #define WOLFSSL_HAVE_SP_RSA
+    #define WOLFSSL_SP_MATH_ALL
+    #define SP_WORD_SIZE 64
+    #define HAVE___UINT128_T
+    #undef USE_FAST_MATH
+
+#endif
+
 #ifdef SP_ARM64_FLAG
     #define WOLFSSL_HAVE_SP_RSA
-    #define WOLFSSL_SP_MATH
     #define WOLFSSL_SP_MATH_ALL
     #define WOLFSSL_SP_ARM64
     #define WOLFSSL_SP_ARM64_ASM
@@ -54,7 +58,6 @@
 
 #ifdef SP_X86_64_FLAG
     #define WOLFSSL_HAVE_SP_RSA
-    #define WOLFSSL_SP_MATH
     #define WOLFSSL_SP_MATH_ALL
     #define WOLFSSL_SP_X86_64
     #define WOLFSSL_SP_X86_64_ASM