]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3d53825)
windows update libsrtp to use openssl
authorJeff Lenk <jeff@jefflenk.com>
Tue, 25 Feb 2014 02:12:43 +0000 (20:12 -0600)
committerJeff Lenk <jeff@jefflenk.com>
Tue, 25 Feb 2014 02:13:12 +0000 (20:13 -0600)
libs/srtp/config.hw patch | blob | blame | history
libs/srtp/libsrtp.2010.vcxproj patch | blob | blame | history
libs/srtp/libsrtp.2010.vcxproj.filters patch | blob | blame | history
libs/srtp/libsrtp.2012.vcxproj patch | blob | blame | history
libs/srtp/libsrtp.2012.vcxproj.filters patch | blob | blame | history

diff --git a/libs/srtp/config.hw b/libs/srtp/config.hw
index 349858433e96d6ad1aeb571c261827ef0bff3c6b..902598f3fc0c09da383ed4a59d72b4619f9e150d 100644 (file)
--- a/libs/srtp/config.hw
+++ b/libs/srtp/config.hw
@@ -195,4 +195,5 @@ typedef __int64             int64_t;
 
 #ifdef _MSC_VER
 #pragma warning(disable:4311)
+#define OPENSSL
 #endif
diff --git a/libs/srtp/libsrtp.2010.vcxproj b/libs/srtp/libsrtp.2010.vcxproj
index 56a6ba6cf77a9a2faddbe99d9a6eed2f6200fb6c..1b037c00b868db4ced49c1c7f67b5dc475912a67 100644 (file)
--- a/libs/srtp/libsrtp.2010.vcxproj
+++ b/libs/srtp/libsrtp.2010.vcxproj
@@ -127,7 +127,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -149,7 +149,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -166,7 +166,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <StructMemberAlignment>Default</StructMemberAlignment>\r
@@ -184,7 +184,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <StructMemberAlignment>Default</StructMemberAlignment>\r
@@ -344,6 +344,9 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="crypto\cipher\aes_gcm_ossl.c" />\r
+    <ClCompile Include="crypto\cipher\aes_icm_ossl.c" />\r
+    <ClCompile Include="crypto\hash\hmac_ossl.c" />\r
     <ClCompile Include="srtp\ekt.c" />\r
     <ClCompile Include="srtp\srtp.c" />\r
     <ClCompile Include="crypto\kernel\alloc.c" />\r
@@ -362,13 +365,10 @@
       <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>\r
     </ClCompile>\r
     <ClCompile Include="crypto\cipher\aes_cbc.c" />\r
-    <ClCompile Include="crypto\cipher\aes_icm.c" />\r
     <ClCompile Include="crypto\cipher\cipher.c" />\r
     <ClCompile Include="crypto\cipher\null_cipher.c" />\r
     <ClCompile Include="crypto\hash\auth.c" />\r
-    <ClCompile Include="crypto\hash\hmac.c" />\r
     <ClCompile Include="crypto\hash\null_auth.c" />\r
-    <ClCompile Include="crypto\hash\sha1.c" />\r
     <ClCompile Include="crypto\replay\rdb.c" />\r
     <ClCompile Include="crypto\replay\rdbx.c" />\r
     <ClCompile Include="crypto\replay\ut_sim.c" />\r
@@ -378,7 +378,9 @@
   <ItemGroup>\r
     <ClInclude Include="crypto\include\aes.h" />\r
     <ClInclude Include="crypto\include\aes_cbc.h" />\r
+    <ClInclude Include="crypto\include\aes_gcm_ossl.h" />\r
     <ClInclude Include="crypto\include\aes_icm.h" />\r
+    <ClInclude Include="crypto\include\aes_icm_ossl.h" />\r
     <ClInclude Include="crypto\include\alloc.h" />\r
     <ClInclude Include="crypto\include\auth.h" />\r
     <ClInclude Include="crypto\include\cipher.h" />\r
diff --git a/libs/srtp/libsrtp.2010.vcxproj.filters b/libs/srtp/libsrtp.2010.vcxproj.filters
index 80b52717d3bd82de541562001a4e654ee4f5c5e3..fd0781001633caacb70a4f34e0f8af99a53a758d 100644 (file)
--- a/libs/srtp/libsrtp.2010.vcxproj.filters
+++ b/libs/srtp/libsrtp.2010.vcxproj.filters
@@ -60,9 +60,6 @@
     <ClCompile Include="crypto\cipher\aes_cbc.c">\r
       <Filter>Source Files\Ciphers</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\cipher\aes_icm.c">\r
-      <Filter>Source Files\Ciphers</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\cipher\cipher.c">\r
       <Filter>Source Files\Ciphers</Filter>\r
     </ClCompile>\r
@@ -72,15 +69,9 @@
     <ClCompile Include="crypto\hash\auth.c">\r
       <Filter>Source Files\Hashes</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\hash\hmac.c">\r
-      <Filter>Source Files\Hashes</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\hash\null_auth.c">\r
       <Filter>Source Files\Hashes</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\hash\sha1.c">\r
