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

This commit is contained in:
Jeff Lenk 2012-05-17 08:38:11 -05:00
parent d5484651ce
commit b65c321193
7 changed files with 620 additions and 9 deletions

View File

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

View File

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

View File

@ -0,0 +1,256 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{c0e76076-0032-445d-8c07-32b6c762622b}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{a03c0d83-0032-4848-9704-22cdce5ab144}</UniqueIdentifier>
</Filter>
<Filter Include="bnlib">
<UniqueIdentifier>{dbe8a34e-0032-495e-8df7-e82218921e60}</UniqueIdentifier>
</Filter>
<Filter Include="bgaes">
<UniqueIdentifier>{96d1a5c9-0032-4230-a764-a0ed11f434a7}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\zrtp.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_base.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_config.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_config_user.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_config_win.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_crypto.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_ec.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_engine.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_error.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_iface.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_iface_builtin.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_iface_cache.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_iface_system.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_legal.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_list.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_log.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_pbx.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_protocol.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_srtp.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_srtp_builtin.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_string.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_types.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\include\zrtp_version.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\bn.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\bn32.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\bnsize00.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\kludge.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\lbn.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\lbn32.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\lbnmem.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bnlib\legal.h">
<Filter>bnlib</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\aes.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\aesopt.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\aestab.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\bg2zrtp.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\brg_types.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\sha1.h">
<Filter>bgaes</Filter>
</ClInclude>
<ClInclude Include="..\..\third_party\bgaes\sha2.h">
<Filter>bgaes</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\zrtp.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crc.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crypto_aes.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crypto_atl.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crypto_hash.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crypto_pk.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_crypto_sas.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_datatypes.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_engine.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_engine_driven.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_iface_cache.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_iface_scheduler.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_iface_sys.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_initiator.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_legal.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_list.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_log.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_pbx.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_protocol.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_responder.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_rng.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_srtp_builtin.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_string.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_utils.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\zrtp_utils_proto.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\bn.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\bn32.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\bninit32.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\bntest00.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\lbn32.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\lbnmem.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bnlib\legal.c">
<Filter>bnlib</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\aes_modes.c">
<Filter>bgaes</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\aescrypt.c">
<Filter>bgaes</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\aeskey.c">
<Filter>bgaes</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\aestab.c">
<Filter>bgaes</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\sha1.c">
<Filter>bgaes</Filter>
</ClCompile>
<ClCompile Include="..\..\third_party\bgaes\sha2.c">
<Filter>bgaes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ChangeLog" />
<None Include="..\..\News" />
</ItemGroup>
</Project>

View File

@ -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 */

View File

@ -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 */

View File

@ -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

View File

@ -88,8 +88,8 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@ -766,6 +766,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\libs\libzrtp\projects\win\libzrtp.2010.vcxproj">
<Project>{c13cc324-0032-4492-9a30-310a6bd64ff5}</Project>
</ProjectReference>
<ProjectReference Include="..\..\libs\spandsp\src\libspandsp.2010.vcxproj">
<Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>
</ProjectReference>