From 906e5c19ad445d7141f4eec4bf5005aa9441ac36 Mon Sep 17 00:00:00 2001
From: Todd A Ouska <todd@yassl.com>
Date: Thu, 28 Apr 2011 16:34:42 -0700
Subject: [PATCH] windows build fixes for new stuff

---
 ctaocrypt/src/pwdbased.c |   2 +-
 cyassl.vcproj            | 762 ++++++++++++++++++++-------------------
 src/ssl.c                |   2 +-
 3 files changed, 387 insertions(+), 379 deletions(-)

diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c
index c2b04d328..1b4cc195c 100644
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -293,7 +293,7 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
             if (ret < 0) break;
         }
 
-        currentLen = min(kLen, u);
+        currentLen = min(kLen, (int)u);
         XMEMCPY(output, Ai, currentLen);
         output += currentLen;
         kLen   -= currentLen;
diff --git a/cyassl.vcproj b/cyassl.vcproj
index 3b9d4671c..4f69508f7 100755
--- a/cyassl.vcproj
+++ b/cyassl.vcproj
@@ -1,377 +1,385 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cyassl"
-	ProjectGUID="{73973223-5EE8-41CA-8E88-1D60E89A237B}"
-	RootNamespace="cyassl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
-				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
-				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ctaocrypt\src\aes.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\arc4.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\asm.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\asn.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\coding.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\cyassl_int.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\cyassl_io.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\des3.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\dh.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\dsa.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\hc128.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\hmac.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\integer.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\keys.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\md4.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\md5.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\misc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\pwdbased.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\rabbit.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\random.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\ripemd.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\rsa.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\sha.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\sha256.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\sha512.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\ssl.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\tls.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\ctaocrypt\include\arc4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\asn.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\coding.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_aes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_hmac.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_ripemd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_rsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_sha.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_int.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\des3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\hc128.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\integer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\misc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\pwdbased.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\rabbit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\random.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\sha256.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\tfm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\types.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="cyassl"
+	ProjectGUID="{73973223-5EE8-41CA-8E88-1D60E89A237B}"
+	RootNamespace="cyassl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\ctaocrypt\src\aes.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\arc4.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\asm.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\asn.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\coding.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\cyassl_int.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\cyassl_io.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\cyassl_memory.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\des3.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\dh.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\dsa.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\hc128.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\hmac.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\integer.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\keys.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\logging.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\md4.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\md5.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\misc.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\pwdbased.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\rabbit.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\random.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\ripemd.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\rsa.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\sha.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\sha256.c"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\sha512.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ssl.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\tls.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\ctaocrypt\include\arc4.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\asn.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\coding.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_aes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_dh.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_dsa.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_hmac.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_md4.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_md5.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_ripemd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_rsa.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\ctc_sha.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\cyassl_error.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\cyassl_int.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\des3.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\error.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\hc128.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\integer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\misc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\pwdbased.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\rabbit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\random.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\sha256.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\tfm.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ctaocrypt\include\types.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/ssl.c b/src/ssl.c
index 63255d501..cb90a4045 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -679,7 +679,7 @@ int AddCA(SSL_CTX* ctx, buffer der)
                 long   consumed = info.consumed;
                 word32 idx = 0;
 
-                if ( (sz - consumed) > bufferSz) {
+                if ( (sz - consumed) > (int)bufferSz) {
                     CYASSL_MSG("Growing Tmp Chain Buffer");
                     bufferSz = sz - consumed;  /* will shrink to actual size */
                     chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap,