Merge pull request #4803 from danielinux/tirtos-update-202201

Update TIRTOS support
This commit is contained in:
Kaleb Himes
2022-04-28 10:12:32 -05:00
committed by GitHub
3 changed files with 33 additions and 14 deletions

View File

@ -26,6 +26,7 @@ var wolfSSLObjList = [
"wolfcrypt/src/hmac.c", "wolfcrypt/src/hmac.c",
"wolfcrypt/src/hash.c", "wolfcrypt/src/hash.c",
"wolfcrypt/src/integer.c", "wolfcrypt/src/integer.c",
"wolfcrypt/src/kdf.c",
"wolfcrypt/src/logging.c", "wolfcrypt/src/logging.c",
"wolfcrypt/src/md4.c", "wolfcrypt/src/md4.c",
"wolfcrypt/src/md5.c", "wolfcrypt/src/md5.c",
@ -37,6 +38,9 @@ var wolfSSLObjList = [
"wolfcrypt/src/sha.c", "wolfcrypt/src/sha.c",
"wolfcrypt/src/sha256.c", "wolfcrypt/src/sha256.c",
"wolfcrypt/src/sha512.c", "wolfcrypt/src/sha512.c",
"wolfcrypt/src/sp_int.c",
"wolfcrypt/src/sp_c32.c",
"wolfcrypt/src/sp_cortexm.c",
"wolfcrypt/src/tfm.c", "wolfcrypt/src/tfm.c",
"wolfcrypt/src/wc_port.c", "wolfcrypt/src/wc_port.c",
"wolfcrypt/src/wolfmath.c", "wolfcrypt/src/wolfmath.c",

View File

@ -2133,7 +2133,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#endif /* WOLFSSL_STM32_CUBEMX */ #endif /* WOLFSSL_STM32_CUBEMX */
#elif defined(WOLFSSL_TIRTOS) #elif defined(WOLFSSL_TIRTOS)
#warning "potential for not enough entropy, currently being used for testing"
#include <xdc/runtime/Timestamp.h> #include <xdc/runtime/Timestamp.h>
#include <stdlib.h> #include <stdlib.h>
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)

View File

@ -375,11 +375,13 @@
#define SINGLE_THREADED #define SINGLE_THREADED
#define WOLFSSL_USER_IO #define WOLFSSL_USER_IO
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define CUSTOM_RAND_TYPE uint16_t #ifndef CUSTOM_RAND_GENERATE
#define CUSTOM_RAND_GENERATE random_rand #define CUSTOM_RAND_TYPE uint16_t
#define CUSTOM_RAND_GENERATE random_rand
#endif
static inline word32 LowResTimer(void) static inline word32 LowResTimer(void)
{ {
return clock_seconds(); return clock_seconds();
} }
#endif #endif
@ -504,7 +506,9 @@
#include "pico_stack.h" #include "pico_stack.h"
#include "pico_constants.h" #include "pico_constants.h"
#include "pico_protocol.h" #include "pico_protocol.h"
#define CUSTOM_RAND_GENERATE pico_rand #ifndef CUSTOM_RAND_GENERATE
#define CUSTOM_RAND_GENERATE pico_rand
#endif
#endif #endif
#ifdef WOLFSSL_PICOTCP_DEMO #ifdef WOLFSSL_PICOTCP_DEMO
@ -823,16 +827,35 @@ extern void uITRON4_free(void *p) ;
#define NO_MAIN_DRIVER #define NO_MAIN_DRIVER
#endif #endif
#ifdef WOLFSSL_TI_CRYPT
#define NO_GCM_ENCRYPT_EXTRA
#define NO_PUBLIC_GCM_SET_IV
#define NO_PUBLIC_CCM_SET_NONCE
#endif
#ifdef WOLFSSL_TIRTOS #ifdef WOLFSSL_TIRTOS
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define NO_WRITEV #define NO_WRITEV
#define NO_WOLFSSL_DIR #define NO_WOLFSSL_DIR
#define USE_FAST_MATH
/* Use SP_MATH by default, unless
* specified in user_settings.
*/
#ifndef USE_FAST_MATH
#define USE_SP_MATH
#define SP_MATH_ALL
#define WOLFSSL_HAVE_SP_ECC
#define SP_WORD_SIZE 32
#define WOLFSSL_HAVE_SP_RSA
#define WOLFSSL_SP_4096
#endif
#define TFM_TIMING_RESISTANT #define TFM_TIMING_RESISTANT
#define ECC_TIMING_RESISTANT #define ECC_TIMING_RESISTANT
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
#define NO_DEV_RANDOM #define NO_DEV_RANDOM
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define NO_SIG_WRAPPER
#define NO_MAIN_DRIVER
#define USE_CERT_BUFFERS_2048 #define USE_CERT_BUFFERS_2048
#define NO_ERROR_STRINGS #define NO_ERROR_STRINGS
/* Uncomment this setting if your toolchain does not offer time.h header */ /* Uncomment this setting if your toolchain does not offer time.h header */
@ -842,21 +865,13 @@ extern void uITRON4_free(void *p) ;
#define USE_WOLF_STRTOK /* use with HAVE_ALPN */ #define USE_WOLF_STRTOK /* use with HAVE_ALPN */
#define HAVE_TLS_EXTENSIONS #define HAVE_TLS_EXTENSIONS
#define HAVE_AESGCM #define HAVE_AESGCM
#ifdef WOLFSSL_TI_CRYPT
#define NO_GCM_ENCRYPT_EXTRA
#define NO_PUBLIC_GCM_SET_IV
#define NO_PUBLIC_CCM_SET_NONCE
#endif
#define HAVE_SUPPORTED_CURVES #define HAVE_SUPPORTED_CURVES
#define ALT_ECC_SIZE
#ifdef __IAR_SYSTEMS_ICC__ #ifdef __IAR_SYSTEMS_ICC__
#pragma diag_suppress=Pa089 #pragma diag_suppress=Pa089
#elif !defined(__GNUC__) #elif !defined(__GNUC__)
/* Suppress the sslpro warning */ /* Suppress the sslpro warning */
#pragma diag_suppress=11 #pragma diag_suppress=11
#endif #endif
#include <ti/sysbios/hal/Seconds.h> #include <ti/sysbios/hal/Seconds.h>
#endif #endif