-      <Filter>Source Files\Hashes</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\replay\rdb.c">\r
       <Filter>Source Files\Replay</Filter>\r
     </ClCompile>\r
@@ -96,6 +87,18 @@
     <ClCompile Include="crypto\math\stat.c">\r
       <Filter>Source Files\Math</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="srtp\ekt.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\hash\hmac_ossl.c">\r
+      <Filter>Source Files\Hashes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\cipher\aes_gcm_ossl.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\cipher\aes_icm_ossl.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="crypto\include\aes.h">\r
@@ -191,6 +194,12 @@
     <ClInclude Include="crypto\include\xfm.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_gcm_ossl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_icm_ossl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="srtp.def">\r
diff --git a/libs/srtp/libsrtp.2012.vcxproj b/libs/srtp/libsrtp.2012.vcxproj
index 473bf9a314cd3baba57cb4202d9bacf2fea5728d..b9852910cfc6890151a016fb2699f62f5b478d4b 100644 (file)
--- a/libs/srtp/libsrtp.2012.vcxproj
+++ b/libs/srtp/libsrtp.2012.vcxproj
@@ -135,7 +135,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -157,7 +157,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -174,7 +174,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <StructMemberAlignment>Default</StructMemberAlignment>\r
@@ -192,7 +192,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>crypto/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <StructMemberAlignment>Default</StructMemberAlignment>\r
@@ -356,6 +356,9 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="crypto\cipher\aes_gcm_ossl.c" />\r
+    <ClCompile Include="crypto\cipher\aes_icm_ossl.c" />\r
+    <ClCompile Include="crypto\hash\hmac_ossl.c" />\r
     <ClCompile Include="srtp\ekt.c" />\r
     <ClCompile Include="srtp\srtp.c" />\r
     <ClCompile Include="crypto\kernel\alloc.c" />\r
@@ -374,13 +377,10 @@
       <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>\r
     </ClCompile>\r
     <ClCompile Include="crypto\cipher\aes_cbc.c" />\r
-    <ClCompile Include="crypto\cipher\aes_icm.c" />\r
     <ClCompile Include="crypto\cipher\cipher.c" />\r
     <ClCompile Include="crypto\cipher\null_cipher.c" />\r
     <ClCompile Include="crypto\hash\auth.c" />\r
-    <ClCompile Include="crypto\hash\hmac.c" />\r
     <ClCompile Include="crypto\hash\null_auth.c" />\r
-    <ClCompile Include="crypto\hash\sha1.c" />\r
     <ClCompile Include="crypto\replay\rdb.c" />\r
     <ClCompile Include="crypto\replay\rdbx.c" />\r
     <ClCompile Include="crypto\replay\ut_sim.c" />\r
@@ -390,7 +390,9 @@
   <ItemGroup>\r
     <ClInclude Include="crypto\include\aes.h" />\r
     <ClInclude Include="crypto\include\aes_cbc.h" />\r
+    <ClInclude Include="crypto\include\aes_gcm_ossl.h" />\r
     <ClInclude Include="crypto\include\aes_icm.h" />\r
+    <ClInclude Include="crypto\include\aes_icm_ossl.h" />\r
     <ClInclude Include="crypto\include\alloc.h" />\r
     <ClInclude Include="crypto\include\auth.h" />\r
     <ClInclude Include="crypto\include\cipher.h" />\r
diff --git a/libs/srtp/libsrtp.2012.vcxproj.filters b/libs/srtp/libsrtp.2012.vcxproj.filters
index ba160b64ac7c655a5183256cb263249f9ae6b2e5..fd0781001633caacb70a4f34e0f8af99a53a758d 100644 (file)
--- a/libs/srtp/libsrtp.2012.vcxproj.filters
+++ b/libs/srtp/libsrtp.2012.vcxproj.filters
@@ -60,9 +60,6 @@
     <ClCompile Include="crypto\cipher\aes_cbc.c">\r
       <Filter>Source Files\Ciphers</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\cipher\aes_icm.c">\r
-      <Filter>Source Files\Ciphers</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\cipher\cipher.c">\r
       <Filter>Source Files\Ciphers</Filter>\r
     </ClCompile>\r
@@ -72,15 +69,9 @@
     <ClCompile Include="crypto\hash\auth.c">\r
       <Filter>Source Files\Hashes</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\hash\hmac.c">\r
-      <Filter>Source Files\Hashes</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\hash\null_auth.c">\r
       <Filter>Source Files\Hashes</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="crypto\hash\sha1.c">\r
-      <Filter>Source Files\Hashes</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="crypto\replay\rdb.c">\r
       <Filter>Source Files\Replay</Filter>\r
     </ClCompile>\r
@@ -99,6 +90,15 @@
     <ClCompile Include="srtp\ekt.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="crypto\hash\hmac_ossl.c">\r
+      <Filter>Source Files\Hashes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\cipher\aes_gcm_ossl.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\cipher\aes_icm_ossl.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="crypto\include\aes.h">\r
@@ -194,6 +194,12 @@
     <ClInclude Include="crypto\include\xfm.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_gcm_ossl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_icm_ossl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="srtp.def">\r
Mirror of https://github.com/signalwire/freeswitch.git