From acfe9717f8e8cf1ce7f30ecf24547850b1f88eed Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Mon, 6 Jan 2020 14:09:41 -0800
Subject: [PATCH 1/2] Fix for K64 MMCAU with `WOLFSSL_SMALL_STACK_CACHE`. Moved
 random test prior to cipher tests (was getting called first time in GMAC
 test).

---
 wolfcrypt/src/sha256.c |  4 ++++
 wolfcrypt/test/test.c  | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c
index 47cc0eaf2..6bcf18312 100644
--- a/wolfcrypt/src/sha256.c
+++ b/wolfcrypt/src/sha256.c
@@ -410,6 +410,7 @@ static int InitSha256(wc_Sha256* sha256)
         if (ret != 0) {
             return ret;
         }
+
     #ifdef FREESCALE_MMCAU_CLASSIC_SHA
         cau_sha256_initialize_output(sha256->digest);
     #else
@@ -420,6 +421,9 @@ static int InitSha256(wc_Sha256* sha256)
         sha256->buffLen = 0;
         sha256->loLen   = 0;
         sha256->hiLen   = 0;
+    #ifdef WOLFSSL_SMALL_STACK_CACHE
+        sha256->W = NULL;
+    #endif
 
         return ret;
     }
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 7a3cba7cd..62a9b0e37 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -620,6 +620,13 @@ initDefaultName();
         test_pass("asn      test passed!\n");
 #endif
 
+#ifndef WC_NO_RNG
+    if ( (ret = random_test()) != 0)
+        return err_sys("RANDOM   test failed!\n", ret);
+    else
+        test_pass("RANDOM   test passed!\n");
+#endif /* WC_NO_RNG */
+
 #ifndef NO_MD5
     if ( (ret = md5_test()) != 0)
         return err_sys("MD5      test failed!\n", ret);
@@ -901,13 +908,6 @@ initDefaultName();
         test_pass("IDEA     test passed!\n");
 #endif
 
-#ifndef WC_NO_RNG
-    if ( (ret = random_test()) != 0)
-        return err_sys("RANDOM   test failed!\n", ret);
-    else
-        test_pass("RANDOM   test passed!\n");
-#endif /* WC_NO_RNG */
-
 #ifndef NO_RSA
     #ifdef WC_RSA_NO_PADDING
     if ( (ret = rsa_no_pad_test()) != 0)

From 0f0d307b762abfce693cef91097f7bed9215ff4c Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 7 Jan 2020 05:43:59 -0800
Subject: [PATCH 2/2] Fix to avoid duplicate symbol for `CheckRunTimeSettings`
 when SP and TFM are built. Specifically with these build options:
 `USE_FAST_MATH`, `WOLFSSL_SP` and `WOLFSSL_SP_MATH`.

---
 wolfcrypt/src/tfm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wolfcrypt/src/tfm.c b/wolfcrypt/src/tfm.c
index 42e001bd3..d9f6c5ad2 100644
--- a/wolfcrypt/src/tfm.c
+++ b/wolfcrypt/src/tfm.c
@@ -86,13 +86,13 @@ WOLFSSL_LOCAL int sp_ModExp_4096(mp_int* base, mp_int* exp, mp_int* mod,
 #endif
 
 
-
+#ifndef WOLFSSL_SP_MATH
 /* math settings check */
 word32 CheckRunTimeSettings(void)
 {
     return CTC_SETTINGS;
 }
-
+#endif
 
 /* math settings size check */
 word32 CheckRunTimeFastMath(void)