WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed typo with testsuite preprocessor. Added missing chacha.c, chacha20_poly1305.c, pkcs7.c and poly1305.c. Also added the IDE/WIN/user_settings.h to the project so its easy to find.

pull/282/head
David Garske 2016-02-04 11:19:51 -08:00
parent 41f7cb0482
commit 2db6246abc
15 changed files with 90 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client/client.vcproj
View File

@ -184,6 +184,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

3
examples/client/client.vcxproj
View File

@ -327,6 +327,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\IDE\WIN\user_settings.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

4
examples/echoclient/echoclient.vcproj
View File

@ -184,6 +184,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

3
examples/echoclient/echoclient.vcxproj
View File

@ -327,6 +327,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\IDE\WIN\user_settings.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

4
examples/echoserver/echoserver.vcproj
View File

@ -184,6 +184,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

3
examples/echoserver/echoserver.vcxproj
View File

@ -327,6 +327,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\IDE\WIN\user_settings.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

4
examples/server/server.vcproj
View File

@ -184,6 +184,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

3
examples/server/server.vcxproj
View File

@ -327,6 +327,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\IDE\WIN\user_settings.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

8
sslSniffer/sslSniffer.vcproj
View File

@ -186,7 +186,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\include\sniffer.h" RelativePath="..\wolfssl\sniffer.h"
>
</File>
<File
RelativePath="..\IDE\WIN\user_settings.h"
> >
</File> </File>
</Filter> </Filter>
@ -196,7 +200,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath="..\cyassl\sniffer_error.rc" RelativePath="..\wolfssl\sniffer_error.rc"
> >
</File> </File>
</Filter> </Filter>

1
sslSniffer/sslSniffer.vcxproj
View File

@ -171,6 +171,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\wolfssl\sniffer.h" /> <ClInclude Include="..\wolfssl\sniffer.h" />
<ClInclude Include="..\IDE\WIN\user_settings.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\wolfssl\sniffer_error.rc" /> <ResourceCompile Include="..\wolfssl\sniffer_error.rc" />

4
testsuite/testsuite.vcproj
View File

@ -204,6 +204,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

5
testsuite/testsuite.vcxproj
View File

@ -159,7 +159,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../;../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../;../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NO_MAIN_DRIVER;WOLFSSL_SNIFFER;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NO_MAIN_DRIVER;WOLFSSL_SNIFFER;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -332,6 +332,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\IDE\WIN\user_settings.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

14
wolfssl-ntru.vcproj
View File

@ -177,6 +177,13 @@
<File <File
RelativePath=".\wolfcrypt\src\coding.c" RelativePath=".\wolfcrypt\src\coding.c"
> >
<File
RelativePath=".\wolfcrypt\src\chacha.c"
>
</File>
<File
RelativePath=".\wolfcrypt\src\chacha20_poly1305.c"
>
</File> </File>
<File <File
RelativePath=".\src\crl.c" RelativePath=".\src\crl.c"
@ -254,6 +261,13 @@
RelativePath=".\src\ocsp.c" RelativePath=".\src\ocsp.c"
> >
</File> </File>
<File
RelativePath=".\wolfcrypt\src\pkcs7.c"
>
</File>
<File
RelativePath=".\wolfcrypt\src\poly1305.c"
>
<File <File
RelativePath=".\wolfcrypt\src\wc_port.c" RelativePath=".\wolfcrypt\src\wc_port.c"
> >

20
wolfssl.vcproj
View File

@ -175,6 +175,14 @@
RelativePath=".\wolfcrypt\src\coding.c" RelativePath=".\wolfcrypt\src\coding.c"
> >
</File> </File>
<File
RelativePath=".\wolfcrypt\src\chacha.c"
>
</File>
<File
RelativePath=".\wolfcrypt\src\chacha20_poly1305.c"
>
</File>
<File <File
RelativePath=".\src\crl.c" RelativePath=".\src\crl.c"
> >
@ -247,6 +255,14 @@
RelativePath=".\src\ocsp.c" RelativePath=".\src\ocsp.c"
> >
</File> </File>
<File
RelativePath=".\wolfcrypt\src\pkcs7.c"
>
</File>
<File
RelativePath=".\wolfcrypt\src\poly1305.c"
>
</File>
<File <File
RelativePath=".\wolfcrypt\src\wc_port.c" RelativePath=".\wolfcrypt\src\wc_port.c"
> >
@ -305,6 +321,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="IDE\WIN\user_settings.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

21
wolfssl.vcxproj
View File

