kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

windows update libsrtp to use openssl

This commit is contained in:
Jeff Lenk 2014-02-24 20:12:43 -06:00
parent 3d53825d1d
commit 99ab915f24
5 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/srtp/config.hw
View File

@ -195,4 +195,5 @@ typedef __int64 int64_t;
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable:4311) #pragma warning(disable:4311)
#define OPENSSL
#endif #endif

16
libs/srtp/libsrtp.2010.vcxproj
View File

@ -127,7 +127,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -149,7 +149,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -166,7 +166,7 @@
<Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command> <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment> <StructMemberAlignment>Default</StructMemberAlignment>
@ -184,7 +184,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment> <StructMemberAlignment>Default</StructMemberAlignment>
@ -344,6 +344,9 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="crypto\cipher\aes_gcm_ossl.c" />
<ClCompile Include="crypto\cipher\aes_icm_ossl.c" />
<ClCompile Include="crypto\hash\hmac_ossl.c" />
<ClCompile Include="srtp\ekt.c" /> <ClCompile Include="srtp\ekt.c" />
<ClCompile Include="srtp\srtp.c" /> <ClCompile Include="srtp\srtp.c" />
<ClCompile Include="crypto\kernel\alloc.c" /> <ClCompile Include="crypto\kernel\alloc.c" />
@ -362,13 +365,10 @@
<FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking> <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\cipher\aes_cbc.c" /> <ClCompile Include="crypto\cipher\aes_cbc.c" />
<ClCompile Include="crypto\cipher\aes_icm.c" />
<ClCompile Include="crypto\cipher\cipher.c" /> <ClCompile Include="crypto\cipher\cipher.c" />
<ClCompile Include="crypto\cipher\null_cipher.c" /> <ClCompile Include="crypto\cipher\null_cipher.c" />
<ClCompile Include="crypto\hash\auth.c" /> <ClCompile Include="crypto\hash\auth.c" />
<ClCompile Include="crypto\hash\hmac.c" />
<ClCompile Include="crypto\hash\null_auth.c" /> <ClCompile Include="crypto\hash\null_auth.c" />
<ClCompile Include="crypto\hash\sha1.c" />
<ClCompile Include="crypto\replay\rdb.c" /> <ClCompile Include="crypto\replay\rdb.c" />
<ClCompile Include="crypto\replay\rdbx.c" /> <ClCompile Include="crypto\replay\rdbx.c" />
<ClCompile Include="crypto\replay\ut_sim.c" /> <ClCompile Include="crypto\replay\ut_sim.c" />
@ -378,7 +378,9 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="crypto\include\aes.h" /> <ClInclude Include="crypto\include\aes.h" />
<ClInclude Include="crypto\include\aes_cbc.h" /> <ClInclude Include="crypto\include\aes_cbc.h" />
<ClInclude Include="crypto\include\aes_gcm_ossl.h" />
<ClInclude Include="crypto\include\aes_icm.h" /> <ClInclude Include="crypto\include\aes_icm.h" />
<ClInclude Include="crypto\include\aes_icm_ossl.h" />
<ClInclude Include="crypto\include\alloc.h" /> <ClInclude Include="crypto\include\alloc.h" />
<ClInclude Include="crypto\include\auth.h" /> <ClInclude Include="crypto\include\auth.h" />
<ClInclude Include="crypto\include\cipher.h" /> <ClInclude Include="crypto\include\cipher.h" />

27
libs/srtp/libsrtp.2010.vcxproj.filters
View File

@ -60,9 +60,6 @@
<ClCompile Include="crypto\cipher\aes_cbc.c"> <ClCompile Include="crypto\cipher\aes_cbc.c">
<Filter>Source Files\Ciphers</Filter> <Filter>Source Files\Ciphers</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\cipher\aes_icm.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\cipher.c"> <ClCompile Include="crypto\cipher\cipher.c">
<Filter>Source Files\Ciphers</Filter> <Filter>Source Files\Ciphers</Filter>
</ClCompile> </ClCompile>
@ -72,15 +69,9 @@
<ClCompile Include="crypto\hash\auth.c"> <ClCompile Include="crypto\hash\auth.c">
<Filter>Source Files\Hashes</Filter> <Filter>Source Files\Hashes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\hash\hmac.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\hash\null_auth.c"> <ClCompile Include="crypto\hash\null_auth.c">
<Filter>Source Files\Hashes</Filter> <Filter>Source Files\Hashes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\hash\sha1.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\replay\rdb.c"> <ClCompile Include="crypto\replay\rdb.c">
<Filter>Source Files\Replay</Filter> <Filter>Source Files\Replay</Filter>
</ClCompile> </ClCompile>
@ -96,6 +87,18 @@
<ClCompile Include="crypto\math\stat.c"> <ClCompile Include="crypto\math\stat.c">
<Filter>Source Files\Math</Filter> <Filter>Source Files\Math</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="srtp\ekt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypto\hash\hmac_ossl.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\aes_gcm_ossl.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\aes_icm_ossl.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="crypto\include\aes.h"> <ClInclude Include="crypto\include\aes.h">
@ -191,6 +194,12 @@
<ClInclude Include="crypto\include\xfm.h"> <ClInclude Include="crypto\include\xfm.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="crypto\include\aes_gcm_ossl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypto\include\aes_icm_ossl.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="srtp.def"> <None Include="srtp.def">

