windows correct srtp

diff --git a/libs/srtp/crypto/include/datatypes.h b/libs/srtp/crypto/include/datatypes.h
index e16d895bb5927be395e2505924f77179c0c0c49d..34634e318b64d842f424dd2d94baf3d305b31581 100644 (file)
--- a/libs/srtp/crypto/include/datatypes.h
+++ b/libs/srtp/crypto/include/datatypes.h
@@ -409,16 +409,12 @@ static inline uint32_t be32_to_cpu(uint32_t v) {
 #  define be32_to_cpu(x)       ntohl((x))
 # endif /* HAVE_X86 */
 
-static inline uint64_t be64_to_cpu(uint64_t v) {
-# ifdef NO_64BIT_MATH
-   /* use the make64 functions to do 64-bit math */
-   v = make64(htonl(low32(v)),htonl(high32(v)));
-# else
-   /* use the native 64-bit math */
-   v= (uint64_t)((be32_to_cpu((uint32_t)(v >> 32))) | (((uint64_t)be32_to_cpu((uint32_t)v)) << 32));
+# ifdef NO_64BIT_MATH\r
+   /* use the make64 functions to do 64-bit math */\r
+#  define be64_to_cpu(v) (make64(htonl(low32(v)),htonl(high32(v))))\r
+# else\r
+#  define be64_to_cpu(v) ((ntohl((uint32_t)(v >> 32))) | (((uint64_t)ntohl((uint32_t)v)) << 32))\r
 # endif
-   return v;
-}
 
 #endif /* ! SRTP_KERNEL_LINUX */
 

diff --git a/libs/srtp/libsrtp.2012.vcxproj.filters b/libs/srtp/libsrtp.2012.vcxproj.filters
new file mode 100644 (file)
index 0000000..80b5271
--- /dev/null
+++ b/libs/srtp/libsrtp.2012.vcxproj.filters
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Source Files\Kernel">\r
+      <UniqueIdentifier>{7633dd78-47bb-43bb-9ba1-4ab7d89873d1}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Ciphers">\r
+      <UniqueIdentifier>{532f3250-40ff-4a34-a071-f7bccfde71e2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Hashes">\r
+      <UniqueIdentifier>{8343a503-59a3-4af7-bed6-6d6439001561}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Replay">\r
+      <UniqueIdentifier>{dfda6cc2-cf2f-4b3d-ad48-6bfe332ec0c1}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Math">\r
+      <UniqueIdentifier>{67144ed7-fb0e-4c22-96a4-1be71053e80f}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="srtp\srtp.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\kernel\alloc.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\kernel\crypto_kernel.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\rng\ctr_prng.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\kernel\err.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\kernel\key.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\rng\prng.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\rng\rand_source.c">\r
+      <Filter>Source Files\Kernel</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\cipher\aes.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
+    <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
+    <ClCompile Include="crypto\cipher\null_cipher.c">\r
+      <Filter>Source Files\Ciphers</Filter>\r
+    </ClCompile>\r
+    <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
+    <ClCompile Include="crypto\replay\rdbx.c">\r
+      <Filter>Source Files\Replay</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\replay\ut_sim.c">\r
+      <Filter>Source Files\Replay</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\math\datatypes.c">\r
+      <Filter>Source Files\Math</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="crypto\math\stat.c">\r
+      <Filter>Source Files\Math</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="crypto\include\aes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_cbc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\aes_icm.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\alloc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\auth.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\cipher.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\config.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\crypto.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\crypto_kernel.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\crypto_math.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\crypto_types.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\cryptoalg.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\datatypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\err.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\gf2_8.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\hmac.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\integers.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\kernel_compat.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\key.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\null_auth.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\null_cipher.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\prng.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\rand_source.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\rdb.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\rdbx.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\rtp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\sha1.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\srtp.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\stat.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\ut_sim.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="crypto\include\xfm.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="srtp.def">\r
+      <Filter>Source Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file