fix ntru windows build

This commit is contained in:
Todd A Ouska
2011-04-29 11:09:45 -07:00
parent c4e54556c5
commit db18926414
5 changed files with 1004 additions and 996 deletions

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;WIN32" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;NO_PSK;WIN32"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -106,7 +106,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl" AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl"
PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;WIN32" PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;NO_PSK;WIN32"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@@ -178,6 +178,10 @@
RelativePath=".\src\cyassl_io.c" RelativePath=".\src\cyassl_io.c"
> >
</File> </File>
<File
RelativePath=".\ctaocrypt\src\cyassl_memory.c"
>
</File>
<File <File
RelativePath=".\ctaocrypt\src\des3.c" RelativePath=".\ctaocrypt\src\des3.c"
> >
@@ -206,6 +210,10 @@
RelativePath=".\src\keys.c" RelativePath=".\src\keys.c"
> >
</File> </File>
<File
RelativePath=".\ctaocrypt\src\logging.c"
>
</File>
<File <File
RelativePath=".\ctaocrypt\src\md4.c" RelativePath=".\ctaocrypt\src\md4.c"
> >

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="NO_PSK"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl" AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="NO_PSK"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@@ -188,9 +188,9 @@ static INLINE void showPeer(SSL* ssl)
/* testsuite has multiple threads writing to stdout, get output /* testsuite has multiple threads writing to stdout, get output
message ready to write once */ message ready to write once */
strLen = snprintf(serialMsg, 16, " serial number"); strLen = sprintf(serialMsg, " serial number");
for (i = 0; i < sz; i++) for (i = 0; i < sz; i++)
snprintf(serialMsg + strLen + (i*3), 4, ":%02x ", serial[i]); sprintf(serialMsg + strLen + (i*3), ":%02x ", serial[i]);
printf("%s\n", serialMsg); printf("%s\n", serialMsg);
} }

View File

@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl" AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl"
PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;WIN32" PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;NO_PSK;WIN32"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@@ -118,7 +118,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl" AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl"
PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;WIN32" PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;NO_PSK;WIN32"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"