Performance tuning for TrustZone enabled test-app. Add SP and Cortex-M ECC/DH. Disable crypto callback tests. Disable RSA key gen. Only ECC P256/P384.

Author: dgarske

arch.mk

@@ -101,7 +101,7 @@ ifeq ($(ARCH),AARCH64)
     MATH_OBJS += $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sp_c32.o
     MATH_OBJS += $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sp_arm64.o
   endif
-  ifeq ($(NO_ARM_ASM),0)
+  ifneq ($(NO_ARM_ASM),1)
     ARCH_FLAGS=-mstrict-align
     CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8 -DWOLFSSL_AARCH64_PRIVILEGE_MODE
     WOLFCRYPT_OBJS += $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cpuid.o \
@@ -302,7 +302,6 @@ else
           $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/arm/thumb2-chacha-asm.o \
           $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/arm/thumb2-chacha-asm_c.o
 
-
     CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
                               -DWOLFSSL_ARMASM_NO_NEON -DWOLFSSL_ARMASM_THUMB2
   endif

test-app/Makefile

@@ -114,6 +114,15 @@ ifeq ($(TZEN),1)
             APP_OBJS+=./wcs/coding.o
             APP_OBJS+=./wcs/wc_encrypt.o
             APP_OBJS+=./wcs/wc_port.o
+
+            ifeq ($(SPMATH),1)
+              CFLAGS+=-DWOLFSSL_HAVE_SP_RSA -DWOLFSSL_HAVE_SP_ECC
+              ifneq ($(NO_ASM),1)
+                CFLAGS+=-fomit-frame-pointer # required with debug builds only
+                CFLAGS+=-DWOLFSSL_SP_ARM_CORTEX_M_ASM
+                APP_OBJS+=./wcs/sp_cortexm.o
+              endif
+            endif
         endif
         CFLAGS+=-DWOLFBOOT_SECURE_CALLS -Wstack-usage=19184
         LDFLAGS+=--specs=nosys.specs -u _printf_float

test-app/wcs/user_settings.h

@@ -54,15 +54,17 @@ extern int tolower(int c);
 
 
 /* ECC */
+#define ECC_USER_CURVES
 #define HAVE_ECC
-#define HAVE_ECC256
+#undef  NO_ECC256
 #define HAVE_ECC384
-
+#ifdef WOLFSSL_HAVE_SP_ECC
+  #define WOLFSSL_SP_384
+#endif
 
 #ifndef NO_RSA
   /* RSA */
   #define HAVE_RSA
-  #define WOLFSSL_KEY_GEN
   #define RSA_LOW_MEM
   #define WOLFSSL_RSA_VERIFY_INLINE
   #define WC_ASN_HASH_SHA256
@@ -102,6 +104,9 @@ extern int tolower(int c);
 #define WOLFSSL_AES_DIRECT
 #endif
 
+#define HAVE_AESGCM
+#define GCM_TABLE_4BIT
+
 /* Hardening */
 #define TFM_TIMING_RESISTANT
 #define ECC_TIMING_RESISTANT
@@ -134,6 +139,7 @@ extern int tolower(int c);
 #define NO_ERROR_STRINGS
 #define NO_KDF
 
+#define WC_TEST_NO_CRYPTOCB_SW_TEST
 #define BENCH_EMBEDDED
 
 #ifdef SECURE_PKCS11