From d658701350dc0a35065db1121bbdfb1f8f572d78 Mon Sep 17 00:00:00 2001
From: Aaron <aaron@wolfssl.com>
Date: Tue, 11 Sep 2018 11:16:04 -0500
Subject: [PATCH] Added NO_WOLF_C99 define, replaced sp.c with relevant sp_*.c,
 removed evp.c and bio.c from compiling seperately from ssl.c

---
 IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp | 22 ++++++++++++++--------
 IDE/IAR-EWARM/Projects/user_settings.h     |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
index 8a103c23d..69b94ee2c 100644
--- a/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
+++ b/IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp
@@ -937,7 +937,7 @@
         </option>
         <option>
           <name>IarchiveOutput</name>
-          <state>C:\wolfSSL\Support\EWARM\wolfssl\IDE\IAR-EWARM\Projects\lib\ewarm\Exe\wolfSSL-Lib.a</state>
+          <state>$PROJ_DIR$\..\lib\ewarm\Exe\wolfSSL-Lib.a</state>
         </option>
       </data>
     </settings>
@@ -1960,9 +1960,6 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\error.c</name>
     </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\evp.c</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\fe_low_mem.c</name>
     </file>
@@ -2045,7 +2042,19 @@
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\signature.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp_arm32.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp_arm64.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp_c32.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp_c64.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp_int.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\srp.c</name>
@@ -2068,9 +2077,6 @@
   </group>
   <group>
     <name>wolfSSL</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\..\src\bio.c</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\crl.c</name>
     </file>
diff --git a/IDE/IAR-EWARM/Projects/user_settings.h b/IDE/IAR-EWARM/Projects/user_settings.h
index 583f28b78..d2d3f838e 100644
--- a/IDE/IAR-EWARM/Projects/user_settings.h
+++ b/IDE/IAR-EWARM/Projects/user_settings.h
@@ -9,11 +9,12 @@
 #define SIZEOF_LONG_LONG 8
 #define NO_WOLFSSL_DIR 
 #define WOLFSSL_NO_CURRDIR
+#define NO_WOLF_C99
 
 #define XVALIDATEDATE(d, f,t) (0)
 #define WOLFSSL_USER_CURRTIME /* for benchmark */
 
-#define WOLFSSL_GENSEED_FORTEST /* Wardning: define your own seed gen */
+#define WOLFSSL_GENSEED_FORTEST /* Warning: define your own seed gen */
 
 #define TFM_TIMING_RESISTANT
 #define ECC_TIMING_RESISTANT