From aed1e433b278497a0da7530c47a2fc8d4bffff47 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Fri, 19 Jul 2019 13:08:13 -0700
Subject: [PATCH] Updates to benchmark/test Visual Studio projects to properly
 reference x64. Added missing files to VS projects. Example settings for
 enabling SP and AESNI in Visual Studio in IDE/WIN/user_settings.h.

---
 IDE/WIN/user_settings.h           |  16 ++++
 wolfcrypt/benchmark/benchmark.sln |  14 ++--
 wolfcrypt/test/test.sln           |  14 ++--
 wolfssl.vcproj                    | 126 +++++++++++++++++++++---------
 wolfssl.vcxproj                   |   6 ++
 5 files changed, 127 insertions(+), 49 deletions(-)

diff --git a/IDE/WIN/user_settings.h b/IDE/WIN/user_settings.h
index d13c2d98c..f2071520f 100755
--- a/IDE/WIN/user_settings.h
+++ b/IDE/WIN/user_settings.h
@@ -47,6 +47,22 @@
         #define HAVE_ECC
         #define ECC_SHAMIR
         #define ECC_TIMING_RESISTANT
+
+        /* Optional Performance Speedups */
+        #if 0
+            /* AESNI on x64 */
+            #ifdef _WIN64
+                #define HAVE_INTEL_RDSEED
+                #define WOLFSSL_AESNI
+            #endif
+
+            /* Single Precision Support for RSA/DH 1024/2048/3072 and ECC P-256 */
+            #define WOLFSSL_SP
+            #define WOLFSSL_HAVE_SP_ECC
+            #define WOLFSSL_HAVE_SP_DH
+            #define WOLFSSL_HAVE_SP_RSA
+        #endif
+
     #else
         /* The servers and clients */
         #define OPENSSL_EXTRA
diff --git a/wolfcrypt/benchmark/benchmark.sln b/wolfcrypt/benchmark/benchmark.sln
index e3947de4f..6c555724a 100755
--- a/wolfcrypt/benchmark/benchmark.sln
+++ b/wolfcrypt/benchmark/benchmark.sln
@@ -22,18 +22,20 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.ActiveCfg = Debug|Win32
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.Build.0 = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.ActiveCfg = Debug|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.ActiveCfg = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.Build.0 = Debug|x64
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.ActiveCfg = Debug|Win32
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.Build.0 = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.ActiveCfg = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.Build.0 = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.ActiveCfg = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.Build.0 = Debug|x64
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.ActiveCfg = Release|Win32
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.Build.0 = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.ActiveCfg = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.Build.0 = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.ActiveCfg = Release|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.Build.0 = Release|x64
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.ActiveCfg = Release|Win32
 		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.Build.0 = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.ActiveCfg = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.ActiveCfg = Release|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.Build.0 = Release|x64
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.Build.0 = Debug|Win32
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/wolfcrypt/test/test.sln b/wolfcrypt/test/test.sln
index 129ec36fa..55b9872f0 100755
--- a/wolfcrypt/test/test.sln
+++ b/wolfcrypt/test/test.sln
@@ -22,18 +22,20 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|Win32.Build.0 = Debug|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x64.ActiveCfg = Debug|Win32
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x64.ActiveCfg = Debug|x64
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x64.Build.0 = Debug|x64
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|Win32.ActiveCfg = Debug|Win32
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|Win32.Build.0 = Debug|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.ActiveCfg = Release|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.Build.0 = Release|Win32
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.ActiveCfg = Debug|x64
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.Build.0 = Debug|x64
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|Win32.ActiveCfg = Release|Win32
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|Win32.Build.0 = Release|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.ActiveCfg = Release|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.Build.0 = Release|Win32
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.ActiveCfg = Release|x64
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.Build.0 = Release|x64
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|Win32.ActiveCfg = Release|Win32
 		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|Win32.Build.0 = Release|Win32
