From f46f69c1dc9648a737d5e37e47b04778ca9db2b8 Mon Sep 17 00:00:00 2001 From: elms Date: Wed, 29 Sep 2021 08:17:44 -0700 Subject: [PATCH 1/3] GCC makefile: Add ed448 files --- IDE/GCC-ARM/Makefile.common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/IDE/GCC-ARM/Makefile.common b/IDE/GCC-ARM/Makefile.common index f8cfec95f..962505375 100644 --- a/IDE/GCC-ARM/Makefile.common +++ b/IDE/GCC-ARM/Makefile.common @@ -122,9 +122,12 @@ SRC_C += ../../wolfcrypt/src/cpuid.c SRC_C += ../../wolfcrypt/src/cryptocb.c SRC_C += ../../wolfcrypt/src/curve25519.c SRC_C += ../../wolfcrypt/src/ed25519.c +SRC_C += ../../wolfcrypt/src/ed448.c SRC_C += ../../wolfcrypt/src/error.c +SRC_C += ../../wolfcrypt/src/fe_448.c SRC_C += ../../wolfcrypt/src/fe_low_mem.c SRC_C += ../../wolfcrypt/src/fe_operations.c +SRC_C += ../../wolfcrypt/src/ge_448.c SRC_C += ../../wolfcrypt/src/ge_low_mem.c SRC_C += ../../wolfcrypt/src/ge_operations.c SRC_C += ../../wolfcrypt/src/hash.c From 2dfc3f308bd6c6601aa8569e09a6f949c2bbbd3b Mon Sep 17 00:00:00 2001 From: elms Date: Thu, 30 Sep 2021 14:25:15 -0700 Subject: [PATCH 2/3] GCC makefile: Add other missing source files --- IDE/GCC-ARM/Makefile.common | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/IDE/GCC-ARM/Makefile.common b/IDE/GCC-ARM/Makefile.common index 962505375..8030448bd 100644 --- a/IDE/GCC-ARM/Makefile.common +++ b/IDE/GCC-ARM/Makefile.common @@ -80,6 +80,7 @@ SRC_C += ../../wolfcrypt/benchmark/benchmark.c endif # WOLFSSL TLS FILES +SRC_C += ../../src/bio.c SRC_C += ../../src/crl.c SRC_C += ../../src/internal.c SRC_C += ../../src/keys.c @@ -113,17 +114,24 @@ SRC_C += ../../wolfcrypt/src/wolfcrypt_last.c endif # wolfCrypt Additional +SRC_C += ../../wolfcrypt/src/asm.c +SRC_C += ../../wolfcrypt/src/async.c SRC_C += ../../wolfcrypt/src/asn.c +SRC_C += ../../wolfcrypt/src/blake2s.c SRC_C += ../../wolfcrypt/src/chacha.c -SRC_C += ../../wolfcrypt/src/cmac.c +SRC_C += ../../wolfcrypt/src/chacha20_poly1305.c SRC_C += ../../wolfcrypt/src/coding.c SRC_C += ../../wolfcrypt/src/compress.c SRC_C += ../../wolfcrypt/src/cpuid.c SRC_C += ../../wolfcrypt/src/cryptocb.c SRC_C += ../../wolfcrypt/src/curve25519.c +SRC_C += ../../wolfcrypt/src/curve448.c +SRC_C += ../../wolfcrypt/src/ecc_fp.c +SRC_C += ../../wolfcrypt/src/eccsi.c SRC_C += ../../wolfcrypt/src/ed25519.c SRC_C += ../../wolfcrypt/src/ed448.c SRC_C += ../../wolfcrypt/src/error.c +SRC_C += ../../wolfcrypt/src/evp.c SRC_C += ../../wolfcrypt/src/fe_448.c SRC_C += ../../wolfcrypt/src/fe_low_mem.c SRC_C += ../../wolfcrypt/src/fe_operations.c @@ -140,6 +148,9 @@ SRC_C += ../../wolfcrypt/src/pkcs12.c SRC_C += ../../wolfcrypt/src/pkcs7.c SRC_C += ../../wolfcrypt/src/poly1305.c SRC_C += ../../wolfcrypt/src/pwdbased.c +SRC_C += ../../wolfcrypt/src/rc2.c +SRC_C += ../../wolfcrypt/src/sakke.c +SRC_C += ../../wolfcrypt/src/selftest.c SRC_C += ../../wolfcrypt/src/signature.c SRC_C += ../../wolfcrypt/src/srp.c SRC_C += ../../wolfcrypt/src/sp_arm32.c @@ -148,9 +159,13 @@ SRC_C += ../../wolfcrypt/src/sp_armthumb.c SRC_C += ../../wolfcrypt/src/sp_c32.c SRC_C += ../../wolfcrypt/src/sp_c64.c SRC_C += ../../wolfcrypt/src/sp_cortexm.c +SRC_C += ../../wolfcrypt/src/sp_dsp32.c SRC_C += ../../wolfcrypt/src/sp_int.c +SRC_C += ../../wolfcrypt/src/sp_x86_64.c SRC_C += ../../wolfcrypt/src/tfm.c +SRC_C += ../../wolfcrypt/src/wc_dsp.c SRC_C += ../../wolfcrypt/src/wc_encrypt.c +SRC_C += ../../wolfcrypt/src/wc_pkcs11.c SRC_C += ../../wolfcrypt/src/wc_port.c SRC_C += ../../wolfcrypt/src/wolfevent.c SRC_C += ../../wolfcrypt/src/wolfmath.c From f1a0d00f4e09795a75096fb9a83836cca078334b Mon Sep 17 00:00:00 2001 From: elms Date: Thu, 30 Sep 2021 15:51:19 -0700 Subject: [PATCH 3/3] GCC Makefile: wrap async and selftest --- IDE/GCC-ARM/Header/user_settings.h | 4 ++++ IDE/GCC-ARM/Makefile.common | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h index c3b61925f..1496866b1 100644 --- a/IDE/GCC-ARM/Header/user_settings.h +++ b/IDE/GCC-ARM/Header/user_settings.h @@ -637,6 +637,10 @@ extern unsigned int my_rng_seed_gen(void); #undef NO_SIG_WRAPPER //#define NO_SIG_WRAPPER +#undef WOLFSSL_IGNORE_FILE_WARN +#define WOLFSSL_IGNORE_FILE_WARN + + #ifdef __cplusplus } #endif diff --git a/IDE/GCC-ARM/Makefile.common b/IDE/GCC-ARM/Makefile.common index 8030448bd..a98fd55b0 100644 --- a/IDE/GCC-ARM/Makefile.common +++ b/IDE/GCC-ARM/Makefile.common @@ -115,7 +115,6 @@ endif # wolfCrypt Additional SRC_C += ../../wolfcrypt/src/asm.c -SRC_C += ../../wolfcrypt/src/async.c SRC_C += ../../wolfcrypt/src/asn.c SRC_C += ../../wolfcrypt/src/blake2s.c SRC_C += ../../wolfcrypt/src/chacha.c @@ -150,7 +149,6 @@ SRC_C += ../../wolfcrypt/src/poly1305.c SRC_C += ../../wolfcrypt/src/pwdbased.c SRC_C += ../../wolfcrypt/src/rc2.c SRC_C += ../../wolfcrypt/src/sakke.c -SRC_C += ../../wolfcrypt/src/selftest.c SRC_C += ../../wolfcrypt/src/signature.c SRC_C += ../../wolfcrypt/src/srp.c SRC_C += ../../wolfcrypt/src/sp_arm32.c @@ -170,6 +168,14 @@ SRC_C += ../../wolfcrypt/src/wc_port.c SRC_C += ../../wolfcrypt/src/wolfevent.c SRC_C += ../../wolfcrypt/src/wolfmath.c +ifeq "$(ASYNC)" "1" +SRC_C += ../../wolfcrypt/src/async.c +endif + +ifeq "$(SELFTEST)" "1" +SRC_C += ../../wolfcrypt/src/selftest.c +endif + # wolfCrypt non-standard algorithms (disabled by default) SRC_C += ../../wolfcrypt/src/arc4.c SRC_C += ../../wolfcrypt/src/blake2b.c