From d2938dd13a3261b3464b648ce6c3997d8db51319 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Mon, 6 Nov 2017 08:25:35 -0800
Subject: [PATCH] Fix for building with TI using new names. Update TI settings
 for timing, blinding and strtok_r.

---
 wolfssl/wolfcrypt/port/ti/ti-hash.h | 8 ++++----
 wolfssl/wolfcrypt/settings.h        | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wolfssl/wolfcrypt/port/ti/ti-hash.h b/wolfssl/wolfcrypt/port/ti/ti-hash.h
index 081f4971b..361993896 100644
--- a/wolfssl/wolfcrypt/port/ti/ti-hash.h
+++ b/wolfssl/wolfcrypt/port/ti/ti-hash.h
@@ -44,16 +44,16 @@ typedef struct {
 #ifndef TI_HASH_TEST
 
 #if !defined(NO_MD5)
-    typedef wolfssl_TI_Hash Md5;
+    typedef wolfssl_TI_Hash wc_Md5;
 #endif
 #if !defined(NO_SHA)
-    typedef wolfssl_TI_Hash Sha;
+    typedef wolfssl_TI_Hash wc_Sha;
 #endif
 #if !defined(NO_SHA256)
-    typedef wolfssl_TI_Hash Sha256;
+    typedef wolfssl_TI_Hash wc_Sha256;
 #endif
 #if defined(WOLFSSL_SHA224)
-    typedef wolfssl_TI_Hash Sha224;
+    typedef wolfssl_TI_Hash wc_Sha224;
 #endif
 
 #endif /* !TI_HASH_TEST */
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index b23b838df..a27959a7f 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -591,6 +591,8 @@ extern void uITRON4_free(void *p) ;
     #define NO_WOLFSSL_DIR
     #define USE_FAST_MATH
     #define TFM_TIMING_RESISTANT
+    #define ECC_TIMING_RESISTANT
+    #define WC_RSA_BLINDING
     #define NO_DEV_RANDOM
     #define NO_FILESYSTEM
     #define USE_CERT_BUFFERS_2048
@@ -598,6 +600,7 @@ extern void uITRON4_free(void *p) ;
     #define USER_TIME
     #define HAVE_ECC
     #define HAVE_ALPN
+    #define USE_WOLF_STRTOK /* use with HAVE_ALPN */
     #define HAVE_TLS_EXTENSIONS
     #define HAVE_AESGCM
     #define HAVE_SUPPORTED_CURVES