16
libs/srtp/libsrtp.2012.vcxproj
View File

@ -135,7 +135,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -157,7 +157,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -174,7 +174,7 @@
<Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command> <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment> <StructMemberAlignment>Default</StructMemberAlignment>
@ -192,7 +192,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<StructMemberAlignment>Default</StructMemberAlignment> <StructMemberAlignment>Default</StructMemberAlignment>
@ -356,6 +356,9 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="crypto\cipher\aes_gcm_ossl.c" />
<ClCompile Include="crypto\cipher\aes_icm_ossl.c" />
<ClCompile Include="crypto\hash\hmac_ossl.c" />
<ClCompile Include="srtp\ekt.c" /> <ClCompile Include="srtp\ekt.c" />
<ClCompile Include="srtp\srtp.c" /> <ClCompile Include="srtp\srtp.c" />
<ClCompile Include="crypto\kernel\alloc.c" /> <ClCompile Include="crypto\kernel\alloc.c" />
@ -374,13 +377,10 @@
<FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking> <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\cipher\aes_cbc.c" /> <ClCompile Include="crypto\cipher\aes_cbc.c" />
<ClCompile Include="crypto\cipher\aes_icm.c" />
<ClCompile Include="crypto\cipher\cipher.c" /> <ClCompile Include="crypto\cipher\cipher.c" />
<ClCompile Include="crypto\cipher\null_cipher.c" /> <ClCompile Include="crypto\cipher\null_cipher.c" />
<ClCompile Include="crypto\hash\auth.c" /> <ClCompile Include="crypto\hash\auth.c" />
<ClCompile Include="crypto\hash\hmac.c" />
<ClCompile Include="crypto\hash\null_auth.c" /> <ClCompile Include="crypto\hash\null_auth.c" />
<ClCompile Include="crypto\hash\sha1.c" />
<ClCompile Include="crypto\replay\rdb.c" /> <ClCompile Include="crypto\replay\rdb.c" />
<ClCompile Include="crypto\replay\rdbx.c" /> <ClCompile Include="crypto\replay\rdbx.c" />
<ClCompile Include="crypto\replay\ut_sim.c" /> <ClCompile Include="crypto\replay\ut_sim.c" />
@ -390,7 +390,9 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="crypto\include\aes.h" /> <ClInclude Include="crypto\include\aes.h" />
<ClInclude Include="crypto\include\aes_cbc.h" /> <ClInclude Include="crypto\include\aes_cbc.h" />
<ClInclude Include="crypto\include\aes_gcm_ossl.h" />
<ClInclude Include="crypto\include\aes_icm.h" /> <ClInclude Include="crypto\include\aes_icm.h" />
<ClInclude Include="crypto\include\aes_icm_ossl.h" />
<ClInclude Include="crypto\include\alloc.h" /> <ClInclude Include="crypto\include\alloc.h" />
<ClInclude Include="crypto\include\auth.h" /> <ClInclude Include="crypto\include\auth.h" />
<ClInclude Include="crypto\include\cipher.h" /> <ClInclude Include="crypto\include\cipher.h" />

24
libs/srtp/libsrtp.2012.vcxproj.filters
View File

@ -60,9 +60,6 @@
<ClCompile Include="crypto\cipher\aes_cbc.c"> <ClCompile Include="crypto\cipher\aes_cbc.c">
<Filter>Source Files\Ciphers</Filter> <Filter>Source Files\Ciphers</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\cipher\aes_icm.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\cipher.c"> <ClCompile Include="crypto\cipher\cipher.c">
<Filter>Source Files\Ciphers</Filter> <Filter>Source Files\Ciphers</Filter>
</ClCompile> </ClCompile>
@ -72,15 +69,9 @@
<ClCompile Include="crypto\hash\auth.c"> <ClCompile Include="crypto\hash\auth.c">
<Filter>Source Files\Hashes</Filter> <Filter>Source Files\Hashes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\hash\hmac.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\hash\null_auth.c"> <ClCompile Include="crypto\hash\null_auth.c">
<Filter>Source Files\Hashes</Filter> <Filter>Source Files\Hashes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\hash\sha1.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\replay\rdb.c"> <ClCompile Include="crypto\replay\rdb.c">
<Filter>Source Files\Replay</Filter> <Filter>Source Files\Replay</Filter>
</ClCompile> </ClCompile>
@ -99,6 +90,15 @@
<ClCompile Include="srtp\ekt.c"> <ClCompile Include="srtp\ekt.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypto\hash\hmac_ossl.c">
<Filter>Source Files\Hashes</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\aes_gcm_ossl.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
<ClCompile Include="crypto\cipher\aes_icm_ossl.c">
<Filter>Source Files\Ciphers</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="crypto\include\aes.h"> <ClInclude Include="crypto\include\aes.h">
@ -194,6 +194,12 @@
<ClInclude Include="crypto\include\xfm.h"> <ClInclude Include="crypto\include\xfm.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="crypto\include\aes_gcm_ossl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypto\include\aes_icm_ossl.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="srtp.def"> <None Include="srtp.def">