wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

windows build fixes for new stuff

Browse Source
This commit is contained in:
Todd A Ouska
2011-04-28 16:34:42 -07:00
parent b6be0545ab
commit 906e5c19ad
3 changed files with 387 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/pwdbased.c
View File

@@ -293,7 +293,7 @@ int PKCS12_PBKDF(byte* output, const byte* passwd, int passLen,const byte* salt,
if (ret < 0) break; if (ret < 0) break;
} }
currentLen = min(kLen, u); currentLen = min(kLen, (int)u);
XMEMCPY(output, Ai, currentLen); XMEMCPY(output, Ai, currentLen);
output += currentLen; output += currentLen;
kLen -= currentLen; kLen -= currentLen;

762
cyassl.vcproj
View File

@@ -1,377 +1,385 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="cyassl" Name="cyassl"
ProjectGUID="{73973223-5EE8-41CA-8E88-1D60E89A237B}" ProjectGUID="{73973223-5EE8-41CA-8E88-1D60E89A237B}"
RootNamespace="cyassl" RootNamespace="cyassl"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
<Files> <Files>
<Filter <Filter
Name="Source Files" Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\ctaocrypt\src\aes.c" RelativePath=".\ctaocrypt\src\aes.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\arc4.c" RelativePath=".\ctaocrypt\src\arc4.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\asm.c" RelativePath=".\ctaocrypt\src\asm.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\asn.c" RelativePath=".\ctaocrypt\src\asn.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\coding.c" RelativePath=".\ctaocrypt\src\coding.c"
> >
</File> </File>
<File <File
RelativePath=".\src\cyassl_int.c" RelativePath=".\src\cyassl_int.c"
> >
</File> </File>
<File <File
RelativePath=".\src\cyassl_io.c" RelativePath=".\src\cyassl_io.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\des3.c" RelativePath=".\ctaocrypt\src\cyassl_memory.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\dh.c" RelativePath=".\ctaocrypt\src\des3.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\dsa.c" RelativePath=".\ctaocrypt\src\dh.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\hc128.c" RelativePath=".\ctaocrypt\src\dsa.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\hmac.c" RelativePath=".\ctaocrypt\src\hc128.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\integer.c" RelativePath=".\ctaocrypt\src\hmac.c"
> >
</File> </File>
<File <File
RelativePath=".\src\keys.c" RelativePath=".\ctaocrypt\src\integer.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\md4.c" RelativePath=".\src\keys.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\md5.c" RelativePath=".\ctaocrypt\src\logging.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\misc.c" RelativePath=".\ctaocrypt\src\md4.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\pwdbased.c" RelativePath=".\ctaocrypt\src\md5.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\rabbit.c" RelativePath=".\ctaocrypt\src\misc.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\random.c" RelativePath=".\ctaocrypt\src\pwdbased.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\ripemd.c" RelativePath=".\ctaocrypt\src\rabbit.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\rsa.c" RelativePath=".\ctaocrypt\src\random.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\sha.c" RelativePath=".\ctaocrypt\src\ripemd.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\sha256.c" RelativePath=".\ctaocrypt\src\rsa.c"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\src\sha512.c" RelativePath=".\ctaocrypt\src\sha.c"
> >
</File> </File>
<File <File
RelativePath=".\src\ssl.c" RelativePath=".\ctaocrypt\src\sha256.c"
> >
</File> </File>
<File <File
RelativePath=".\src\tls.c" RelativePath=".\ctaocrypt\src\sha512.c"
> >
</File> </File>
</Filter> <File
<Filter RelativePath=".\src\ssl.c"
Name="Header Files" >
Filter="h;hpp;hxx;hm;inl;inc;xsd" </File>
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" <File
> RelativePath=".\src\tls.c"
<File >
RelativePath=".\ctaocrypt\include\arc4.h" </File>
> </Filter>
</File> <Filter
<File Name="Header Files"
RelativePath=".\ctaocrypt\include\asn.h" Filter="h;hpp;hxx;hm;inl;inc;xsd"
> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
</File> >
<File <File
RelativePath=".\ctaocrypt\include\coding.h" RelativePath=".\ctaocrypt\include\arc4.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_aes.h" RelativePath=".\ctaocrypt\include\asn.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_dh.h" RelativePath=".\ctaocrypt\include\coding.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_dsa.h" RelativePath=".\ctaocrypt\include\ctc_aes.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_hmac.h" RelativePath=".\ctaocrypt\include\ctc_dh.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_md4.h" RelativePath=".\ctaocrypt\include\ctc_dsa.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_md5.h" RelativePath=".\ctaocrypt\include\ctc_hmac.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_ripemd.h" RelativePath=".\ctaocrypt\include\ctc_md4.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_rsa.h" RelativePath=".\ctaocrypt\include\ctc_md5.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\ctc_sha.h" RelativePath=".\ctaocrypt\include\ctc_ripemd.h"
> >
</File> </File>
<File <File
RelativePath=".\include\cyassl_error.h" RelativePath=".\ctaocrypt\include\ctc_rsa.h"
> >
</File> </File>
<File <File
RelativePath=".\include\cyassl_int.h" RelativePath=".\ctaocrypt\include\ctc_sha.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\des3.h" RelativePath=".\include\cyassl_error.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\error.h" RelativePath=".\include\cyassl_int.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\hc128.h" RelativePath=".\ctaocrypt\include\des3.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\integer.h" RelativePath=".\ctaocrypt\include\error.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\misc.h" RelativePath=".\ctaocrypt\include\hc128.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\pwdbased.h" RelativePath=".\ctaocrypt\include\integer.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\rabbit.h" RelativePath=".\ctaocrypt\include\misc.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\random.h" RelativePath=".\ctaocrypt\include\pwdbased.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\sha256.h" RelativePath=".\ctaocrypt\include\rabbit.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\tfm.h" RelativePath=".\ctaocrypt\include\random.h"
> >
</File> </File>
<File <File
RelativePath=".\ctaocrypt\include\types.h" RelativePath=".\ctaocrypt\include\sha256.h"
> >
</File> </File>
</Filter> <File
<Filter RelativePath=".\ctaocrypt\include\tfm.h"
Name="Resource Files" >
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" </File>
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" <File
> RelativePath=".\ctaocrypt\include\types.h"
</Filter> >
</Files> </File>
<Globals> </Filter>
</Globals> <Filter
</VisualStudioProject> 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>

2
src/ssl.c
View File

@@ -679,7 +679,7 @@ int AddCA(SSL_CTX* ctx, buffer der)
long consumed = info.consumed; long consumed = info.consumed;
word32 idx = 0; word32 idx = 0;
if ( (sz - consumed) > bufferSz) { if ( (sz - consumed) > (int)bufferSz) {
CYASSL_MSG("Growing Tmp Chain Buffer"); CYASSL_MSG("Growing Tmp Chain Buffer");
bufferSz = sz - consumed; /* will shrink to actual size */ bufferSz = sz - consumed; /* will shrink to actual size */
chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap, chainBuffer = (byte*)XMALLOC(bufferSz, ctx->heap,