From 99ab915f248d720246ec62dcb72c41885fdbde0d Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Mon, 24 Feb 2014 20:12:43 -0600
Subject: [PATCH] windows update libsrtp to use openssl

---
 libs/srtp/config.hw                    |  1 +
 libs/srtp/libsrtp.2010.vcxproj         | 16 ++++++++-------
 libs/srtp/libsrtp.2010.vcxproj.filters | 27 +++++++++++++++++---------
 libs/srtp/libsrtp.2012.vcxproj         | 16 ++++++++-------
 libs/srtp/libsrtp.2012.vcxproj.filters | 24 ++++++++++++++---------
 5 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/libs/srtp/config.hw b/libs/srtp/config.hw
index 349858433e..902598f3fc 100644
--- 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 56a6ba6cf7..1b037c00b8 100644
--- a/libs/srtp/libsrtp.2010.vcxproj
+++ b/libs/srtp/libsrtp.2010.vcxproj
@@ -127,7 +127,7 @@
     </PreBuildEvent>
     <ClCompile>
       <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>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +149,7 @@
     </Midl>
     <ClCompile>
       <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>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -166,7 +166,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
     </PreBuildEvent>
     <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -184,7 +184,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -344,6 +344,9 @@
     </Link>
   </ItemDefinitionGroup>
   <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\srtp.c" />
     <ClCompile Include="crypto\kernel\alloc.c" />
@@ -362,13 +365,10 @@
       <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>
     </ClCompile>
     <ClCompile Include="crypto\cipher\aes_cbc.c" />
-    <ClCompile Include="crypto\cipher\aes_icm.c" />
     <ClCompile Include="crypto\cipher\cipher.c" />
     <ClCompile Include="crypto\cipher\null_cipher.c" />
     <ClCompile Include="crypto\hash\auth.c" />
-    <ClCompile Include="crypto\hash\hmac.c" />
     <ClCompile Include="crypto\hash\null_auth.c" />
-    <ClCompile Include="crypto\hash\sha1.c" />
     <ClCompile Include="crypto\replay\rdb.c" />
     <ClCompile Include="crypto\replay\rdbx.c" />
     <ClCompile Include="crypto\replay\ut_sim.c" />
@@ -378,7 +378,9 @@
   <ItemGroup>
     <ClInclude Include="crypto\include\aes.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_ossl.h" />
     <ClInclude Include="crypto\include\alloc.h" />
     <ClInclude Include="crypto\include\auth.h" />
     <ClInclude Include="crypto\include\cipher.h" />
diff --git a/libs/srtp/libsrtp.2010.vcxproj.filters b/libs/srtp/libsrtp.2010.vcxproj.filters
index 80b52717d3..fd07810016 100644
--- 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">
       <Filter>Source Files\Ciphers</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\cipher\aes_icm.c">
-      <Filter>Source Files\Ciphers</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\cipher\cipher.c">
       <Filter>Source Files\Ciphers</Filter>
     </ClCompile>
@@ -72,15 +69,9 @@
     <ClCompile Include="crypto\hash\auth.c">
       <Filter>Source Files\Hashes</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\hash\hmac.c">
-      <Filter>Source Files\Hashes</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\hash\null_auth.c">
       <Filter>Source Files\Hashes</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\hash\sha1.c">
-      <Filter>Source Files\Hashes</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\replay\rdb.c">
       <Filter>Source Files\Replay</Filter>
     </ClCompile>
@@ -96,6 +87,18 @@
     <ClCompile Include="crypto\math\stat.c">
       <Filter>Source Files\Math</Filter>
     </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>
     <ClInclude Include="crypto\include\aes.h">
@@ -191,6 +194,12 @@
     <ClInclude Include="crypto\include\xfm.h">
       <Filter>Header Files</Filter>
     </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>
     <None Include="srtp.def">
diff --git a/libs/srtp/libsrtp.2012.vcxproj b/libs/srtp/libsrtp.2012.vcxproj
index 473bf9a314..b9852910cf 100644
--- a/libs/srtp/libsrtp.2012.vcxproj
+++ b/libs/srtp/libsrtp.2012.vcxproj
@@ -135,7 +135,7 @@
     </PreBuildEvent>
     <ClCompile>
       <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>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -157,7 +157,7 @@
     </Midl>
     <ClCompile>
       <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>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -174,7 +174,7 @@
       <Command>copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" &gt; NUL</Command>
     </PreBuildEvent>
     <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -192,7 +192,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -356,6 +356,9 @@
     </Link>
   </ItemDefinitionGroup>
   <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\srtp.c" />
     <ClCompile Include="crypto\kernel\alloc.c" />
@@ -374,13 +377,10 @@
       <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Debug Dll|x64'">false</FunctionLevelLinking>
     </ClCompile>
     <ClCompile Include="crypto\cipher\aes_cbc.c" />
-    <ClCompile Include="crypto\cipher\aes_icm.c" />
     <ClCompile Include="crypto\cipher\cipher.c" />
     <ClCompile Include="crypto\cipher\null_cipher.c" />
     <ClCompile Include="crypto\hash\auth.c" />
-    <ClCompile Include="crypto\hash\hmac.c" />
     <ClCompile Include="crypto\hash\null_auth.c" />
-    <ClCompile Include="crypto\hash\sha1.c" />
     <ClCompile Include="crypto\replay\rdb.c" />
     <ClCompile Include="crypto\replay\rdbx.c" />
     <ClCompile Include="crypto\replay\ut_sim.c" />
@@ -390,7 +390,9 @@
   <ItemGroup>
     <ClInclude Include="crypto\include\aes.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_ossl.h" />
     <ClInclude Include="crypto\include\alloc.h" />
     <ClInclude Include="crypto\include\auth.h" />
     <ClInclude Include="crypto\include\cipher.h" />
diff --git a/libs/srtp/libsrtp.2012.vcxproj.filters b/libs/srtp/libsrtp.2012.vcxproj.filters
index ba160b64ac..fd07810016 100644
--- 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">
       <Filter>Source Files\Ciphers</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\cipher\aes_icm.c">
-      <Filter>Source Files\Ciphers</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\cipher\cipher.c">
       <Filter>Source Files\Ciphers</Filter>
     </ClCompile>
@@ -72,15 +69,9 @@
     <ClCompile Include="crypto\hash\auth.c">
       <Filter>Source Files\Hashes</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\hash\hmac.c">
-      <Filter>Source Files\Hashes</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\hash\null_auth.c">
       <Filter>Source Files\Hashes</Filter>
     </ClCompile>
-    <ClCompile Include="crypto\hash\sha1.c">
-      <Filter>Source Files\Hashes</Filter>
-    </ClCompile>
     <ClCompile Include="crypto\replay\rdb.c">
       <Filter>Source Files\Replay</Filter>
     </ClCompile>
@@ -99,6 +90,15 @@
     <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>
     <ClInclude Include="crypto\include\aes.h">
@@ -194,6 +194,12 @@
     <ClInclude Include="crypto\include\xfm.h">
       <Filter>Header Files</Filter>
     </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>
     <None Include="srtp.def">