From 1b965491d9ba11257d28d491960dff4a00898046 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Thu, 12 Jul 2018 14:06:36 -0600
Subject: [PATCH 1/2] Solve through settings.h instead

---
 wolfssl/wolfcrypt/settings.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 1dbcdc949..4126bc0b5 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -1253,10 +1253,10 @@ extern void uITRON4_free(void *p) ;
             #define NO_DES3
             #define NO_SHA
             #define NO_MD5
+            #define NO_ASN
         #else
             #define TFM_TIMING_RESISTANT
             #define NO_WOLFSSL_DIR
-            #define NO_FILESYSTEM
             #define NO_WRITEV
             #define NO_MAIN_DRIVER
             #define WOLFSSL_LOG_PRINTF
@@ -1264,9 +1264,6 @@ extern void uITRON4_free(void *p) ;
         #endif
     #else
         #define HAVE_ECC
-        #define ECC_TIMING_RESISTANT
-        #define TFM_TIMING_RESISTANT
-        #define NO_FILESYSTEM
         #define NO_WRITEV
         #define NO_MAIN_DRIVER
         #define USER_TICKS
@@ -1276,6 +1273,10 @@ extern void uITRON4_free(void *p) ;
     #if !defined(HAVE_FIPS) && !defined(NO_RSA)
         #define WC_RSA_BLINDING
     #endif
+	
+    #define NO_FILESYSTEM
+    #define ECC_TIMING_RESISTANT
+    #define TFM_TIMING_RESISTANT
     #define SINGLE_THREADED
     #define NO_ASN_TIME /* can not use headers such as windows.h */
     #define HAVE_AESGCM

From ddd6563442708ccfcdd480f9bf6f90b2a5f164b8 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Fri, 13 Jul 2018 13:18:15 -0600
Subject: [PATCH 2/2] Dependencies for SGX project updated

---
 IDE/WIN-SGX/wolfSSL_SGX.vcxproj         |  4 ++++
 IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters | 12 ++++++++++++
 wolfssl/wolfcrypt/settings.h            |  1 -
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/IDE/WIN-SGX/wolfSSL_SGX.vcxproj b/IDE/WIN-SGX/wolfSSL_SGX.vcxproj
index 203d1ac62..bf2fad610 100755
--- a/IDE/WIN-SGX/wolfSSL_SGX.vcxproj
+++ b/IDE/WIN-SGX/wolfSSL_SGX.vcxproj
@@ -301,6 +301,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\wolfcrypt\src\aes.c" />
     <ClCompile Include="..\..\wolfcrypt\src\asn.c" />
+    <ClCompile Include="..\..\wolfcrypt\src\coding.c" />
     <ClCompile Include="..\..\wolfcrypt\src\hash.c" />
     <ClCompile Include="..\..\wolfcrypt\src\hmac.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..;$(SGXSDKInstallPath)include;$(SGXSDKInstallPath)include\tlibc;$(SGXSDKInstallPath)include\stlport;$(SolutionDir)wolfssl-3.9.6;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -314,6 +315,9 @@
     <ClCompile Include="..\..\wolfcrypt\src\rsa.c" />
     <ClCompile Include="..\..\wolfcrypt\src\sha256.c" />
     <ClCompile Include="..\..\wolfcrypt\src\tfm.c" />
+    <ClCompile Include="..\..\wolfcrypt\src\wc_encrypt.c" />
+    <ClCompile Include="..\..\wolfcrypt\src\wc_port.c" />
+    <ClCompile Include="..\..\wolfcrypt\src\wolfmath.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters b/IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters
index 427aaef0a..d926b74af 100755
--- a/IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters
+++ b/IDE/WIN-SGX/wolfSSL_SGX.vcxproj.filters
@@ -54,5 +54,17 @@
     <ClCompile Include="..\..\wolfcrypt\src\random.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\wolfcrypt\src\coding.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\wolfcrypt\src\wc_encrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\wolfcrypt\src\wolfmath.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\wolfcrypt\src\wc_port.c">
+      <Filter>Source Files\Resource Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 4126bc0b5..f74a66ac6 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -1253,7 +1253,6 @@ extern void uITRON4_free(void *p) ;
             #define NO_DES3
             #define NO_SHA
             #define NO_MD5
-            #define NO_ASN
         #else
             #define TFM_TIMING_RESISTANT
             #define NO_WOLFSSL_DIR