diff --git a/ide/winvs/client/client_fips.vcxproj b/ide/winvs/client/client_fips.vcxproj
new file mode 100644
index 000000000..c46eb72a8
--- /dev/null
+++ b/ide/winvs/client/client_fips.vcxproj
@@ -0,0 +1,337 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ DLL Debug
+ Win32
+
+
+ DLL Debug
+ x64
+
+
+ DLL Release
+ Win32
+
+
+ DLL Release
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+ {7c2ccf0d-a155-4914-bd1c-9a47c0530e65}
+
+
+
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}
+ Win32Proj
+ client
+ 10.0.19041.0
+
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDebug32)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDllDebug32)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDebug64)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDllDebug64)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ ..\$(wolfCryptRelease32)
+ false
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptDllRelease32)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptRelease64)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptDllRelease64)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/winvs/echoserver/echoserver_fips.vcxproj b/ide/winvs/echoserver/echoserver_fips.vcxproj
new file mode 100644
index 000000000..53ada2e9d
--- /dev/null
+++ b/ide/winvs/echoserver/echoserver_fips.vcxproj
@@ -0,0 +1,335 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ DLL Debug
+ Win32
+
+
+ DLL Debug
+ x64
+
+
+ DLL Release
+ Win32
+
+
+ DLL Release
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+ {7c2ccf0d-a155-4914-bd1c-9a47c0530e65}
+
+
+
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}
+ Win32Proj
+ echoserver
+ 10.0.19041.0
+
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ true
+ v141
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+ Application
+ false
+ v141
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(Configuration)\$(Platform)\obj\
+ $(SolutionDir)$(Configuration)\$(Platform)\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+ false
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\obj\
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDebug32)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDllDebug32)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDebug64)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ msvcrt.lib
+ $(wolfCryptDllDebug64)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptRelease32)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptDllRelease32)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptRelease64)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ true
+ true
+ $(wolfCryptDllRelease64)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/winvs/user_settings_fips.h b/ide/winvs/user_settings_fips.h
new file mode 100644
index 000000000..bb00af9ea
--- /dev/null
+++ b/ide/winvs/user_settings_fips.h
@@ -0,0 +1,178 @@
+#ifndef _WIN_USER_SETTINGS_H_
+#define _WIN_USER_SETTINGS_H_
+
+/* For FIPS 140-2 3389 build set to "#if 1" */
+#if 0
+#undef HAVE_FIPS
+#define HAVE_FIPS
+#undef HAVE_FIPS_VERSION
+#define HAVE_FIPS_VERSION 2
+#undef HAVE_FIPS_VERSION_MINOR
+#define HAVE_FIPS_VERSION_MINOR 0
+#endif
+
+/* Set the following to 1 for WCv5.0-RC12 build. */
+#if 0
+#undef HAVE_FIPS
+#define HAVE_FIPS
+#undef HAVE_FIPS_VERSION
+#define HAVE_FIPS_VERSION 5
+#undef HAVE_FIPS_VERSION_MINOR
+#define HAVE_FIPS_VERSION_MINOR 2
+#endif
+
+/* For FIPS Ready, uncomment the following: */
+#define WOLFSSL_FIPS_READY
+#ifdef WOLFSSL_FIPS_READY
+ #undef HAVE_FIPS
+ #define HAVE_FIPS
+ #undef HAVE_FIPS_VERSION
+ #define HAVE_FIPS_VERSION 5
+ #undef HAVE_FIPS_VERSION_MINOR
+ #define HAVE_FIPS_VERSION_MINOR 3
+#endif
+
+
+/* Verify this is Windows */
+#ifndef _WIN32
+#error This user_settings.h header is only designed for Windows
+#endif
+
+#define WOLFSSL_WOLFSSH
+#if defined WOLFSSL_WOLFSSH
+ #define WOLFSSL_KEY_GEN
+ #define HAVE_ECC
+ #define HAVE_AESGCM
+ #define HAVE_HASHDRBG
+ #define WOLFSSL_AES_COUNTER
+ #define WOLFSSL_AES_DIRECT
+ #define WOLFSSL_SHA384
+ #define WOLFSSL_SHA512
+ #define NO_PSK
+ #define NO_HC128
+ #define NO_RC4
+ #define NO_RABBIT
+ #define NO_DSA
+ #define NO_MD4
+ #define WC_RSA_BLINDING
+ #define WOLFSSL_PUBLIC_MP
+ #define WC_NO_HARDEN
+#endif
+
+
+/* Configurations */
+#if defined(HAVE_FIPS)
+ /* FIPS */
+ #define OPENSSL_EXTRA
+ #define HAVE_THREAD_LS
+ #define WOLFSSL_KEY_GEN
+ #define HAVE_AESGCM
+ #define HAVE_HASHDRBG
+ #define WOLFSSL_SHA384
+ #define WOLFSSL_SHA512
+ #define NO_PSK
+ #define NO_RC4
+ #define NO_DSA
+ #define NO_MD4
+
+ #if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
+ #define WOLFSSL_SHA224
+ #define WOLFSSL_SHA3
+ #define WC_RSA_PSS
+ #define WC_RSA_NO_PADDING
+ #define HAVE_ECC
+ #define HAVE_ECC384
+ #define HAVE_ECC521
+ #define HAVE_SUPPORTED_CURVES
+ #define HAVE_TLS_EXTENSIONS
+ #define ECC_SHAMIR
+ #define HAVE_ECC_CDH
+ #define ECC_TIMING_RESISTANT
+ #define TFM_TIMING_RESISTANT
+ #define WOLFSSL_AES_COUNTER
+ #define WOLFSSL_AES_DIRECT
+ #define HAVE_AES_ECB
+ #define HAVE_AESCCM
+ #define WOLFSSL_CMAC
+ #define HAVE_HKDF
+ #define WOLFSSL_VALIDATE_ECC_IMPORT
+ #define WOLFSSL_VALIDATE_FFC_IMPORT
+ #define HAVE_FFDHE_Q
+ #define HAVE_PUBLIC_FFDHE
+ #ifdef _WIN64
+ #define WOLFSSL_AESNI
+ #define HAVE_INTEL_RDSEED
+ #endif
+ #define FORCE_FAILURE_RDSEED
+ #endif /* FIPS v2 */
+ #if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5)
+ #undef WOLFSSL_AESNI /* Comment out if using PAA */
+ #undef HAVE_INTEL_RDSEED
+ #undef FORCE_FAILURE_RDSEED
+ #undef HAVE_PUBLIC_FFDHE
+
+ #define NO_DES
+ #define NO_DES3
+ #define NO_MD5
+ #define NO_OLD_TLS
+
+ #define WOLFSSL_TLS13
+ #define HAVE_TLS_EXTENSIONS
+ #define HAVE_SUPPORTED_CURVES
+ #define GCM_TABLE_4BIT
+ #define WOLFSSL_NO_SHAKE256
+ #define WOLFSSL_VALIDATE_ECC_KEYGEN
+ #define WOLFSSL_ECDSA_SET_K
+ #define WOLFSSL_WOLFSSH
+ #define WOLFSSL_PUBLIC_MP
+ #define WC_RNG_SEED_CB
+ #define TFM_ECC256
+ #define ECC_USER_CURVES
+ #define HAVE_ECC192
+ #define HAVE_ECC224
+ #define HAVE_ECC256
+ #define HAVE_ECC384
+ #define HAVE_ECC521
+ #define HAVE_FFDHE_2048
+ #define HAVE_FFDHE_3072
+ #define HAVE_FFDHE_4096
+ #define HAVE_FFDHE_6144
+ #define HAVE_FFDHE_8192
+ #define WOLFSSL_AES_OFB
+ #define FP_MAX_BITS 16384
+ #endif /* FIPS v5 */
+ #if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 6)
+ #define WOLFSSL_AES_XTS
+ #endif
+#else
+ /* Enables blinding mode, to prevent timing attacks */
+ #define WC_RSA_BLINDING
+
+ #if defined(WOLFSSL_LIB)
+ /* The lib */
+ #define OPENSSL_EXTRA
+ #define WOLFSSL_RIPEMD
+ #define NO_PSK
+ #define HAVE_EXTENDED_MASTER
+ #define WOLFSSL_SNIFFER
+ #define HAVE_SECURE_RENEGOTIATION
+
+ #define HAVE_AESGCM
+ #define WOLFSSL_AES_XTS
+ #define WOLFSSL_SHA384
+ #define WOLFSSL_SHA512
+
+ #define HAVE_SUPPORTED_CURVES
+ #define HAVE_TLS_EXTENSIONS
+
+ #define HAVE_ECC
+ #define ECC_SHAMIR
+ #define ECC_TIMING_RESISTANT
+ #else
+ /* The servers and clients */
+ #define OPENSSL_EXTRA
+ #define NO_PSK
+ #endif
+#endif /* HAVE_FIPS */
+
+#endif /* _WIN_USER_SETTINGS_H_ */
diff --git a/ide/winvs/wolfssh.props b/ide/winvs/wolfssh.props
index 283c36981..9fce95958 100644
--- a/ide/winvs/wolfssh.props
+++ b/ide/winvs/wolfssh.props
@@ -2,7 +2,7 @@
- ..\..\..\..\wolfssl
+ ..\..\..\..\wolfssl\IDE\WIN10
$(wolfCryptDir)\Debug\Win32
$(wolfCryptDir)\Release\Win32
$(wolfCryptDir)\Debug\x64
diff --git a/ide/winvs/wolfssh/wolfssh_fips.vcxproj b/ide/winvs/wolfssh/wolfssh_fips.vcxproj
new file mode 100644
index 000000000..1e2904598
--- /dev/null
+++ b/ide/winvs/wolfssh/wolfssh_fips.vcxproj
@@ -0,0 +1,319 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ DLL Debug
+ Win32
+
+
+ DLL Debug
+ x64
+
+
+ DLL Release
+ Win32
+
+
+ DLL Release
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}
+ Win32Proj
+ wolfssh
+ 10.0.19041.0
+
+
+
+ StaticLibrary
+ true
+ v141
+ Unicode
+
+
+ DynamicLibrary
+ true
+ v141
+ Unicode
+
+
+ StaticLibrary
+ true
+ v141
+ Unicode
+
+
+ DynamicLibrary
+ true
+ v141
+ Unicode
+
+
+ StaticLibrary
+ false
+ v141
+ true
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v141
+ true
+ Unicode
+
+
+ StaticLibrary
+ false
+ v141
+ true
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v141
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+ $(SolutionDir)$(Configuration)\$(Platform)\
+ $(Configuration)\$(Platform)\
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;DEBUG_WOLFSSH;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Windows
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ WOLFSSH_LIB;BUILDING_WOLFSSH;WOLFSSH_DLL;WIN32;_DEBUG;_LIB;DEBUG_WOLFSSH;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Windows
+ true
+ $(wolfCryptDllDebug32)
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;DEBUG_WOLFSSH;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Windows
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ WOLFSSH_LIB;BUILDING_WOLFSSH;WOLFSSH_DLL;WIN32;_DEBUG;_LIB;DEBUG_WOLFSSH;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+ ProgramDatabase
+
+
+ Windows
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(wolfCryptDllDebug64)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WOLFSSH_LIB;BUILDING_WOLFSSH;WOLFSSH_DLL;WIN32;NDEBUG;_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Windows
+ true
+ true
+ true
+ $(wolfCryptDllRelease32)
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WOLFSSH_LIB;BUILDING_WOLFSSH;WOLFSSH_DLL;WIN32;NDEBUG;_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)
+ ..;..\..\..;$(wolfCryptDir);%(AdditionalIncludeDirectories)
+
+
+ Windows
+ true
+ true
+ true
+ wolfssl-fips.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(wolfCryptDllRelease64)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/winvs/wolfssh_fips.props b/ide/winvs/wolfssh_fips.props
new file mode 100644
index 000000000..8c2fa86a9
--- /dev/null
+++ b/ide/winvs/wolfssh_fips.props
@@ -0,0 +1,45 @@
+
+
+
+
+ ..\..\..\..\wolfssl
+ $(wolfCryptDir)\Debug\Win32
+ $(wolfCryptDir)\Release\Win32
+ $(wolfCryptDir)\Debug\x64
+ $(wolfCryptDir)\Release\x64
+ $(wolfCryptDir)\DLL Debug\Win32
+ $(wolfCryptDir)\DLL Release\Win32
+ $(wolfCryptDir)\DLL Debug\x64
+ $(wolfCryptDir)\DLL Release\x64
+
+
+
+
+ $(wolfCryptDir)
+
+
+ $(wolfCryptDebug32)
+
+
+ $(wolfCryptRelease32)
+
+
+ $(wolfCryptDebug64)
+
+
+ $(wolfCryptRelease64)
+
+
+ $(wolfCryptDllDebug32)
+
+
+ $(wolfCryptDllRelease32)
+
+
+ $(wolfCryptDllDebug64)
+
+
+ $(wolfCryptDllRelease64)
+
+
+
diff --git a/ide/winvs/wolfssh_fips.sln b/ide/winvs/wolfssh_fips.sln
new file mode 100644
index 000000000..07d937c6a
--- /dev/null
+++ b/ide/winvs/wolfssh_fips.sln
@@ -0,0 +1,82 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.36530.23
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_fips", "client\client_fips.vcxproj", "{663A7133-B13B-4C37-A5EC-97CA4D60CA3A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65} = {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoserver_fips", "echoserver\echoserver_fips.vcxproj", "{B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssh_fips", "wolfssh\wolfssh_fips.vcxproj", "{7C2CCF0D-A155-4914-BD1C-9A47C0530E65}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ DLL Debug|x64 = DLL Debug|x64
+ DLL Debug|x86 = DLL Debug|x86
+ DLL Release|x64 = DLL Release|x64
+ DLL Release|x86 = DLL Release|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Debug|x64.ActiveCfg = Debug|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Debug|x64.Build.0 = Debug|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Debug|x86.ActiveCfg = Debug|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Debug|x86.Build.0 = Debug|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Debug|x86.ActiveCfg = DLL Debug|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Debug|x86.Build.0 = DLL Debug|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Release|x64.Build.0 = DLL Release|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Release|x86.ActiveCfg = DLL Release|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.DLL Release|x86.Build.0 = DLL Release|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Release|x64.ActiveCfg = Release|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Release|x64.Build.0 = Release|x64
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Release|x86.ActiveCfg = Release|Win32
+ {663A7133-B13B-4C37-A5EC-97CA4D60CA3A}.Release|x86.Build.0 = Release|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Debug|x64.ActiveCfg = Debug|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Debug|x64.Build.0 = Debug|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Debug|x86.ActiveCfg = Debug|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Debug|x86.Build.0 = Debug|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Debug|x86.ActiveCfg = DLL Debug|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Debug|x86.Build.0 = DLL Debug|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Release|x64.Build.0 = DLL Release|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Release|x86.ActiveCfg = DLL Release|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.DLL Release|x86.Build.0 = DLL Release|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Release|x64.ActiveCfg = Release|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Release|x64.Build.0 = Release|x64
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Release|x86.ActiveCfg = Release|Win32
+ {B4E163C2-ECA0-4DA2-9FD9-4CD6599C9D4D}.Release|x86.Build.0 = Release|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Debug|x64.ActiveCfg = Debug|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Debug|x64.Build.0 = Debug|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Debug|x86.ActiveCfg = Debug|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Debug|x86.Build.0 = Debug|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Debug|x64.Build.0 = DLL Debug|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Debug|x86.ActiveCfg = DLL Debug|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Debug|x86.Build.0 = DLL Debug|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Release|x64.ActiveCfg = DLL Release|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Release|x64.Build.0 = DLL Release|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Release|x86.ActiveCfg = DLL Release|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.DLL Release|x86.Build.0 = DLL Release|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Release|x64.ActiveCfg = Release|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Release|x64.Build.0 = Release|x64
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Release|x86.ActiveCfg = Release|Win32
+ {7C2CCF0D-A155-4914-BD1C-9A47C0530E65}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {74BC6E7B-1683-4A98-A2FF-6DEAB369CE60}
+ EndGlobalSection
+EndGlobal