-		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x64.ActiveCfg = Release|Win32
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x64.ActiveCfg = Release|x64
+		{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x64.Build.0 = Release|x64
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.Build.0 = Debug|Win32
 		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/wolfssl.vcproj b/wolfssl.vcproj
index 3a7a45506..5505e4912 100755
--- a/wolfssl.vcproj
+++ b/wolfssl.vcproj
@@ -151,10 +151,46 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath=".\src\crl.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\internal.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\keys.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ocsp.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ssl.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\tls.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\tls13.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\wolfio.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\aes.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\aes_asm.asm"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\arc4.c"
 				>
@@ -167,6 +203,10 @@
 				RelativePath=".\wolfcrypt\src\blake2b.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\blake2s.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\camellia.c"
 				>
@@ -183,10 +223,6 @@
 				RelativePath=".\wolfcrypt\src\chacha20_poly1305.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\crl.c"
-				>
-			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\des3.c"
 				>
@@ -207,6 +243,22 @@
 				RelativePath=".\wolfcrypt\src\error.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\fe_low_mem.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\fe_operations.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\ge_low_mem.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\ge_operations.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\hash.c"
 				>
@@ -223,22 +275,14 @@
 				RelativePath=".\wolfcrypt\src\integer.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\internal.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\wolfio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\keys.c"
-				>
-			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\logging.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\md2.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\md4.c"
 				>
@@ -251,10 +295,6 @@
 				RelativePath=".\wolfcrypt\src\memory.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\ocsp.c"
-				>
-			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\pkcs7.c"
 				>
@@ -267,14 +307,6 @@
 				RelativePath=".\wolfcrypt\src\poly1305.c"
 				>
 			</File>
-			<File
-				RelativePath=".\wolfcrypt\src\wc_port.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wolfcrypt\src\wolfmath.c"
-				>
-			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\pwdbased.c"
 				>
@@ -307,26 +339,46 @@
 				RelativePath=".\wolfcrypt\src\sha512.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\sp_c32.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\sp_c64.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\sp_int.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\sp_x86_64.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\signature.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\ssl.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\tls.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\tls13.c"
+				RelativePath=".\wolfcrypt\src\tfm.c"
 				>
 			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\wc_encrypt.c"
 				>
 			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\wc_pkcs11.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\wc_port.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wolfcrypt\src\wolfmath.c"
+				>
+			</File>
 			<File
 				RelativePath=".\wolfcrypt\src\wolfevent.c"
 				>
diff --git a/wolfssl.vcxproj b/wolfssl.vcxproj
index f5bdbf5da..834c307e0 100644
--- a/wolfssl.vcxproj
+++ b/wolfssl.vcxproj
@@ -288,6 +288,7 @@
     <ClCompile Include="wolfcrypt\src\arc4.c" />
     <ClCompile Include="wolfcrypt\src\asn.c" />
     <ClCompile Include="wolfcrypt\src\blake2b.c" />
+    <ClCompile Include="wolfcrypt\src\blake2s.c" />
     <ClCompile Include="wolfcrypt\src\camellia.c" />
     <ClCompile Include="wolfcrypt\src\chacha.c" />
     <ClCompile Include="wolfcrypt\src\chacha20_poly1305.c" />
@@ -327,9 +328,14 @@
     <ClCompile Include="wolfcrypt\src\sha3.c" />
     <ClCompile Include="wolfcrypt\src\sha512.c" />
     <ClCompile Include="wolfcrypt\src\signature.c" />
+    <ClCompile Include="wolfcrypt\src\sp_c32.c" />
+    <ClCompile Include="wolfcrypt\src\sp_c64.c" />
+    <ClCompile Include="wolfcrypt\src\sp_int.c" />
+    <ClCompile Include="wolfcrypt\src\sp_x86_64.c" />
     <ClCompile Include="wolfcrypt\src\srp.c" />
     <ClCompile Include="wolfcrypt\src\tfm.c" />
     <ClCompile Include="wolfcrypt\src\wc_encrypt.c" />
+    <ClCompile Include="wolfcrypt\src\wc_pkcs11.c" />
     <ClCompile Include="wolfcrypt\src\wc_port.c" />
     <ClCompile Include="wolfcrypt\src\wolfmath.c" />
     <ClCompile Include="wolfcrypt\src\wolfevent.c" />