FS-4228 --resolve add zrtp support to windows vs2010 build

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index e7cccee08c66bccf833fdbb55175f1a54f38b8a3..954ce1cc1b0fc058047bf32f7fa5b2ba970b6800 100644 (file)
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -525,6 +525,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "src\mod\endpoints
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsmopen", "src\mod\endpoints\mod_gsmopen\mod_gsmopen.2010.vcxproj", "{74B120FF-6935-4DFE-A142-CDB6BEA99C90}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzrtp", "libs\libzrtp\projects\win\libzrtp.2010.vcxproj", "{C13CC324-0032-4492-9A30-310A6BD64FF5}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                All|Win32 = All|Win32\r
@@ -3574,6 +3576,23 @@ Global
                {74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64\r
                {74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64 Setup.ActiveCfg = Release|x64\r
                {74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x86 Setup.ActiveCfg = Release|x64\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.Build.0 = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x64.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x64 Setup.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x86 Setup.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.ActiveCfg = Debug|x64\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.Build.0 = Debug|x64\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64 Setup.ActiveCfg = Debug|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.Build.0 = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.ActiveCfg = Release|x64\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.Build.0 = Release|x64\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64 Setup.ActiveCfg = Release|Win32\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x86 Setup.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -3687,6 +3706,7 @@ Global
                {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {23B4D303-79FC-49E0-89E2-2280E7E28940} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}\r
                {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r
                {ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r

diff --git a/libs/libzrtp/projects/win/libzrtp.2010.vcxproj b/libs/libzrtp/projects/win/libzrtp.2010.vcxproj
new file mode 100644 (file)
index 0000000..3306611
--- /dev/null
+++ b/libs/libzrtp/projects/win/libzrtp.2010.vcxproj
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{C13CC324-0032-4492-9A30-310A6BD64FF5}</ProjectGuid>\r
+    <RootNamespace>libzrtp.x32</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectName>libzrtp</ProjectName>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
+    <Import Project="..\..\..\..\w32\extlib.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
+    <Import Project="..\..\..\..\w32\extlib.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
+    <Import Project="..\..\..\..\w32\extlib.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
+    <Import Project="..\..\..\..\w32\extlib.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>../../include;../../third_party/bnlib;../../third_party/bgaes;../../test/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0;ZRTP_USE_BUILTIN_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <StructMemberAlignment>Default</StructMemberAlignment>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib />\r
+    <PreBuildEvent>\r
+      <Command>if not exist "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h" copy "$(ProjectDir)..\..\third_party\bnlib\bnconfig.win" "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h"</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>../../include;../../third_party/bnlib;../../third_party/bgaes;../../test/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0;ZRTP_USE_BUILTIN_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <StructMemberAlignment>Default</StructMemberAlignment>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib />\r
+    <PreBuildEvent>\r
+      <Command>if not exist "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h" copy "$(ProjectDir)..\..\third_party\bnlib\bnconfig.win" "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h"</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>../../include;../../third_party/bnlib;../../third_party/bgaes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0;ZRTP_USE_BUILTIN_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ExceptionHandling>\r
+      </ExceptionHandling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <StructMemberAlignment>Default</StructMemberAlignment>\r
+      <BufferSecurityCheck>false</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib />\r
+    <PreBuildEvent>\r
+      <Command>if not exist "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h" copy "$(ProjectDir)..\..\third_party\bnlib\bnconfig.win" "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h"</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>../../include;../../third_party/bnlib;../../third_party/bgaes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0;ZRTP_USE_BUILTIN_CACHE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ExceptionHandling>\r
+      </ExceptionHandling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <StructMemberAlignment>Default</StructMemberAlignment>\r
+      <BufferSecurityCheck>false</BufferSecurityCheck>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+    </ClCompile>\r
+    <Lib />\r
+    <PreBuildEvent>\r
+      <Command>if not exist "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h" copy "$(ProjectDir)..\..\third_party\bnlib\bnconfig.win" "$(ProjectDir)..\..\third_party\bnlib\bnconfig.h"</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\include\zrtp.h" />\r
+    <ClInclude Include="..\..\include\zrtp_base.h" />\r
+    <ClInclude Include="..\..\include\zrtp_config.h" />\r
+    <ClInclude Include="..\..\include\zrtp_config_user.h" />\r
+    <ClInclude Include="..\..\include\zrtp_config_win.h" />\r
+    <ClInclude Include="..\..\include\zrtp_crypto.h" />\r
+    <ClInclude Include="..\..\include\zrtp_ec.h" />\r
+    <ClInclude Include="..\..\include\zrtp_engine.h" />\r
+    <ClInclude Include="..\..\include\zrtp_error.h" />\r
+    <ClInclude Include="..\..\include\zrtp_iface.h" />\r
+    <ClInclude Include="..\..\include\zrtp_iface_builtin.h" />\r
+    <ClInclude Include="..\..\include\zrtp_iface_cache.h" />\r
+    <ClInclude Include="..\..\include\zrtp_iface_system.h" />\r
+    <ClInclude Include="..\..\include\zrtp_legal.h" />\r
+    <ClInclude Include="..\..\include\zrtp_list.h" />\r
+    <ClInclude Include="..\..\include\zrtp_log.h" />\r
+    <ClInclude Include="..\..\include\zrtp_pbx.h" />\r
+    <ClInclude Include="..\..\include\zrtp_protocol.h" />\r
+    <ClInclude Include="..\..\include\zrtp_srtp.h" />\r
+    <ClInclude Include="..\..\include\zrtp_srtp_builtin.h" />\r
+    <ClInclude Include="..\..\include\zrtp_string.h" />\r
+    <ClInclude Include="..\..\include\zrtp_types.h" />\r
+    <ClInclude Include="..\..\include\zrtp_utils.h" />\r
+    <ClInclude Include="..\..\include\zrtp_version.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\bn.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\bn32.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\bnsize00.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\kludge.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\lbn.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\lbn32.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\lbnmem.h" />\r
+    <ClInclude Include="..\..\third_party\bnlib\legal.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\aes.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\aesopt.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\aestab.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\bg2zrtp.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\brg_types.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\sha1.h" />\r
+    <ClInclude Include="..\..\third_party\bgaes\sha2.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\src\zrtp.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crc.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crypto_aes.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crypto_atl.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crypto_hash.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crypto_pk.c" />\r
+    <ClCompile Include="..\..\src\zrtp_crypto_sas.c" />\r
+    <ClCompile Include="..\..\src\zrtp_datatypes.c" />\r
+    <ClCompile Include="..\..\src\zrtp_engine.c" />\r
+    <ClCompile Include="..\..\src\zrtp_engine_driven.c" />\r
+    <ClCompile Include="..\..\src\zrtp_iface_cache.c" />\r
+    <ClCompile Include="..\..\src\zrtp_iface_scheduler.c" />\r
+    <ClCompile Include="..\..\src\zrtp_iface_sys.c" />\r
+    <ClCompile Include="..\..\src\zrtp_initiator.c" />\r
+    <ClCompile Include="..\..\src\zrtp_legal.c" />\r
+    <ClCompile Include="..\..\src\zrtp_list.c" />\r
+    <ClCompile Include="..\..\src\zrtp_log.c" />\r
+    <ClCompile Include="..\..\src\zrtp_pbx.c" />\r
+    <ClCompile Include="..\..\src\zrtp_protocol.c" />\r
+    <ClCompile Include="..\..\src\zrtp_responder.c" />\r
+    <ClCompile Include="..\..\src\zrtp_rng.c" />\r
+    <ClCompile Include="..\..\src\zrtp_srtp_builtin.c" />\r
+    <ClCompile Include="..\..\src\zrtp_string.c" />\r
+    <ClCompile Include="..\..\src\zrtp_utils.c" />\r
+    <ClCompile Include="..\..\src\zrtp_utils_proto.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\bn.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\bn32.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\bninit32.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\bntest00.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\lbn32.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\lbnmem.c" />\r
+    <ClCompile Include="..\..\third_party\bnlib\legal.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\aes_modes.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\aescrypt.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\aeskey.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\aestab.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\sha1.c" />\r
+    <ClCompile Include="..\..\third_party\bgaes\sha2.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\ChangeLog" />\r
+    <None Include="..\..\News" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/libzrtp/projects/win/libzrtp.2010.vcxproj.filters b/libs/libzrtp/projects/win/libzrtp.2010.vcxproj.filters
new file mode 100644 (file)
index 0000000..4bae11a
--- /dev/null
+++ b/libs/libzrtp/projects/win/libzrtp.2010.vcxproj.filters
@@ -0,0 +1,256 @@
+<?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="include">\r
+      <UniqueIdentifier>{c0e76076-0032-445d-8c07-32b6c762622b}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="src">\r
+      <UniqueIdentifier>{a03c0d83-0032-4848-9704-22cdce5ab144}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="bnlib">\r
+      <UniqueIdentifier>{dbe8a34e-0032-495e-8df7-e82218921e60}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="bgaes">\r
+      <UniqueIdentifier>{96d1a5c9-0032-4230-a764-a0ed11f434a7}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\include\zrtp.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_base.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_config.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_config_user.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_config_win.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_crypto.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_ec.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_engine.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_error.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_iface.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_iface_builtin.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_iface_cache.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_iface_system.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_legal.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_list.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_log.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_pbx.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_protocol.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_srtp.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_srtp_builtin.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_string.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_types.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_utils.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\include\zrtp_version.h">\r
+      <Filter>include</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\bn.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\bn32.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\bnsize00.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\kludge.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\lbn.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\lbn32.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\lbnmem.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bnlib\legal.h">\r
+      <Filter>bnlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\aes.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\aesopt.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\aestab.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\bg2zrtp.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\brg_types.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\sha1.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\third_party\bgaes\sha2.h">\r
+      <Filter>bgaes</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\src\zrtp.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crc.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crypto_aes.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crypto_atl.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crypto_hash.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crypto_pk.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_crypto_sas.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_datatypes.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_engine.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_engine_driven.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_iface_cache.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_iface_scheduler.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_iface_sys.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_initiator.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_legal.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_list.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_log.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_pbx.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_protocol.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_responder.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_rng.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_srtp_builtin.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_string.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_utils.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\zrtp_utils_proto.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\bn.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\bn32.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\bninit32.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\bntest00.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\lbn32.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\lbnmem.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bnlib\legal.c">\r
+      <Filter>bnlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\aes_modes.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\aescrypt.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\aeskey.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\aestab.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\sha1.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\third_party\bgaes\sha2.c">\r
+      <Filter>bgaes</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\ChangeLog" />\r
+    <None Include="..\..\News" />\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/libzrtp/third_party/bnlib/bnconfig.win b/libs/libzrtp/third_party/bnlib/bnconfig.win
new file mode 100644 (file)
index 0000000..303a25b
--- /dev/null
+++ b/libs/libzrtp/third_party/bnlib/bnconfig.win
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 1995  Colin Plumb.  All rights reserved.
+ * For licensing and other legal details, see the file legal.c.
+ *
+ * bnconfig.h -- Configuration file for BigNum library.
+ *
+ * This file is automatically filled in by configure.
+ * Everything must start out turned *off*, because configure
+ * (or, more properly, config.status) only knows how to turn them
+ * *on*.
+ */
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/* Define to empty if the compiler does not support 'const' variables. */
+#undef const
+
+/* Define to `unsigned' if <sys/types.h> doesn't define it. */
+#undef size_t
+
+/* Checks for the presence and absence of various header files */
+#define HAVE_ASSERT_H 1
+#define NO_ASSERT_H !HAVE_ASSERT_H
+#define HAVE_LIMITS_H 1
+#define NO_LIMITS_H !HAVE_LIMITS_H
+#define HAVE_STDLIB_H 1
+#define NO_STDLIB_H !HAVE_STDLIB_H
+#define HAVE_STRING_H 1
+#define NO_STRING_H !HAVE_STRING_H
+
+#define HAVE_STRINGS_H 0
+#define NEED_MEMORY_H 0
+
+/* We go to some trouble to find accurate times... */
+
+/* Define if you have Posix.4 glock_gettime() */
+#define HAVE_CLOCK_GETTIME 0
+/* Define if you have Solaris-style gethrvtime() */
+#define HAVE_GETHRVTIME 0
+/* Define if you have getrusage() */
+#define HAVE_GETRUSAGE 0
+/* Define if you have clock() */
+#define HAVE_CLOCK 0
+/* Define if you have time() */
+#define HAVE_TIME 0
+
+/*
+ * Define as 0 if #including <sys/time.h> automatically
+ * #includes <time.h>, and doing so explicitly causes an
+ * error.
+ */
+#define TIME_WITH_SYS_TIME 0
+
+/* Defines for various kinds of library brokenness */
+
+/* Define if <stdio.h> is missing prototypes (= lots of warnings!) */
+#define NO_STDIO_PROTOS 0
+
+/* Define if <assert.h> depends on <stdio.h> and breaks without it */
+#define ASSERT_NEEDS_STDIO 0
+/* Define if <assert.h> depends on <stdlib.h> and complains without it */
+#define ASSERT_NEEDS_STDLIB 0
+
+/*
+ * Define if <string.h> delcares the mem* functions to take char *
+ * instead of void * parameters (= lots of warnings)
+ */
+#define MEM_PROTOS_BROKEN 0
+
+/* If not available, bcopy() is substituted */
+#define HAVE_MEMMOVE 1
+#define NO_MEMMOVE !HAVE_MEMMOVE
+#define HAVE_MEMCPY 1
+#define NO_MEMCPY !HAVE_MEMCPY
+
+#endif /* CONFIG_H */

diff --git a/libs/libzrtp/third_party/bnlib/lbn.h b/libs/libzrtp/third_party/bnlib/lbn.h
index b0fd21cfb5a074dfbf9aa852033bb0ba36310e2e..43fc7c91dc3cf0dcfb4530a280c8c7560def8e27 100644 (file)
--- a/libs/libzrtp/third_party/bnlib/lbn.h
+++ b/libs/libzrtp/third_party/bnlib/lbn.h
@@ -145,6 +145,12 @@ typedef unsigned long long bnword64;
 #define BNWORD64 bnword64
 #endif
 
+/*Workaround for windows for now. */
+#ifdef WIN32
+typedef unsigned long long bnword64;
+#define BNWORD64 bnword64
+#endif
+
 /* We don't even try to find a 128-bit type at the moment */
 
 #endif /* !LBN_H */

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index c4030148aa0ebd1816a1b67abc8bef5b9ff687fb..481bd54e84b68908146aaf5239c70e976a435398 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -76,7 +76,7 @@ static zrtp_global_t *zrtp_global;
 #ifndef WIN32
 static zrtp_zid_t zid = { "FreeSWITCH01" };
 #else
-static zrtp_zid_t zid = { "FreeSWITCH0\0" };
+static zrtp_zid_t zid = { "FreeSWITCH0" };
 #endif
 static int zrtp_on = 0;
 #define ZRTP_MITM_TRIES 100

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 94b5dbc55aa50a5caeb2874c24efcfc0c0f032e2..eb1933a7f693191c27c6b82335f3bdd89d9c8a86 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,8 +88,8 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>\r
@@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>\r
@@ -766,6 +766,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\libs\libzrtp\projects\win\libzrtp.2010.vcxproj">\r
+      <Project>{c13cc324-0032-4492-9a30-310a6bd64ff5}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\libs\spandsp\src\libspandsp.2010.vcxproj">\r
       <Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>\r
     </ProjectReference>\r