diff --git a/IDE/NETOS/Makefile.wolfcrypt.inc b/IDE/NETOS/Makefile.wolfcrypt.inc index 6de79e8747..1a47e29e89 100644 --- a/IDE/NETOS/Makefile.wolfcrypt.inc +++ b/IDE/NETOS/Makefile.wolfcrypt.inc @@ -1,11 +1,11 @@ -WOLFSSL_ROOT=wolfCrypt_v4_5_2 +WOLFSSL_ROOT=wolfssl-5.7.2-commercial-fips-linuxv5.2.1 APP_WOLFCRYPTOBJS = $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/wolfcrypt_first.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/aes.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/cmac.o\ - $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/des3.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/dh.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/ecc.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/hmac.o\ + $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/kdf.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/random.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/rsa.o\ $(NETOS_DIR)/src/$(WOLFSSL_ROOT)/objs/ns9210/32b/gnu/sha.o\ diff --git a/IDE/NETOS/include.am b/IDE/NETOS/include.am index 1df202b65c..fcb1e64aa9 100644 --- a/IDE/NETOS/include.am +++ b/IDE/NETOS/include.am @@ -4,6 +4,7 @@ EXTRA_DIST+= IDE/NETOS/Makefile.wolfcrypt.inc EXTRA_DIST+= IDE/NETOS/user_settings.h +EXTRA_DIST+= IDE/NETOS/user_settings.h-cert3389 EXTRA_DIST+= IDE/NETOS/user_settings.h-cert2425 EXTRA_DIST+= IDE/NETOS/wolfssl_netos_custom.c EXTRA_DIST+= IDE/NETOS/README.md diff --git a/IDE/NETOS/user_settings.h b/IDE/NETOS/user_settings.h index efdbf01614..beaae0b208 100644 --- a/IDE/NETOS/user_settings.h +++ b/IDE/NETOS/user_settings.h @@ -1,5 +1,5 @@ /* user_settings.h -* + * * Copyright (C) 2006-2024 wolfSSL Inc. * * This file is part of wolfSSL. @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ -/* Custom wolfSSL user settings for GCC ARM */ #ifndef WOLFSSL_USER_SETTINGS_H #define WOLFSSL_USER_SETTINGS_H @@ -28,11 +27,39 @@ extern "C" { #endif +#undef HAVE_FIPS +#if 1 + + #define HAVE_FIPS + + #undef HAVE_FIPS_VERSION + #define HAVE_FIPS_VERSION 5 + + #undef HAVE_FIPS_VERSION_MAJOR + #define HAVE_FIPS_VERSION_MAJOR 5 + + #undef HAVE_FIPS_VERSION_MINOR + #define HAVE_FIPS_VERSION_MINOR 2 + + #undef WOLFSSL_WOLFSSH + #define WOLFSSL_WOLFSSH + + #undef WC_RNG_SEED_CB + #define WC_RNG_SEED_CB + + #if 1 + #undef NO_ATTRIBUTE_CONSTRUCTOR + #define NO_ATTRIBUTE_CONSTRUCTOR + #endif + +#endif + + /* ------------------------------------------------------------------------- */ /* Platform */ /* ------------------------------------------------------------------------- */ -#undef WOLFSSL_GENERAL_ALIGNMENT -#define WOLFSSL_GENERAL_ALIGNMENT 4 +#undef WOLFSSL_GENERAL_ALIGNMENT +#define WOLFSSL_GENERAL_ALIGNMENT 4 #undef THREADX #define THREADX @@ -47,56 +74,68 @@ extern "C" { #undef BIG_ENDIAN_ORDER #define BIG_ENDIAN_ORDER -#undef WOLFSSL_SMALL_STACK -//#define WOLFSSL_SMALL_STACK - -#undef WOLFSSL_USER_IO -//#define WOLFSSL_USER_IO +#undef WOLFSSL_USE_ALIGN +#define WOLFSSL_USE_ALIGN -#undef NO_THREAD_LS +#undef NO_THREAD_LS #define NO_THREAD_LS /* ------------------------------------------------------------------------- */ /* Math Configuration */ /* ------------------------------------------------------------------------- */ -#undef SIZEOF_LONG_LONG -#define SIZEOF_LONG_LONG 8 - -#undef SIZEOF_LONG -#define SIZEOF_LONG 4 -#undef USE_FAST_MATH + #define WOLFCRYPT_FIPS_CORE_HASH_VALUE \ + F0E3A7F32D8FDE71DA017855072247B27D8C0F5A74CACE89AED272A7CF5EAC0E +#if 0 + #define WOLFSSL_SP_MATH_ALL + #define WOLFSSL_SP_RSA + #define WOLFSSL_SP_DH + #define WOLFSSL_SP_ECC + #define WOLFSSL_SP_4096 + #define WOLFSSL_SP_384 + #define WOLFSSL_SP_521 + #define WOLFSSL_SP_SMALL + #define WOLFSSL_SP_NO_MALLOC + #define SP_INT_BITS 8192 +#endif #if 1 + #undef USE_FAST_MATH #define USE_FAST_MATH + #if 1 + #define WOLFSSL_SP_RSA + #define WOLFSSL_SP_DH + #define WOLFSSL_SP_ECC + #define WOLFSSL_SP_4096 + #define WOLFSSL_SP_384 + #define WOLFSSL_SP_521 + #define WOLFSSL_SP_SMALL + #define SP_INT_BITS 8192 + #endif +#endif +#if 0 + #undef USE_INTEGER_HEAP_MATH + #define USE_INTEGER_HEAP_MATH - #undef TFM_TIMING_RESISTANT - #define TFM_TIMING_RESISTANT - - /* Optimizations */ - #define TFM_ARM + #undef WOLFSSL_SMALL_STACK + #define WOLFSSL_SMALL_STACK #endif -/* ------------------------------------------------------------------------- */ -/* FIPS - Requires eval or license from wolfSSL */ -/* ------------------------------------------------------------------------- */ -#undef HAVE_FIPS -#if 1 - #define HAVE_FIPS +#undef SIZEOF_LONG_LONG +#define SIZEOF_LONG_LONG 8 - #undef HAVE_FIPS_VERSION - #define HAVE_FIPS_VERSION 2 +#ifdef USE_FAST_MATH + #undef TFM_TIMING_RESISTANT + #define TFM_TIMING_RESISTANT - #ifdef SINGLE_THREADED - #undef NO_THREAD_LS - #define NO_THREAD_LS - #endif + #undef FP_MAX_BITS + #define FP_MAX_BITS 16384 - #if 1 - #undef NO_ATTRIBUTE_CONSTRUCTOR - #define NO_ATTRIBUTE_CONSTRUCTOR - #endif -#endif + #define TFM_NO_ASM + /* Optimizations (on M0 UMULL is not supported, need another assembly + * solution) */ + //#define TFM_ARM +#endif /* ------------------------------------------------------------------------- */ /* Crypto */ @@ -104,28 +143,30 @@ extern "C" { /* RSA */ #undef NO_RSA #if 1 - #ifdef USE_FAST_MATH - /* Maximum math bits (Max RSA key bits * 2) */ - #undef FP_MAX_BITS - #define FP_MAX_BITS 8192 - #endif /* half as much memory but twice as slow */ - #undef RSA_LOW_MEM + #undef RSA_LOW_MEM //#define RSA_LOW_MEM /* Enables blinding mode, to prevent timing attacks */ #if 0 - #undef WC_RSA_BLINDING + #undef WC_RSA_BLINDING #define WC_RSA_BLINDING #else - #undef WC_NO_HARDEN + #undef WC_NO_HARDEN #define WC_NO_HARDEN #endif /* RSA PSS Support */ #if 1 + #undef WC_RSA_PSS #define WC_RSA_PSS + + #undef WOLFSSL_PSS_LONG_SALT + #define WOLFSSL_PSS_LONG_SALT + + #undef WOLFSSL_PSS_SALT_LEN_DISCOVER + #define WOLFSSL_PSS_SALT_LEN_DISCOVER #endif #if 1 @@ -141,86 +182,86 @@ extern "C" { #define HAVE_ECC /* Manually define enabled curves */ - #undef ECC_USER_CURVES - //#define ECC_USER_CURVES + #undef ECC_USER_CURVES + #define ECC_USER_CURVES #ifdef ECC_USER_CURVES - /* Manual Curve Selection */ - //#define HAVE_ECC192 - //#define HAVE_ECC224 - #undef NO_ECC256 - //#define HAVE_ECC384 - //#define HAVE_ECC521 + /* Manual Curve Selection */ + #define HAVE_ECC192 + #define HAVE_ECC224 + #undef NO_ECC256 + #define HAVE_ECC256 + #define HAVE_ECC384 + #define HAVE_ECC521 #endif - /* Fixed point cache (speeds repeated operations against same private key) */ - #undef FP_ECC + /* Fixed point cache (speeds repeated operations against same private key) + */ + #undef FP_ECC //#define FP_ECC #ifdef FP_ECC /* Bits / Entries */ - #undef FP_ENTRIES - #define FP_ENTRIES 2 - #undef FP_LUT - #define FP_LUT 4 + #undef FP_ENTRIES + #define FP_ENTRIES 2 + #undef FP_LUT + #define FP_LUT 4 #endif /* Optional ECC calculation method */ /* Note: doubles heap usage, but slightly faster */ - #undef ECC_SHAMIR + #undef ECC_SHAMIR #define ECC_SHAMIR /* Reduces heap usage, but slower */ - #undef ECC_TIMING_RESISTANT + #undef ECC_TIMING_RESISTANT #define ECC_TIMING_RESISTANT #ifdef HAVE_FIPS - #undef HAVE_ECC_CDH + #undef HAVE_ECC_CDH #define HAVE_ECC_CDH /* Enable cofactor support */ #undef NO_STRICT_ECDSA_LEN #define NO_STRICT_ECDSA_LEN /* Do not force fixed len w/ FIPS */ - #undef WOLFSSL_VALIDATE_ECC_IMPORT + #undef WOLFSSL_VALIDATE_ECC_IMPORT #define WOLFSSL_VALIDATE_ECC_IMPORT /* Validate import */ - #endif - /* Compressed Key Support */ - #undef HAVE_COMP_KEY - //#define HAVE_COMP_KEY + #undef WOLFSSL_VALIDATE_ECC_KEYGEN + #define WOLFSSL_VALIDATE_ECC_KEYGEN /* Validate generated keys */ + + #undef WOLFSSL_ECDSA_SET_K + #define WOLFSSL_ECDSA_SET_K + + //#define WOLFCRYPT_HAVE_SAKKE + + #endif /* Use alternate ECC size for ECC math */ #ifdef USE_FAST_MATH - /* MAX ECC BITS = ROUND8(MAX ECC) * 2 */ - #ifdef NO_RSA - /* Custom fastmath size if not using RSA */ - #undef FP_MAX_BITS - #define FP_MAX_BITS (256 * 2) - #else - #undef ALT_ECC_SIZE - #define ALT_ECC_SIZE - /* wolfSSL will compute the FP_MAX_BITS_ECC, but it can be overridden */ - //#undef FP_MAX_BITS_ECC - //#define FP_MAX_BITS_ECC (256 * 2) - #endif + #undef ALT_ECC_SIZE + #define ALT_ECC_SIZE /* Speedups specific to curve */ #ifndef NO_ECC256 - #undef TFM_ECC256 + #undef TFM_ECC256 #define TFM_ECC256 #endif #endif #endif /* DH */ -#undef NO_DH +#undef NO_DH #if 1 + #define HAVE_DH /* Use table for DH instead of -lm (math) lib dependency */ #if 1 + #define HAVE_DH_DEFAULT_PARAMS #define WOLFSSL_DH_CONST #define HAVE_FFDHE_2048 + #define HAVE_FFDHE_3072 #define HAVE_FFDHE_4096 - //#define HAVE_FFDHE_6144 - //#define HAVE_FFDHE_8192 + #define HAVE_FFDHE_6144 + #define HAVE_FFDHE_8192 #endif #ifdef HAVE_FIPS @@ -235,28 +276,31 @@ extern "C" { /* AES */ #undef NO_AES #if 1 - #undef HAVE_AES_CBC + #undef HAVE_AES_CBC #define HAVE_AES_CBC - #undef HAVE_AESGCM + #undef HAVE_AESGCM #define HAVE_AESGCM - /* GCM Method: GCM_SMALL, GCM_WORD32 or GCM_TABLE */ - // #define GCM_SMALL - // #define GCM_WORD32 - #define GCM_TABLE + /* GCM Method (slowest to fastest): GCM_SMALL, GCM_WORD32, GCM_TABLE or + * GCM_TABLE_4BIT */ + #define GCM_TABLE_4BIT - #undef WOLFSSL_AES_DIRECT + #undef WOLFSSL_AES_DIRECT #define WOLFSSL_AES_DIRECT - #undef HAVE_AES_ECB + #undef HAVE_AES_ECB #define HAVE_AES_ECB - #undef WOLFSSL_AES_COUNTER + #undef WOLFSSL_AES_COUNTER #define WOLFSSL_AES_COUNTER - #undef HAVE_AESCCM + #undef HAVE_AESCCM #define HAVE_AESCCM + + #undef WOLFSSL_AES_OFB + #define WOLFSSL_AES_OFB + #else #define NO_AES #endif @@ -264,8 +308,11 @@ extern "C" { /* DES3 */ #undef NO_DES3 -#if 1 - /* No change */ +#if 0 + #if 1 + #undef WOLFSSL_DES_ECB + #define WOLFSSL_DES_ECB + #endif #else #define NO_DES3 #endif @@ -278,20 +325,29 @@ extern "C" { #define HAVE_POLY1305 /* Needed for Poly1305 */ - #undef HAVE_ONE_TIME_AUTH + #undef HAVE_ONE_TIME_AUTH #define HAVE_ONE_TIME_AUTH #endif -/* Ed25519 / Curve25519 */ +/* Curve25519 */ #undef HAVE_CURVE25519 -#undef HAVE_ED25519 #if 0 #define HAVE_CURVE25519 + + /* Optionally use small math (less flash usage, but much slower) */ + #if 1 + #define CURVE25519_SMALL + #endif +#endif + +/* Ed25519 */ +#undef HAVE_ED25519 +#if 0 #define HAVE_ED25519 /* ED25519 Requires SHA512 */ /* Optionally use small math (less flash usage, but much slower) */ #if 1 - #define CURVED25519_SMALL + #define ED25519_SMALL #endif #endif @@ -303,7 +359,7 @@ extern "C" { #undef NO_SHA #if 1 /* 1k smaller, but 25% slower */ - //#define USE_SLOW_SHA + #define USE_SLOW_SHA #else #define NO_SHA #endif @@ -312,7 +368,7 @@ extern "C" { #undef NO_SHA256 #if 1 /* not unrolled - ~2k smaller and ~25% slower */ - //#define USE_SLOW_SHA256 + #define USE_SLOW_SHA256 /* Sha224 */ #if 1 @@ -327,14 +383,17 @@ extern "C" { #if 1 #define WOLFSSL_SHA512 + #define WOLFSSL_NOSHA512_224 /* Not in FIPS mode */ + #define WOLFSSL_NOSHA512_256 /* Not in FIPS mode */ + /* Sha384 */ - #undef WOLFSSL_SHA384 + #undef WOLFSSL_SHA384 #if 1 #define WOLFSSL_SHA384 #endif /* over twice as small, but 50% slower */ - //#define USE_SLOW_SHA512 + #define USE_SLOW_SHA512 #endif /* Sha3 */ @@ -344,17 +403,18 @@ extern "C" { #endif /* MD5 */ -#undef NO_MD5 +#undef NO_MD5 #if 1 - /* No change */ + #else #define NO_MD5 #endif -/* HKDF */ +/* HKDF / PRF */ #undef HAVE_HKDF #if 1 #define HAVE_HKDF + #define WOLFSSL_HAVE_PRF #endif /* CMAC */ @@ -363,101 +423,49 @@ extern "C" { #define WOLFSSL_CMAC #endif - -/* ------------------------------------------------------------------------- */ -/* Benchmark / Test */ -/* ------------------------------------------------------------------------- */ -/* Use reduced benchmark / test sizes */ -#undef BENCH_EMBEDDED -#define BENCH_EMBEDDED - -#undef USE_CERT_BUFFERS_2048 -#define USE_CERT_BUFFERS_2048 - -#undef USE_CERT_BUFFERS_1024 -//#define USE_CERT_BUFFERS_1024 - -#undef USE_CERT_BUFFERS_256 -#define USE_CERT_BUFFERS_256 - -#undef FORCE_BUFFER_TEST -#define FORCE_BUFFER_TEST - - /* ------------------------------------------------------------------------- */ /* Debugging */ /* ------------------------------------------------------------------------- */ -#undef DEBUG_WOLFSSL -#undef NO_ERROR_STRINGS -#if 0 - #define DEBUG_WOLFSSL -#else - #if 0 - #define NO_ERROR_STRINGS - #endif -#endif - - -/* ------------------------------------------------------------------------- */ -/* Memory */ -/* ------------------------------------------------------------------------- */ +#undef DEBUG_WOLFSSL +#define DEBUG_WOLFSSL -/* Override Memory API's */ +/* Use this to measure / print heap usage */ #if 0 - #undef XMALLOC_OVERRIDE - #define XMALLOC_OVERRIDE + #undef USE_WOLFSSL_MEMORY + #define USE_WOLFSSL_MEMORY - /* prototypes for user heap override functions */ - /* Note: Realloc only required for normal math */ - /* Note2: XFREE(NULL) must be properly handled */ - #include /* for size_t */ - extern void *myMalloc(size_t n, void* heap, int type); - extern void myFree(void *p, void* heap, int type); - extern void *myRealloc(void *p, size_t n, void* heap, int type); + #undef WOLFSSL_TRACK_MEMORY + //#define WOLFSSL_TRACK_MEMORY - #define XMALLOC(n, h, t) myMalloc(n, h, t) - #define XFREE(p, h, t) myFree(p, h, t) - #define XREALLOC(p, n, h, t) myRealloc(p, n, h, t) + #undef WOLFSSL_DEBUG_MEMORY + //#define WOLFSSL_DEBUG_MEMORY +#else + #undef NO_WOLFSSL_MEMORY + #define NO_WOLFSSL_MEMORY #endif -#if 0 - /* Static memory requires fast math */ - #define WOLFSSL_STATIC_MEMORY - - /* Disable fallback malloc/free */ - #define WOLFSSL_NO_MALLOC - #if 1 - #define WOLFSSL_MALLOC_CHECK /* trap malloc failure */ - #endif +#ifndef DEBUG_WOLFSSL + #undef NO_ERROR_STRINGS + #define NO_ERROR_STRINGS #endif -/* Memory callbacks */ -#if 1 - #undef USE_WOLFSSL_MEMORY - #define USE_WOLFSSL_MEMORY - /* Use this to measure / print heap usage */ - #if 0 - #undef WOLFSSL_TRACK_MEMORY - // #define WOLFSSL_TRACK_MEMORY +/* ------------------------------------------------------------------------- */ +/* Port */ +/* ------------------------------------------------------------------------- */ - #undef WOLFSSL_DEBUG_MEMORY - //#define WOLFSSL_DEBUG_MEMORY +/* Override Current Time */ +/* Allows custom "custom_time()" function to be used for benchmark */ +//#define WOLFSSL_USER_CURRTIME +//#define XTIME time - #undef WOLFSSL_DEBUG_MEMORY_PRINT - //#define WOLFSSL_DEBUG_MEMORY_PRINT - #endif -#else - #ifndef WOLFSSL_STATIC_MEMORY - #define NO_WOLFSSL_MEMORY - /* Otherwise we will use stdlib malloc, free and realloc */ - #endif -#endif /* ------------------------------------------------------------------------- */ /* RNG */ /* ------------------------------------------------------------------------- */ +/* Size of returned HW RNG value */ +//#define CUSTOM_RAND_TYPE unsigned int /* Seed Source */ #if 1 @@ -473,152 +481,194 @@ extern "C" { #define CUSTOM_RAND_TYPE unsigned char #endif +//#define WOLFSSL_GENSEED_FORTEST /* Choose RNG method */ #if 1 /* Use built-in P-RNG (SHA256 based) with HW RNG */ /* P-RNG + HW RNG (P-RNG is ~8K) */ - //#define WOLFSSL_GENSEED_FORTEST - #undef HAVE_HASHDRBG + #undef HAVE_HASHDRBG #define HAVE_HASHDRBG #else - #undef WC_NO_HASHDRBG + #undef WC_NO_HASHDRBG #define WC_NO_HASHDRBG /* Bypass P-RNG and use only HW RNG */ - extern int my_rng_gen_block(unsigned char* output, unsigned int sz); - #undef CUSTOM_RAND_GENERATE_BLOCK - #define CUSTOM_RAND_GENERATE_BLOCK my_rng_gen_block + extern int custom_rand_generate_block(unsigned char* output, + unsigned int sz); + #undef CUSTOM_RAND_GENERATE_BLOCK + #define CUSTOM_RAND_GENERATE_BLOCK custom_rand_generate_block #endif /* ------------------------------------------------------------------------- */ /* Enable Features */ /* ------------------------------------------------------------------------- */ -#undef WOLFSSL_TLS13 #if 0 + #undef WOLFSSL_TLS13 #define WOLFSSL_TLS13 #endif -#undef WOLFSSL_KEY_GEN -#if 1 - #define WOLFSSL_KEY_GEN -#endif - -#if defined(HAVE_FIPS) && !defined(WOLFSSL_KEY_GEN) - #define WOLFSSL_OLD_PRIME_CHECK -#endif +#undef WOLFSSL_KEY_GEN +#define WOLFSSL_KEY_GEN -#undef KEEP_PEER_CERT +#undef KEEP_PEER_CERT //#define KEEP_PEER_CERT -#undef HAVE_COMP_KEY +#undef HAVE_COMP_KEY //#define HAVE_COMP_KEY -#undef HAVE_TLS_EXTENSIONS +#undef HAVE_TLS_EXTENSIONS #define HAVE_TLS_EXTENSIONS -#undef HAVE_SUPPORTED_CURVES +#undef HAVE_SUPPORTED_CURVES #define HAVE_SUPPORTED_CURVES -#undef WOLFSSL_BASE64_ENCODE +#undef WOLFSSL_BASE64_ENCODE #define WOLFSSL_BASE64_ENCODE +#undef WOLFSSL_BASE16 +#define WOLFSSL_BASE16 + /* TLS Session Cache */ -#if 0 +#if 1 #define SMALL_SESSION_CACHE #else #define NO_SESSION_CACHE #endif +#define BENCH_EMBEDDED /* ------------------------------------------------------------------------- */ /* Disable Features */ /* ------------------------------------------------------------------------- */ -#undef NO_WOLFSSL_SERVER +#undef NO_WOLFSSL_SERVER //#define NO_WOLFSSL_SERVER -#undef NO_WOLFSSL_CLIENT +#undef NO_WOLFSSL_CLIENT //#define NO_WOLFSSL_CLIENT -#undef NO_CRYPT_TEST +#undef NO_CRYPT_TEST //#define NO_CRYPT_TEST -#undef NO_CRYPT_BENCHMARK +#undef NO_CRYPT_BENCHMARK //#define NO_CRYPT_BENCHMARK -#undef WOLFCRYPT_ONLY +#undef WOLFCRYPT_ONLY //#define WOLFCRYPT_ONLY /* In-lining of misc.c functions */ /* If defined, must include wolfcrypt/src/misc.c in build */ /* Slower, but about 1k smaller */ -#undef NO_INLINE +#undef NO_INLINE //#define NO_INLINE -#undef NO_FILESYSTEM +#undef NO_FILESYSTEM #define NO_FILESYSTEM #undef NO_WOLFSSL_DIR #define NO_WOLFSSL_DIR -#undef NO_WRITEV +#undef NO_WRITEV #define NO_WRITEV -#undef NO_MAIN_DRIVER +#undef NO_MAIN_DRIVER #define NO_MAIN_DRIVER -#undef NO_DEV_RANDOM +#undef NO_DEV_RANDOM #define NO_DEV_RANDOM -#undef NO_DSA +#undef NO_DSA #define NO_DSA -#undef NO_RC4 +#undef NO_DES3 +#define NO_DES3 + +#undef NO_RC4 #define NO_RC4 -#undef NO_OLD_TLS +#undef NO_OLD_TLS #define NO_OLD_TLS -#undef NO_PSK +#undef NO_PSK #define NO_PSK -#undef NO_MD4 +#undef NO_MD4 #define NO_MD4 -#undef NO_PWDBASED +#undef NO_PWDBASED //#define NO_PWDBASED -#undef NO_CODING +#undef NO_CODING //#define NO_CODING -#undef NO_ASN_TIME +#undef NO_ASN_TIME //#define NO_ASN_TIME -#undef NO_CERTS +#undef NO_CERTS //#define NO_CERTS -#undef NO_SIG_WRAPPER +#undef NO_SIG_WRAPPER //#define NO_SIG_WRAPPER -/* ACVP Testing ONLY specific settings */ +/* FIPS optesting for wolfSSL Engineering only, disable in production */ #if 0 - #undef USE_NORMAL_PRINTF - #define USE_NORMAL_PRINTF - - #undef USE_UART_READ_LINE + #define DEBUG_FIPS_VERBOSE + #define NO_CAVP_TDES #define USE_UART_READ_LINE - - #undef USE_SMALL_MONTE - #define USE_SMALL_MONTE - - #undef WOLFSSL_PUBLIC_MP + #define USE_NORMAL_PRINTF #define WOLFSSL_PUBLIC_MP - #undef HAVE_FORCE_FIPS_FAILURE + #define NO_MAIN_OPTEST_DRIVER + #define OPTEST_LOGGING_ENABLED + #define DEBUG_FIPS_VERBOSE + #define OPTEST_INVALID_LOGGING_ENABLED + #define OPTEST_RUNNING_ORGANIC #define HAVE_FORCE_FIPS_FAILURE + + #define USE_CERT_BUFFERS_2048 + #define USE_CERT_BUFFERS_256 + #define FORCE_BUFFER_TEST + #define NO_MAIN_OPTEST_DRIVER + #define DEEPLY_EMBEDDED + #endif +/* End optesting only section */ + +/* START Customer specified options */ +#if 1 + #undef HAVE_SECRET_CALLBACK + #define HAVE_SECRET_CALLBACK + + #undef ATOMIC_USER + #define ATOMIC_USER + + #undef HAVE_EX_DATA + #define HAVE_EX_DATA + #undef NO_WOLFSSL_STUB + #define NO_WOLFSSL_STUB + + #undef OPENSSL_EXTRA + #define OPENSSL_EXTRA + + #undef OPENSSL_ALL + #define OPENSSL_ALL + + #undef HAVE_EXTENDED_MASTER + #define HAVE_EXTENDED_MASTER + + #undef WC_NO_ASYNC_THREADING + #define WC_NO_ASYNC_THREADING + + #undef NO_TESTSUITE_MAIN_DRIVER + #define NO_TESTSUITE_MAIN_DRIVER + + #undef WOLFSSL_NO_ASN_STRICT + #define WOLFSSL_NO_ASN_STRICT +#endif +/* END Customer specified options */ #ifdef __cplusplus } #endif #endif /* WOLFSSL_USER_SETTINGS_H */ + diff --git a/IDE/NETOS/user_settings.h-cert2425 b/IDE/NETOS/user_settings.h-cert2425 index d9919a3843..d845ea12f7 100644 --- a/IDE/NETOS/user_settings.h-cert2425 +++ b/IDE/NETOS/user_settings.h-cert2425 @@ -1,3 +1,25 @@ +/* user_settings.h + * + * Copyright (C) 2006-2024 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ + + #ifndef _NETOS_USER_SETTINGS_H_ #define _NETOS_USER_SETTINGS_H_ diff --git a/IDE/NETOS/user_settings.h-cert3389 b/IDE/NETOS/user_settings.h-cert3389 new file mode 100755 index 0000000000..a9fca9e51c --- /dev/null +++ b/IDE/NETOS/user_settings.h-cert3389 @@ -0,0 +1,623 @@ +/* user_settings.h + * + * Copyright (C) 2006-2024 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ + +/* Custom wolfSSL user settings for GCC ARM */ + +#ifndef WOLFSSL_USER_SETTINGS_H +#define WOLFSSL_USER_SETTINGS_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------------------------------------------------------------- */ +/* Platform */ +/* ------------------------------------------------------------------------- */ +#undef WOLFSSL_GENERAL_ALIGNMENT +#define WOLFSSL_GENERAL_ALIGNMENT 4 + +#undef THREADX +#define THREADX + +#ifndef TX_TIMER_TICKS_PER_SECOND + #define TX_TIMER_TICKS_PER_SECOND 100 +#endif + +#undef NETOS +#define NETOS + +#undef BIG_ENDIAN_ORDER +#define BIG_ENDIAN_ORDER + +#undef WOLFSSL_SMALL_STACK +//#define WOLFSSL_SMALL_STACK + +#undef WOLFSSL_USER_IO +//#define WOLFSSL_USER_IO + +#undef NO_THREAD_LS +#define NO_THREAD_LS + +/* ------------------------------------------------------------------------- */ +/* Math Configuration */ +/* ------------------------------------------------------------------------- */ +#undef SIZEOF_LONG_LONG +#define SIZEOF_LONG_LONG 8 + +#undef SIZEOF_LONG +#define SIZEOF_LONG 4 + +#undef USE_FAST_MATH +#if 1 + #define USE_FAST_MATH + + #undef TFM_TIMING_RESISTANT + #define TFM_TIMING_RESISTANT + + /* Optimizations */ + #define TFM_ARM +#endif + +/* ------------------------------------------------------------------------- */ +/* FIPS - Requires eval or license from wolfSSL */ +/* ------------------------------------------------------------------------- */ +#undef HAVE_FIPS +#if 1 + #define HAVE_FIPS + + #undef HAVE_FIPS_VERSION + #define HAVE_FIPS_VERSION 2 + + #ifdef SINGLE_THREADED + #undef NO_THREAD_LS + #define NO_THREAD_LS + #endif + + #if 1 + #undef NO_ATTRIBUTE_CONSTRUCTOR + #define NO_ATTRIBUTE_CONSTRUCTOR + #endif +#endif + + +/* ------------------------------------------------------------------------- */ +/* Crypto */ +/* ------------------------------------------------------------------------- */ +/* RSA */ +#undef NO_RSA +#if 1 + #ifdef USE_FAST_MATH + /* Maximum math bits (Max RSA key bits * 2) */ + #undef FP_MAX_BITS + #define FP_MAX_BITS 8192 + #endif + + /* half as much memory but twice as slow */ + #undef RSA_LOW_MEM + //#define RSA_LOW_MEM + + /* Enables blinding mode, to prevent timing attacks */ + #if 0 + #undef WC_RSA_BLINDING + #define WC_RSA_BLINDING + #else + #undef WC_NO_HARDEN + #define WC_NO_HARDEN + #endif + + /* RSA PSS Support */ + #if 1 + #define WC_RSA_PSS + #endif + + #if 1 + #define WC_RSA_NO_PADDING + #endif +#else + #define NO_RSA +#endif + +/* ECC */ +#undef HAVE_ECC +#if 1 + #define HAVE_ECC + + /* Manually define enabled curves */ + #undef ECC_USER_CURVES + //#define ECC_USER_CURVES + + #ifdef ECC_USER_CURVES + /* Manual Curve Selection */ + //#define HAVE_ECC192 + //#define HAVE_ECC224 + #undef NO_ECC256 + //#define HAVE_ECC384 + //#define HAVE_ECC521 + #endif + + /* Fixed point cache (speeds repeated operations against same private key) */ + #undef FP_ECC + //#define FP_ECC + #ifdef FP_ECC + /* Bits / Entries */ + #undef FP_ENTRIES + #define FP_ENTRIES 2 + #undef FP_LUT + #define FP_LUT 4 + #endif + + /* Optional ECC calculation method */ + /* Note: doubles heap usage, but slightly faster */ + #undef ECC_SHAMIR + #define ECC_SHAMIR + + /* Reduces heap usage, but slower */ + #undef ECC_TIMING_RESISTANT + #define ECC_TIMING_RESISTANT + + #ifdef HAVE_FIPS + #undef HAVE_ECC_CDH + #define HAVE_ECC_CDH /* Enable cofactor support */ + + #undef NO_STRICT_ECDSA_LEN + #define NO_STRICT_ECDSA_LEN /* Do not force fixed len w/ FIPS */ + + #undef WOLFSSL_VALIDATE_ECC_IMPORT + #define WOLFSSL_VALIDATE_ECC_IMPORT /* Validate import */ + #endif + + /* Compressed Key Support */ + #undef HAVE_COMP_KEY + //#define HAVE_COMP_KEY + + /* Use alternate ECC size for ECC math */ + #ifdef USE_FAST_MATH + /* MAX ECC BITS = ROUND8(MAX ECC) * 2 */ + #ifdef NO_RSA + /* Custom fastmath size if not using RSA */ + #undef FP_MAX_BITS + #define FP_MAX_BITS (256 * 2) + #else + #undef ALT_ECC_SIZE + #define ALT_ECC_SIZE + /* wolfSSL will compute the FP_MAX_BITS_ECC, but it can be overridden */ + //#undef FP_MAX_BITS_ECC + //#define FP_MAX_BITS_ECC (256 * 2) + #endif + + /* Speedups specific to curve */ + #ifndef NO_ECC256 + #undef TFM_ECC256 + #define TFM_ECC256 + #endif + #endif +#endif + +/* DH */ +#undef NO_DH +#if 1 + /* Use table for DH instead of -lm (math) lib dependency */ + #if 1 + #define WOLFSSL_DH_CONST + #define HAVE_FFDHE_2048 + #define HAVE_FFDHE_4096 + //#define HAVE_FFDHE_6144 + //#define HAVE_FFDHE_8192 + #endif + + #ifdef HAVE_FIPS + #define WOLFSSL_VALIDATE_FFC_IMPORT + #define HAVE_FFDHE_Q + #endif +#else + #define NO_DH +#endif + + +/* AES */ +#undef NO_AES +#if 1 + #undef HAVE_AES_CBC + #define HAVE_AES_CBC + + #undef HAVE_AESGCM + #define HAVE_AESGCM + + /* GCM Method: GCM_SMALL, GCM_WORD32 or GCM_TABLE */ + // #define GCM_SMALL + // #define GCM_WORD32 + #define GCM_TABLE + + #undef WOLFSSL_AES_DIRECT + #define WOLFSSL_AES_DIRECT + + #undef HAVE_AES_ECB + #define HAVE_AES_ECB + + #undef WOLFSSL_AES_COUNTER + #define WOLFSSL_AES_COUNTER + + #undef HAVE_AESCCM + #define HAVE_AESCCM +#else + #define NO_AES +#endif + + +/* DES3 */ +#undef NO_DES3 +#if 1 + /* No change */ +#else + #define NO_DES3 +#endif + +/* ChaCha20 / Poly1305 */ +#undef HAVE_CHACHA +#undef HAVE_POLY1305 +#if 0 + #define HAVE_CHACHA + #define HAVE_POLY1305 + + /* Needed for Poly1305 */ + #undef HAVE_ONE_TIME_AUTH + #define HAVE_ONE_TIME_AUTH +#endif + +/* Ed25519 / Curve25519 */ +#undef HAVE_CURVE25519 +#undef HAVE_ED25519 +#if 0 + #define HAVE_CURVE25519 + #define HAVE_ED25519 /* ED25519 Requires SHA512 */ + + /* Optionally use small math (less flash usage, but much slower) */ + #if 1 + #define CURVED25519_SMALL + #endif +#endif + + +/* ------------------------------------------------------------------------- */ +/* Hashing */ +/* ------------------------------------------------------------------------- */ +/* Sha */ +#undef NO_SHA +#if 1 + /* 1k smaller, but 25% slower */ + //#define USE_SLOW_SHA +#else + #define NO_SHA +#endif + +/* Sha256 */ +#undef NO_SHA256 +#if 1 + /* not unrolled - ~2k smaller and ~25% slower */ + //#define USE_SLOW_SHA256 + + /* Sha224 */ + #if 1 + #define WOLFSSL_SHA224 + #endif +#else + #define NO_SHA256 +#endif + +/* Sha512 */ +#undef WOLFSSL_SHA512 +#if 1 + #define WOLFSSL_SHA512 + + /* Sha384 */ + #undef WOLFSSL_SHA384 + #if 1 + #define WOLFSSL_SHA384 + #endif + + /* over twice as small, but 50% slower */ + //#define USE_SLOW_SHA512 +#endif + +/* Sha3 */ +#undef WOLFSSL_SHA3 +#if 1 + #define WOLFSSL_SHA3 +#endif + +/* MD5 */ +#undef NO_MD5 +#if 1 + /* No change */ +#else + #define NO_MD5 +#endif + +/* HKDF */ +#undef HAVE_HKDF +#if 1 + #define HAVE_HKDF +#endif + +/* CMAC */ +#undef WOLFSSL_CMAC +#if 1 + #define WOLFSSL_CMAC +#endif + + +/* ------------------------------------------------------------------------- */ +/* Benchmark / Test */ +/* ------------------------------------------------------------------------- */ +/* Use reduced benchmark / test sizes */ +#undef BENCH_EMBEDDED +#define BENCH_EMBEDDED + +#undef USE_CERT_BUFFERS_2048 +#define USE_CERT_BUFFERS_2048 + +#undef USE_CERT_BUFFERS_1024 +//#define USE_CERT_BUFFERS_1024 + +#undef USE_CERT_BUFFERS_256 +#define USE_CERT_BUFFERS_256 + +#undef FORCE_BUFFER_TEST +#define FORCE_BUFFER_TEST + + +/* ------------------------------------------------------------------------- */ +/* Debugging */ +/* ------------------------------------------------------------------------- */ + +#undef DEBUG_WOLFSSL +#undef NO_ERROR_STRINGS +#if 0 + #define DEBUG_WOLFSSL +#else + #if 0 + #define NO_ERROR_STRINGS + #endif +#endif + + +/* ------------------------------------------------------------------------- */ +/* Memory */ +/* ------------------------------------------------------------------------- */ + +/* Override Memory API's */ +#if 0 + #undef XMALLOC_OVERRIDE + #define XMALLOC_OVERRIDE + + /* prototypes for user heap override functions */ + /* Note: Realloc only required for normal math */ + #include /* for size_t */ + extern void *myMalloc(size_t n, void* heap, int type); + extern void myFree(void *p, void* heap, int type); + extern void *myRealloc(void *p, size_t n, void* heap, int type); + + #define XMALLOC(n, h, t) myMalloc(n, h, t) + #define XFREE(p, h, t) myFree(p, h, t) + #define XREALLOC(p, n, h, t) myRealloc(p, n, h, t) +#endif + +#if 0 + /* Static memory requires fast math */ + #define WOLFSSL_STATIC_MEMORY + + /* Disable fallback malloc/free */ + #define WOLFSSL_NO_MALLOC + #if 1 + #define WOLFSSL_MALLOC_CHECK /* trap malloc failure */ + #endif +#endif + +/* Memory callbacks */ +#if 1 + #undef USE_WOLFSSL_MEMORY + #define USE_WOLFSSL_MEMORY + + /* Use this to measure / print heap usage */ + #if 0 + #undef WOLFSSL_TRACK_MEMORY + // #define WOLFSSL_TRACK_MEMORY + + #undef WOLFSSL_DEBUG_MEMORY + //#define WOLFSSL_DEBUG_MEMORY + + #undef WOLFSSL_DEBUG_MEMORY_PRINT + //#define WOLFSSL_DEBUG_MEMORY_PRINT + #endif +#else + #ifndef WOLFSSL_STATIC_MEMORY + #define NO_WOLFSSL_MEMORY + /* Otherwise we will use stdlib malloc, free and realloc */ + #endif +#endif + +/* ------------------------------------------------------------------------- */ +/* RNG */ +/* ------------------------------------------------------------------------- */ + +/* Seed Source */ +#if 1 + extern int my_rng_generate_seed(unsigned char* output, int sz); + #undef CUSTOM_RAND_GENERATE_SEED + #define CUSTOM_RAND_GENERATE_SEED my_rng_generate_seed +#endif + +/* NETOS */ +#if 0 + extern unsigned char get_byte_from_pool(void); + #define CUSTOM_RAND_GENERATE get_byte_from_pool + #define CUSTOM_RAND_TYPE unsigned char +#endif + +/* Choose RNG method */ +#if 1 + /* Use built-in P-RNG (SHA256 based) with HW RNG */ + /* P-RNG + HW RNG (P-RNG is ~8K) */ + //#define WOLFSSL_GENSEED_FORTEST + #undef HAVE_HASHDRBG + #define HAVE_HASHDRBG +#else + #undef WC_NO_HASHDRBG + #define WC_NO_HASHDRBG + + /* Bypass P-RNG and use only HW RNG */ + extern int my_rng_gen_block(unsigned char* output, unsigned int sz); + #undef CUSTOM_RAND_GENERATE_BLOCK + #define CUSTOM_RAND_GENERATE_BLOCK my_rng_gen_block +#endif + +/* ------------------------------------------------------------------------- */ +/* Enable Features */ +/* ------------------------------------------------------------------------- */ +#undef WOLFSSL_TLS13 +#if 0 + #define WOLFSSL_TLS13 +#endif + +#undef WOLFSSL_KEY_GEN +#if 1 + #define WOLFSSL_KEY_GEN +#endif + +#if defined(HAVE_FIPS) && !defined(WOLFSSL_KEY_GEN) + #define WOLFSSL_OLD_PRIME_CHECK +#endif + +#undef KEEP_PEER_CERT +//#define KEEP_PEER_CERT + +#undef HAVE_COMP_KEY +//#define HAVE_COMP_KEY + +#undef HAVE_TLS_EXTENSIONS +#define HAVE_TLS_EXTENSIONS + +#undef HAVE_SUPPORTED_CURVES +#define HAVE_SUPPORTED_CURVES + +#undef WOLFSSL_BASE64_ENCODE +#define WOLFSSL_BASE64_ENCODE + +/* TLS Session Cache */ +#if 0 + #define SMALL_SESSION_CACHE +#else + #define NO_SESSION_CACHE +#endif + + +/* ------------------------------------------------------------------------- */ +/* Disable Features */ +/* ------------------------------------------------------------------------- */ +#undef NO_WOLFSSL_SERVER +//#define NO_WOLFSSL_SERVER + +#undef NO_WOLFSSL_CLIENT +//#define NO_WOLFSSL_CLIENT + +#undef NO_CRYPT_TEST +//#define NO_CRYPT_TEST + +#undef NO_CRYPT_BENCHMARK +//#define NO_CRYPT_BENCHMARK + +#undef WOLFCRYPT_ONLY +//#define WOLFCRYPT_ONLY + +/* In-lining of misc.c functions */ +/* If defined, must include wolfcrypt/src/misc.c in build */ +/* Slower, but about 1k smaller */ +#undef NO_INLINE +//#define NO_INLINE + +#undef NO_FILESYSTEM +#define NO_FILESYSTEM + +#undef NO_WOLFSSL_DIR +#define NO_WOLFSSL_DIR + +#undef NO_WRITEV +#define NO_WRITEV + +#undef NO_MAIN_DRIVER +#define NO_MAIN_DRIVER + +#undef NO_DEV_RANDOM +#define NO_DEV_RANDOM + +#undef NO_DSA +#define NO_DSA + +#undef NO_RC4 +#define NO_RC4 + +#undef NO_OLD_TLS +#define NO_OLD_TLS + +#undef NO_PSK +#define NO_PSK + +#undef NO_MD4 +#define NO_MD4 + +#undef NO_PWDBASED +//#define NO_PWDBASED + +#undef NO_CODING +//#define NO_CODING + +#undef NO_ASN_TIME +//#define NO_ASN_TIME + +#undef NO_CERTS +//#define NO_CERTS + +#undef NO_SIG_WRAPPER +//#define NO_SIG_WRAPPER + +/* ACVP Testing ONLY specific settings */ +#if 0 + #undef USE_NORMAL_PRINTF + #define USE_NORMAL_PRINTF + + #undef USE_UART_READ_LINE + #define USE_UART_READ_LINE + + #undef USE_SMALL_MONTE + #define USE_SMALL_MONTE + + #undef WOLFSSL_PUBLIC_MP + #define WOLFSSL_PUBLIC_MP + + #undef HAVE_FORCE_FIPS_FAILURE + #define HAVE_FORCE_FIPS_FAILURE +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* WOLFSSL_USER_SETTINGS_H */ diff --git a/IDE/NETOS/wolfssl_netos_custom.c b/IDE/NETOS/wolfssl_netos_custom.c index db4b518aa0..ac634e7bb8 100644 --- a/IDE/NETOS/wolfssl_netos_custom.c +++ b/IDE/NETOS/wolfssl_netos_custom.c @@ -68,7 +68,7 @@ unsigned char get_byte_from_pool(void) int my_rng_generate_seed(unsigned char* output, int sz) { - word32 i; + int i; srand(get_byte_from_pool()); for (i = 0; i < sz; i++) { diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 9078c0bf6c..16dc9a9c30 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -510,6 +510,7 @@ #undef printf #define printf XPRINTF #elif defined(NETOS) + int dc_log_printf(char* format, ...); #undef printf #define printf dc_log_printf #endif