@ -276,13 +276,21 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\crl.c" />
<ClCompile Include="src\internal.c" />
<ClCompile Include="src\io.c" />
<ClCompile Include="src\keys.c" />
<ClCompile Include="src\ocsp.c" />
<ClCompile Include="src\ssl.c" />
<ClCompile Include="src\tls.c" />
<ClCompile Include="wolfcrypt\src\aes.c" /> <ClCompile Include="wolfcrypt\src\aes.c" />
<ClCompile Include="wolfcrypt\src\arc4.c" /> <ClCompile Include="wolfcrypt\src\arc4.c" />
<ClCompile Include="wolfcrypt\src\asn.c" /> <ClCompile Include="wolfcrypt\src\asn.c" />
<ClCompile Include="wolfcrypt\src\blake2b.c" /> <ClCompile Include="wolfcrypt\src\blake2b.c" />
<ClCompile Include="wolfcrypt\src\camellia.c" /> <ClCompile Include="wolfcrypt\src\camellia.c" />
<ClCompile Include="wolfcrypt\src\chacha.c" />
<ClCompile Include="wolfcrypt\src\chacha20_poly1305.c" />
<ClCompile Include="wolfcrypt\src\coding.c" /> <ClCompile Include="wolfcrypt\src\coding.c" />
<ClCompile Include="src\crl.c" />
<ClCompile Include="wolfcrypt\src\des3.c" /> <ClCompile Include="wolfcrypt\src\des3.c" />
<ClCompile Include="wolfcrypt\src\dh.c" /> <ClCompile Include="wolfcrypt\src\dh.c" />
<ClCompile Include="wolfcrypt\src\dsa.c" /> <ClCompile Include="wolfcrypt\src\dsa.c" />
@ -292,15 +300,12 @@
<ClCompile Include="wolfcrypt\src\hc128.c" /> <ClCompile Include="wolfcrypt\src\hc128.c" />
<ClCompile Include="wolfcrypt\src\hmac.c" /> <ClCompile Include="wolfcrypt\src\hmac.c" />
<ClCompile Include="wolfcrypt\src\integer.c" /> <ClCompile Include="wolfcrypt\src\integer.c" />
<ClCompile Include="src\internal.c" />
<ClCompile Include="src\io.c" />
<ClCompile Include="src\keys.c" />
<ClCompile Include="wolfcrypt\src\logging.c" /> <ClCompile Include="wolfcrypt\src\logging.c" />
<ClCompile Include="wolfcrypt\src\md4.c" /> <ClCompile Include="wolfcrypt\src\md4.c" />
<ClCompile Include="wolfcrypt\src\md5.c" /> <ClCompile Include="wolfcrypt\src\md5.c" />
<ClCompile Include="wolfcrypt\src\memory.c" /> <ClCompile Include="wolfcrypt\src\memory.c" />
<ClCompile Include="src\ocsp.c" /> <ClCompile Include="wolfcrypt\src\pkcs7.c" />
<ClCompile Include="wolfcrypt\src\wc_port.c" /> <ClCompile Include="wolfcrypt\src\poly1305.c" />
<ClCompile Include="wolfcrypt\src\pwdbased.c" /> <ClCompile Include="wolfcrypt\src\pwdbased.c" />
<ClCompile Include="wolfcrypt\src\rabbit.c" /> <ClCompile Include="wolfcrypt\src\rabbit.c" />
<ClCompile Include="wolfcrypt\src\random.c" /> <ClCompile Include="wolfcrypt\src\random.c" />
@ -311,8 +316,7 @@
<ClCompile Include="wolfcrypt\src\sha512.c" /> <ClCompile Include="wolfcrypt\src\sha512.c" />
<ClCompile Include="wolfcrypt\src\signature.c" /> <ClCompile Include="wolfcrypt\src\signature.c" />
<ClCompile Include="wolfcrypt\src\wc_encrypt.c" /> <ClCompile Include="wolfcrypt\src\wc_encrypt.c" />
<ClCompile Include="src\ssl.c" /> <ClCompile Include="wolfcrypt\src\wc_port.c" />
<ClCompile Include="src\tls.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="wolfcrypt\src\aes_asm.asm"> <CustomBuild Include="wolfcrypt\src\aes_asm.asm">
@ -329,6 +333,7 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)%(Filename).obj</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)%(Filename).obj</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(IntDir)%(Filename).obj</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(IntDir)%(Filename).obj</Outputs>
</CustomBuild> </CustomBuild>
<ClInclude Include="IDE\WIN\user_settings.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">