From 2e0d05f7275d801677a807c8e645c45fc64b00bc Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Mon, 8 Feb 2016 12:22:20 -0800
Subject: [PATCH] Fixes issues with new IDE/WIN/user_settings.h and FIPS. Fixed
 issue with using CYASSL_USER_SETTINGS in ctaocrypt/settings.h with FIPS by
 moving settings_comp.h to after user_settings.h. Fixed issue with
 non-existent ctaocrypt/signature.c file being included. Added the
 user_settings.h file to the FIPS project.

---
 IDE/WIN/wolfssl-fips.vcxproj | 6 +++---
 cyassl/ctaocrypt/settings.h  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IDE/WIN/wolfssl-fips.vcxproj b/IDE/WIN/wolfssl-fips.vcxproj
index e3e527ade..74c1041ab 100644
--- a/IDE/WIN/wolfssl-fips.vcxproj
+++ b/IDE/WIN/wolfssl-fips.vcxproj
@@ -258,9 +258,6 @@
     <ClCompile Include="..\..\ctaocrypt\src\sha512.c">
       <ObjectFileName>$(IntDir)ctaocrypt\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\ctaocrypt\src\signature.c">
-      <ObjectFileName>$(IntDir)ctaocrypt\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\ctaocrypt\src\fips.c">
       <ObjectFileName>$(IntDir)ctaocrypt\</ObjectFileName>
       <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</WholeProgramOptimization>
@@ -320,6 +317,9 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(IntDir)%(Filename).obj</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="user_settings.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h
index 2d1ab55d7..b880be666 100644
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@@ -26,9 +26,6 @@
 #ifndef CTAO_CRYPT_SETTINGS_H
 #define CTAO_CRYPT_SETTINGS_H
 
-/* for reverse compatibility after name change */
-#include <cyassl/ctaocrypt/settings_comp.h>
-
 #ifdef __cplusplus
     extern "C" {
 #endif
@@ -113,6 +110,9 @@
     #include <user_settings.h>
 #endif
 
+/* for reverse compatibility after name change */
+#include <cyassl/ctaocrypt/settings_comp.h>
+
 
 #ifdef COMVERGE
     #define THREADX