diff --git a/examples/client/client.vcxproj b/examples/client/client.vcxproj
index 9f6825620..4442c56fd 100644
--- a/examples/client/client.vcxproj
+++ b/examples/client/client.vcxproj
@@ -98,6 +98,7 @@
true
Console
MachineX86
+ false
@@ -137,6 +138,7 @@
true
true
MachineX86
+ false
diff --git a/examples/echoclient/echoclient-ntru.vcproj b/examples/echoclient/echoclient-ntru.vcproj
index ef83df3f8..9a4ebb661 100755
--- a/examples/echoclient/echoclient-ntru.vcproj
+++ b/examples/echoclient/echoclient-ntru.vcproj
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NO_PSK;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;NO_PSK;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
diff --git a/examples/echoclient/echoclient.vcxproj b/examples/echoclient/echoclient.vcxproj
index 147362c4f..342bb9ca5 100644
--- a/examples/echoclient/echoclient.vcxproj
+++ b/examples/echoclient/echoclient.vcxproj
@@ -98,6 +98,8 @@
true
Console
MachineX86
+ false
+
@@ -137,6 +139,8 @@
true
true
MachineX86
+ false
+
diff --git a/examples/echoserver/echoserver-ntru.vcproj b/examples/echoserver/echoserver-ntru.vcproj
index 6e76620c2..924fdd849 100755
--- a/examples/echoserver/echoserver-ntru.vcproj
+++ b/examples/echoserver/echoserver-ntru.vcproj
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../"
- PreprocessorDefinitions="USE_ANY_ADDR"
+ PreprocessorDefinitions="USE_ANY_ADDR;NO_PSK"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../"
- PreprocessorDefinitions="USE_ANY_ADDR"
+ PreprocessorDefinitions="USE_ANY_ADDR;NO_PSK"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
diff --git a/examples/echoserver/echoserver.vcxproj b/examples/echoserver/echoserver.vcxproj
index 0d07f2ac4..a9c210cbd 100644
--- a/examples/echoserver/echoserver.vcxproj
+++ b/examples/echoserver/echoserver.vcxproj
@@ -98,6 +98,8 @@
true
Console
MachineX86
+ false
+
@@ -137,6 +139,7 @@
true
true
MachineX86
+ false
diff --git a/examples/server/server.vcxproj b/examples/server/server.vcxproj
index c04ab754e..dc31fd672 100644
--- a/examples/server/server.vcxproj
+++ b/examples/server/server.vcxproj
@@ -98,6 +98,8 @@
true
Console
MachineX86
+ false
+
@@ -137,6 +139,8 @@
true
true
MachineX86
+ false
+
diff --git a/src/internal.c b/src/internal.c
index 746e3294b..a1c7491ab 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -62,6 +62,10 @@
#define FALSE 0
#endif
+#ifdef _MSC_VER
+ /* disable for while(0) cases at the .c level for now */
+ #pragma warning(disable:4127)
+#endif
#if defined(WOLFSSL_CALLBACKS) && !defined(LARGE_STATIC_BUFFERS)
#error \
@@ -6532,7 +6536,7 @@ int ProcessReply(WOLFSSL* ssl)
if (ssl->keys.encryptionOn && ssl->options.handShakeDone) {
ssl->buffers.inputBuffer.idx += ssl->keys.padSz;
- ssl->curSize -= ssl->buffers.inputBuffer.idx;
+ ssl->curSize -= (word16) ssl->buffers.inputBuffer.idx;
}
if (ssl->curSize != 1) {
@@ -10881,10 +10885,16 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
#endif /*HAVE_PK_CALLBACKS */
if (IsAtLeastTLSv1_2(ssl)) {
- byte* digest;
- int digestSz;
- int typeH;
- int didSet = 0;
+ /*
+ * Initialize values to avoid uninitialized compiler
+ * warnings. Compiler complains because it can not
+ * guarantee any of the conditionals will succeed in
+ * assigning a value before wc_EncodeSignature executes.
+ */
+ byte* digest = 0;
+ int digestSz = 0;
+ int typeH = 0;
+ int didSet = 0;
if (ssl->suites->hashAlgo == sha_mac) {
#ifndef NO_SHA
diff --git a/sslSniffer/sslSniffer.vcxproj b/sslSniffer/sslSniffer.vcxproj
index 231ed6dca..7419737c1 100644
--- a/sslSniffer/sslSniffer.vcxproj
+++ b/sslSniffer/sslSniffer.vcxproj
@@ -98,6 +98,7 @@
true
Windows
MachineX86
+ false
@@ -137,6 +138,7 @@
true
true
MachineX86
+ false
diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj
index 511f6c43c..f7d5f16b5 100644
--- a/testsuite/testsuite.vcxproj
+++ b/testsuite/testsuite.vcxproj
@@ -98,6 +98,7 @@
true
Console
MachineX86
+ false
@@ -137,6 +138,7 @@
true
true
MachineX86
+ false
@@ -177,4 +179,4 @@
-
\ No newline at end of file
+
diff --git a/wolfssl.vcproj b/wolfssl.vcproj
index 08d3eae81..b4db8ba89 100755
--- a/wolfssl.vcproj
+++ b/wolfssl.vcproj
@@ -49,7 +49,7 @@
UsePrecompiledHeader="0"
WarningLevel="4"
DebugInformationFormat="4"
- DisableSpecificWarnings="4206"
+ DisableSpecificWarnings="4206,4214,4706"
/>
Level4
EditAndContinue
- 4206;%(DisableSpecificWarnings)
+ 4206;4214;4706;%(DisableSpecificWarnings)
@@ -100,7 +100,7 @@
Level4
ProgramDatabase
- 4206;%(DisableSpecificWarnings)
+ 4206;4214;4706;%(DisableSpecificWarnings)