1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/build-windows/pEpEngine.vcxproj Tue Oct 11 16:39:40 2016 +0200
1.3 @@ -0,0 +1,178 @@
1.4 +<?xml version="1.0" encoding="utf-8"?>
1.5 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1.6 + <ItemGroup Label="ProjectConfigurations">
1.7 + <ProjectConfiguration Include="Debug|Win32">
1.8 + <Configuration>Debug</Configuration>
1.9 + <Platform>Win32</Platform>
1.10 + </ProjectConfiguration>
1.11 + <ProjectConfiguration Include="Release|Win32">
1.12 + <Configuration>Release</Configuration>
1.13 + <Platform>Win32</Platform>
1.14 + </ProjectConfiguration>
1.15 + </ItemGroup>
1.16 + <PropertyGroup Label="Globals">
1.17 + <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
1.18 + <Keyword>Win32Proj</Keyword>
1.19 + <RootNamespace>pEpEngine</RootNamespace>
1.20 + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
1.21 + </PropertyGroup>
1.22 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1.23 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
1.24 + <ConfigurationType>DynamicLibrary</ConfigurationType>
1.25 + <UseDebugLibraries>true</UseDebugLibraries>
1.26 + <PlatformToolset>v140</PlatformToolset>
1.27 + <CharacterSet>Unicode</CharacterSet>
1.28 + </PropertyGroup>
1.29 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
1.30 + <ConfigurationType>DynamicLibrary</ConfigurationType>
1.31 + <UseDebugLibraries>false</UseDebugLibraries>
1.32 + <PlatformToolset>v140</PlatformToolset>
1.33 + <WholeProgramOptimization>true</WholeProgramOptimization>
1.34 + <CharacterSet>Unicode</CharacterSet>
1.35 + </PropertyGroup>
1.36 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1.37 + <ImportGroup Label="ExtensionSettings">
1.38 + </ImportGroup>
1.39 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1.40 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1.41 + </ImportGroup>
1.42 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1.43 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1.44 + </ImportGroup>
1.45 + <PropertyGroup Label="UserMacros" />
1.46 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1.47 + <LinkIncremental>true</LinkIncremental>
1.48 + <IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
1.49 + <RunCodeAnalysis>false</RunCodeAnalysis>
1.50 + <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
1.51 + </PropertyGroup>
1.52 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1.53 + <LinkIncremental>false</LinkIncremental>
1.54 + <IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
1.55 + <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
1.56 + </PropertyGroup>
1.57 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1.58 + <ClCompile>
1.59 + <PrecompiledHeader>NotUsing</PrecompiledHeader>
1.60 + <WarningLevel>Level3</WarningLevel>
1.61 + <Optimization>Disabled</Optimization>
1.62 + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1.63 + <SDLCheck>true</SDLCheck>
1.64 + <EnablePREfast>false</EnablePREfast>
1.65 + <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1.66 + <CompileAs>Default</CompileAs>
1.67 + </ClCompile>
1.68 + <Link>
1.69 + <SubSystem>Windows</SubSystem>
1.70 + <GenerateDebugInformation>true</GenerateDebugInformation>
1.71 + <AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
1.72 + </Link>
1.73 + <PreBuildEvent>
1.74 + <Command>
1.75 + </Command>
1.76 + </PreBuildEvent>
1.77 + </ItemDefinitionGroup>
1.78 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1.79 + <ClCompile>
1.80 + <WarningLevel>Level3</WarningLevel>
1.81 + <PrecompiledHeader>NotUsing</PrecompiledHeader>
1.82 + <Optimization>MaxSpeed</Optimization>
1.83 + <FunctionLevelLinking>true</FunctionLevelLinking>
1.84 + <IntrinsicFunctions>true</IntrinsicFunctions>
1.85 + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1.86 + <SDLCheck>false</SDLCheck>
1.87 + <TreatWarningAsError>false</TreatWarningAsError>
1.88 + <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1.89 + <CompileAs>Default</CompileAs>
1.90 + <MultiProcessorCompilation>true</MultiProcessorCompilation>
1.91 + <ControlFlowGuard>Guard</ControlFlowGuard>
1.92 + </ClCompile>
1.93 + <Link>
1.94 + <SubSystem>Windows</SubSystem>
1.95 + <GenerateDebugInformation>true</GenerateDebugInformation>
1.96 + <EnableCOMDATFolding>true</EnableCOMDATFolding>
1.97 + <OptimizeReferences>true</OptimizeReferences>
1.98 + <AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
1.99 + </Link>
1.100 + <PreBuildEvent>
1.101 + <Command>
1.102 + </Command>
1.103 + </PreBuildEvent>
1.104 + </ItemDefinitionGroup>
1.105 + <ItemGroup>
1.106 + <ClCompile Include="..\src\asn1_helper.c" />
1.107 + <ClCompile Include="..\src\baseprotocol.c" />
1.108 + <ClCompile Include="..\src\blacklist.c" />
1.109 + <ClCompile Include="..\src\bloblist.c" />
1.110 + <ClCompile Include="..\src\cryptotech.c" />
1.111 + <ClCompile Include="..\src\email.c" />
1.112 + <ClCompile Include="..\src\etpan_mime.c" />
1.113 + <ClCompile Include="..\src\identity_list.c" />
1.114 + <ClCompile Include="..\src\keymanagement.c" />
1.115 + <ClCompile Include="..\src\map_asn1.c" />
1.116 + <ClCompile Include="..\src\message.c" />
1.117 + <ClCompile Include="..\src\message_api.c" />
1.118 + <ClCompile Include="..\src\mime.c" />
1.119 + <ClCompile Include="..\src\openpgp_compat.c" />
1.120 + <ClCompile Include="..\src\pEpEngine.c" />
1.121 + <ClCompile Include="..\src\pgp_gpg.c" />
1.122 + <ClCompile Include="..\src\platform_windows.cpp" />
1.123 + <ClCompile Include="..\src\sqlite3.c" />
1.124 + <ClCompile Include="..\src\stringlist.c" />
1.125 + <ClCompile Include="..\src\stringpair.c" />
1.126 + <ClCompile Include="..\src\sync.c" />
1.127 + <ClCompile Include="..\src\sync_actions.c" />
1.128 + <ClCompile Include="..\src\sync_driver.c" />
1.129 + <ClCompile Include="..\src\sync_fsm.c" />
1.130 + <ClCompile Include="..\src\sync_impl.c" />
1.131 + <ClCompile Include="..\src\sync_send_actions.c" />
1.132 + <ClCompile Include="..\src\timestamp.c" />
1.133 + <ClCompile Include="..\src\transport.c" />
1.134 + <ClCompile Include="..\src\trans_auto.c" />
1.135 + </ItemGroup>
1.136 + <ItemGroup>
1.137 + <ClInclude Include="..\src\asn1_helper.h" />
1.138 + <ClInclude Include="..\src\baseprotocol.h" />
1.139 + <ClInclude Include="..\src\blacklist.h" />
1.140 + <ClInclude Include="..\src\bloblist.h" />
1.141 + <ClInclude Include="..\src\cryptotech.h" />
1.142 + <ClInclude Include="..\src\dynamic_api.h" />
1.143 + <ClInclude Include="..\src\email.h" />
1.144 + <ClInclude Include="..\src\etpan_mime.h" />
1.145 + <ClInclude Include="..\src\identity_list.h" />
1.146 + <ClInclude Include="..\src\keymanagement.h" />
1.147 + <ClInclude Include="..\src\map_asn1.h" />
1.148 + <ClInclude Include="..\src\message.h" />
1.149 + <ClInclude Include="..\src\message_api.h" />
1.150 + <ClInclude Include="..\src\mime.h" />
1.151 + <ClInclude Include="..\src\openpgp_compat.h" />
1.152 + <ClInclude Include="..\src\pEpEngine.h" />
1.153 + <ClInclude Include="..\src\pEp_internal.h" />
1.154 + <ClInclude Include="..\src\pgp_gpg.h" />
1.155 + <ClInclude Include="..\src\pgp_gpg_internal.h" />
1.156 + <ClInclude Include="..\src\platform.h" />
1.157 + <ClInclude Include="..\src\platform_windows.h" />
1.158 + <ClInclude Include="..\src\resource.h" />
1.159 + <ClInclude Include="..\src\sqlite3.h" />
1.160 + <ClInclude Include="..\src\stringlist.h" />
1.161 + <ClInclude Include="..\src\stringpair.h" />
1.162 + <ClInclude Include="..\src\sync.h" />
1.163 + <ClInclude Include="..\src\sync_fsm.h" />
1.164 + <ClInclude Include="..\src\sync_impl.h" />
1.165 + <ClInclude Include="..\src\timestamp.h" />
1.166 + <ClInclude Include="..\src\transport.h" />
1.167 + <ClInclude Include="..\src\trans_auto.h" />
1.168 + <ClInclude Include="..\src\wrappers.h" />
1.169 + </ItemGroup>
1.170 + <ItemGroup>
1.171 + <Text Include="..\LICENSE.txt" />
1.172 + </ItemGroup>
1.173 + <ItemGroup>
1.174 + <ProjectReference Include="..\..\libetpan\build-windows\libetpan\libetpan.vcxproj">
1.175 + <Project>{ba4ded3c-e56f-4484-bfc3-9c13e461a1be}</Project>
1.176 + </ProjectReference>
1.177 + </ItemGroup>
1.178 + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
1.179 + <ImportGroup Label="ExtensionTargets">
1.180 + </ImportGroup>
1.181 +</Project>
1.182 \ No newline at end of file
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/build-windows/pEpEngine.vcxproj.filters Tue Oct 11 16:39:40 2016 +0200
2.3 @@ -0,0 +1,207 @@
2.4 +<?xml version="1.0" encoding="utf-8"?>
2.5 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2.6 + <ItemGroup>
2.7 + <Filter Include="Quelldateien">
2.8 + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
2.9 + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
2.10 + </Filter>
2.11 + <Filter Include="Headerdateien">
2.12 + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
2.13 + <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
2.14 + </Filter>
2.15 + <Filter Include="Ressourcendateien">
2.16 + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
2.17 + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
2.18 + </Filter>
2.19 + </ItemGroup>
2.20 + <ItemGroup>
2.21 + <ClCompile Include="..\src\keymanagement.c">
2.22 + <Filter>Quelldateien</Filter>
2.23 + </ClCompile>
2.24 + <ClCompile Include="..\src\pEpEngine.c">
2.25 + <Filter>Quelldateien</Filter>
2.26 + </ClCompile>
2.27 + <ClCompile Include="..\src\platform_windows.cpp">
2.28 + <Filter>Quelldateien</Filter>
2.29 + </ClCompile>
2.30 + <ClCompile Include="..\src\sqlite3.c">
2.31 + <Filter>Quelldateien</Filter>
2.32 + </ClCompile>
2.33 + <ClCompile Include="..\src\transport.c">
2.34 + <Filter>Quelldateien</Filter>
2.35 + </ClCompile>
2.36 + <ClCompile Include="..\src\cryptotech.c">
2.37 + <Filter>Quelldateien</Filter>
2.38 + </ClCompile>
2.39 + <ClCompile Include="..\src\pgp_gpg.c">
2.40 + <Filter>Quelldateien</Filter>
2.41 + </ClCompile>
2.42 + <ClCompile Include="..\src\email.c">
2.43 + <Filter>Quelldateien</Filter>
2.44 + </ClCompile>
2.45 + <ClCompile Include="..\src\trans_auto.c">
2.46 + <Filter>Quelldateien</Filter>
2.47 + </ClCompile>
2.48 + <ClCompile Include="..\src\stringlist.c">
2.49 + <Filter>Quelldateien</Filter>
2.50 + </ClCompile>
2.51 + <ClCompile Include="..\src\stringpair.c">
2.52 + <Filter>Quelldateien</Filter>
2.53 + </ClCompile>
2.54 + <ClCompile Include="..\src\timestamp.c">
2.55 + <Filter>Quelldateien</Filter>
2.56 + </ClCompile>
2.57 + <ClCompile Include="..\src\bloblist.c">
2.58 + <Filter>Quelldateien</Filter>
2.59 + </ClCompile>
2.60 + <ClCompile Include="..\src\etpan_mime.c">
2.61 + <Filter>Quelldateien</Filter>
2.62 + </ClCompile>
2.63 + <ClCompile Include="..\src\identity_list.c">
2.64 + <Filter>Quelldateien</Filter>
2.65 + </ClCompile>
2.66 + <ClCompile Include="..\src\message.c">
2.67 + <Filter>Quelldateien</Filter>
2.68 + </ClCompile>
2.69 + <ClCompile Include="..\src\message_api.c">
2.70 + <Filter>Quelldateien</Filter>
2.71 + </ClCompile>
2.72 + <ClCompile Include="..\src\mime.c">
2.73 + <Filter>Quelldateien</Filter>
2.74 + </ClCompile>
2.75 + <ClCompile Include="..\src\blacklist.c">
2.76 + <Filter>Quelldateien</Filter>
2.77 + </ClCompile>
2.78 + <ClCompile Include="..\src\sync.c">
2.79 + <Filter>Quelldateien</Filter>
2.80 + </ClCompile>
2.81 + <ClCompile Include="..\src\sync_actions.c">
2.82 + <Filter>Quelldateien</Filter>
2.83 + </ClCompile>
2.84 + <ClCompile Include="..\src\sync_driver.c">
2.85 + <Filter>Quelldateien</Filter>
2.86 + </ClCompile>
2.87 + <ClCompile Include="..\src\sync_fsm.c">
2.88 + <Filter>Quelldateien</Filter>
2.89 + </ClCompile>
2.90 + <ClCompile Include="..\src\map_asn1.c">
2.91 + <Filter>Quelldateien</Filter>
2.92 + </ClCompile>
2.93 + <ClCompile Include="..\src\baseprotocol.c">
2.94 + <Filter>Quelldateien</Filter>
2.95 + </ClCompile>
2.96 + <ClCompile Include="..\src\sync_send_actions.c">
2.97 + <Filter>Quelldateien</Filter>
2.98 + </ClCompile>
2.99 + <ClCompile Include="..\src\openpgp_compat.c">
2.100 + <Filter>Quelldateien</Filter>
2.101 + </ClCompile>
2.102 + <ClCompile Include="..\src\asn1_helper.c">
2.103 + <Filter>Quelldateien</Filter>
2.104 + </ClCompile>
2.105 + <ClCompile Include="..\src\sync_impl.c">
2.106 + <Filter>Quelldateien</Filter>
2.107 + </ClCompile>
2.108 + </ItemGroup>
2.109 + <ItemGroup>
2.110 + <ClInclude Include="..\src\keymanagement.h">
2.111 + <Filter>Headerdateien</Filter>
2.112 + </ClInclude>
2.113 + <ClInclude Include="..\src\pEpEngine.h">
2.114 + <Filter>Headerdateien</Filter>
2.115 + </ClInclude>
2.116 + <ClInclude Include="..\src\platform_windows.h">
2.117 + <Filter>Headerdateien</Filter>
2.118 + </ClInclude>
2.119 + <ClInclude Include="..\src\sqlite3.h">
2.120 + <Filter>Headerdateien</Filter>
2.121 + </ClInclude>
2.122 + <ClInclude Include="..\src\transport.h">
2.123 + <Filter>Headerdateien</Filter>
2.124 + </ClInclude>
2.125 + <ClInclude Include="..\src\cryptotech.h">
2.126 + <Filter>Headerdateien</Filter>
2.127 + </ClInclude>
2.128 + <ClInclude Include="..\src\pgp_gpg.h">
2.129 + <Filter>Headerdateien</Filter>
2.130 + </ClInclude>
2.131 + <ClInclude Include="..\src\pEp_internal.h">
2.132 + <Filter>Headerdateien</Filter>
2.133 + </ClInclude>
2.134 + <ClInclude Include="..\src\pgp_gpg_internal.h">
2.135 + <Filter>Headerdateien</Filter>
2.136 + </ClInclude>
2.137 + <ClInclude Include="..\src\resource.h">
2.138 + <Filter>Ressourcendateien</Filter>
2.139 + </ClInclude>
2.140 + <ClInclude Include="..\src\email.h">
2.141 + <Filter>Headerdateien</Filter>
2.142 + </ClInclude>
2.143 + <ClInclude Include="..\src\stringlist.h">
2.144 + <Filter>Headerdateien</Filter>
2.145 + </ClInclude>
2.146 + <ClInclude Include="..\src\stringpair.h">
2.147 + <Filter>Headerdateien</Filter>
2.148 + </ClInclude>
2.149 + <ClInclude Include="..\src\timestamp.h">
2.150 + <Filter>Headerdateien</Filter>
2.151 + </ClInclude>
2.152 + <ClInclude Include="..\src\trans_auto.h">
2.153 + <Filter>Headerdateien</Filter>
2.154 + </ClInclude>
2.155 + <ClInclude Include="..\src\wrappers.h">
2.156 + <Filter>Headerdateien</Filter>
2.157 + </ClInclude>
2.158 + <ClInclude Include="..\src\bloblist.h">
2.159 + <Filter>Headerdateien</Filter>
2.160 + </ClInclude>
2.161 + <ClInclude Include="..\src\dynamic_api.h">
2.162 + <Filter>Headerdateien</Filter>
2.163 + </ClInclude>
2.164 + <ClInclude Include="..\src\etpan_mime.h">
2.165 + <Filter>Headerdateien</Filter>
2.166 + </ClInclude>
2.167 + <ClInclude Include="..\src\identity_list.h">
2.168 + <Filter>Headerdateien</Filter>
2.169 + </ClInclude>
2.170 + <ClInclude Include="..\src\message.h">
2.171 + <Filter>Headerdateien</Filter>
2.172 + </ClInclude>
2.173 + <ClInclude Include="..\src\message_api.h">
2.174 + <Filter>Headerdateien</Filter>
2.175 + </ClInclude>
2.176 + <ClInclude Include="..\src\mime.h">
2.177 + <Filter>Headerdateien</Filter>
2.178 + </ClInclude>
2.179 + <ClInclude Include="..\src\platform.h">
2.180 + <Filter>Headerdateien</Filter>
2.181 + </ClInclude>
2.182 + <ClInclude Include="..\src\blacklist.h">
2.183 + <Filter>Headerdateien</Filter>
2.184 + </ClInclude>
2.185 + <ClInclude Include="..\src\sync.h">
2.186 + <Filter>Headerdateien</Filter>
2.187 + </ClInclude>
2.188 + <ClInclude Include="..\src\sync_fsm.h">
2.189 + <Filter>Headerdateien</Filter>
2.190 + </ClInclude>
2.191 + <ClInclude Include="..\src\map_asn1.h">
2.192 + <Filter>Headerdateien</Filter>
2.193 + </ClInclude>
2.194 + <ClInclude Include="..\src\baseprotocol.h">
2.195 + <Filter>Headerdateien</Filter>
2.196 + </ClInclude>
2.197 + <ClInclude Include="..\src\openpgp_compat.h">
2.198 + <Filter>Headerdateien</Filter>
2.199 + </ClInclude>
2.200 + <ClInclude Include="..\src\asn1_helper.h">
2.201 + <Filter>Headerdateien</Filter>
2.202 + </ClInclude>
2.203 + <ClInclude Include="..\src\sync_impl.h">
2.204 + <Filter>Headerdateien</Filter>
2.205 + </ClInclude>
2.206 + </ItemGroup>
2.207 + <ItemGroup>
2.208 + <Text Include="..\LICENSE.txt" />
2.209 + </ItemGroup>
2.210 +</Project>
2.211 \ No newline at end of file
3.1 --- a/pEpEngine.vcxproj Mon Oct 10 16:34:43 2016 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,178 +0,0 @@
3.4 -<?xml version="1.0" encoding="utf-8"?>
3.5 -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3.6 - <ItemGroup Label="ProjectConfigurations">
3.7 - <ProjectConfiguration Include="Debug|Win32">
3.8 - <Configuration>Debug</Configuration>
3.9 - <Platform>Win32</Platform>
3.10 - </ProjectConfiguration>
3.11 - <ProjectConfiguration Include="Release|Win32">
3.12 - <Configuration>Release</Configuration>
3.13 - <Platform>Win32</Platform>
3.14 - </ProjectConfiguration>
3.15 - </ItemGroup>
3.16 - <PropertyGroup Label="Globals">
3.17 - <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
3.18 - <Keyword>Win32Proj</Keyword>
3.19 - <RootNamespace>pEpEngine</RootNamespace>
3.20 - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
3.21 - </PropertyGroup>
3.22 - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3.23 - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3.24 - <ConfigurationType>DynamicLibrary</ConfigurationType>
3.25 - <UseDebugLibraries>true</UseDebugLibraries>
3.26 - <PlatformToolset>v140</PlatformToolset>
3.27 - <CharacterSet>Unicode</CharacterSet>
3.28 - </PropertyGroup>
3.29 - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3.30 - <ConfigurationType>DynamicLibrary</ConfigurationType>
3.31 - <UseDebugLibraries>false</UseDebugLibraries>
3.32 - <PlatformToolset>v140</PlatformToolset>
3.33 - <WholeProgramOptimization>true</WholeProgramOptimization>
3.34 - <CharacterSet>Unicode</CharacterSet>
3.35 - </PropertyGroup>
3.36 - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3.37 - <ImportGroup Label="ExtensionSettings">
3.38 - </ImportGroup>
3.39 - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3.40 - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3.41 - </ImportGroup>
3.42 - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3.43 - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3.44 - </ImportGroup>
3.45 - <PropertyGroup Label="UserMacros" />
3.46 - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3.47 - <LinkIncremental>true</LinkIncremental>
3.48 - <IncludePath>$(ProjectDir)\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
3.49 - <RunCodeAnalysis>false</RunCodeAnalysis>
3.50 - <LibraryPath>$(ProjectDir)\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
3.51 - </PropertyGroup>
3.52 - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3.53 - <LinkIncremental>false</LinkIncremental>
3.54 - <IncludePath>$(ProjectDir)\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GNU\GnuPG\include;$(IncludePath)</IncludePath>
3.55 - <LibraryPath>$(ProjectDir)\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
3.56 - </PropertyGroup>
3.57 - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3.58 - <ClCompile>
3.59 - <PrecompiledHeader>NotUsing</PrecompiledHeader>
3.60 - <WarningLevel>Level3</WarningLevel>
3.61 - <Optimization>Disabled</Optimization>
3.62 - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3.63 - <SDLCheck>true</SDLCheck>
3.64 - <EnablePREfast>false</EnablePREfast>
3.65 - <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3.66 - <CompileAs>Default</CompileAs>
3.67 - </ClCompile>
3.68 - <Link>
3.69 - <SubSystem>Windows</SubSystem>
3.70 - <GenerateDebugInformation>true</GenerateDebugInformation>
3.71 - <AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
3.72 - </Link>
3.73 - <PreBuildEvent>
3.74 - <Command>
3.75 - </Command>
3.76 - </PreBuildEvent>
3.77 - </ItemDefinitionGroup>
3.78 - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3.79 - <ClCompile>
3.80 - <WarningLevel>Level3</WarningLevel>
3.81 - <PrecompiledHeader>NotUsing</PrecompiledHeader>
3.82 - <Optimization>MaxSpeed</Optimization>
3.83 - <FunctionLevelLinking>true</FunctionLevelLinking>
3.84 - <IntrinsicFunctions>true</IntrinsicFunctions>
3.85 - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3.86 - <SDLCheck>false</SDLCheck>
3.87 - <TreatWarningAsError>false</TreatWarningAsError>
3.88 - <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3.89 - <CompileAs>Default</CompileAs>
3.90 - <MultiProcessorCompilation>true</MultiProcessorCompilation>
3.91 - <ControlFlowGuard>Guard</ControlFlowGuard>
3.92 - </ClCompile>
3.93 - <Link>
3.94 - <SubSystem>Windows</SubSystem>
3.95 - <GenerateDebugInformation>true</GenerateDebugInformation>
3.96 - <EnableCOMDATFolding>true</EnableCOMDATFolding>
3.97 - <OptimizeReferences>true</OptimizeReferences>
3.98 - <AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
3.99 - </Link>
3.100 - <PreBuildEvent>
3.101 - <Command>
3.102 - </Command>
3.103 - </PreBuildEvent>
3.104 - </ItemDefinitionGroup>
3.105 - <ItemGroup>
3.106 - <ClCompile Include="src\asn1_helper.c" />
3.107 - <ClCompile Include="src\baseprotocol.c" />
3.108 - <ClCompile Include="src\blacklist.c" />
3.109 - <ClCompile Include="src\bloblist.c" />
3.110 - <ClCompile Include="src\cryptotech.c" />
3.111 - <ClCompile Include="src\email.c" />
3.112 - <ClCompile Include="src\etpan_mime.c" />
3.113 - <ClCompile Include="src\identity_list.c" />
3.114 - <ClCompile Include="src\keymanagement.c" />
3.115 - <ClCompile Include="src\map_asn1.c" />
3.116 - <ClCompile Include="src\message.c" />
3.117 - <ClCompile Include="src\message_api.c" />
3.118 - <ClCompile Include="src\mime.c" />
3.119 - <ClCompile Include="src\openpgp_compat.c" />
3.120 - <ClCompile Include="src\pEpEngine.c" />
3.121 - <ClCompile Include="src\pgp_gpg.c" />
3.122 - <ClCompile Include="src\platform_windows.cpp" />
3.123 - <ClCompile Include="src\sqlite3.c" />
3.124 - <ClCompile Include="src\stringlist.c" />
3.125 - <ClCompile Include="src\stringpair.c" />
3.126 - <ClCompile Include="src\sync.c" />
3.127 - <ClCompile Include="src\sync_actions.c" />
3.128 - <ClCompile Include="src\sync_driver.c" />
3.129 - <ClCompile Include="src\sync_fsm.c" />
3.130 - <ClCompile Include="src\sync_impl.c" />
3.131 - <ClCompile Include="src\sync_send_actions.c" />
3.132 - <ClCompile Include="src\timestamp.c" />
3.133 - <ClCompile Include="src\transport.c" />
3.134 - <ClCompile Include="src\trans_auto.c" />
3.135 - </ItemGroup>
3.136 - <ItemGroup>
3.137 - <ClInclude Include="src\asn1_helper.h" />
3.138 - <ClInclude Include="src\baseprotocol.h" />
3.139 - <ClInclude Include="src\blacklist.h" />
3.140 - <ClInclude Include="src\bloblist.h" />
3.141 - <ClInclude Include="src\cryptotech.h" />
3.142 - <ClInclude Include="src\dynamic_api.h" />
3.143 - <ClInclude Include="src\email.h" />
3.144 - <ClInclude Include="src\etpan_mime.h" />
3.145 - <ClInclude Include="src\identity_list.h" />
3.146 - <ClInclude Include="src\keymanagement.h" />
3.147 - <ClInclude Include="src\map_asn1.h" />
3.148 - <ClInclude Include="src\message.h" />
3.149 - <ClInclude Include="src\message_api.h" />
3.150 - <ClInclude Include="src\mime.h" />
3.151 - <ClInclude Include="src\openpgp_compat.h" />
3.152 - <ClInclude Include="src\pEpEngine.h" />
3.153 - <ClInclude Include="src\pEp_internal.h" />
3.154 - <ClInclude Include="src\pgp_gpg.h" />
3.155 - <ClInclude Include="src\pgp_gpg_internal.h" />
3.156 - <ClInclude Include="src\platform.h" />
3.157 - <ClInclude Include="src\platform_windows.h" />
3.158 - <ClInclude Include="src\resource.h" />
3.159 - <ClInclude Include="src\sqlite3.h" />
3.160 - <ClInclude Include="src\stringlist.h" />
3.161 - <ClInclude Include="src\stringpair.h" />
3.162 - <ClInclude Include="src\sync.h" />
3.163 - <ClInclude Include="src\sync_fsm.h" />
3.164 - <ClInclude Include="src\sync_impl.h" />
3.165 - <ClInclude Include="src\timestamp.h" />
3.166 - <ClInclude Include="src\transport.h" />
3.167 - <ClInclude Include="src\trans_auto.h" />
3.168 - <ClInclude Include="src\wrappers.h" />
3.169 - </ItemGroup>
3.170 - <ItemGroup>
3.171 - <Text Include="LICENSE.txt" />
3.172 - </ItemGroup>
3.173 - <ItemGroup>
3.174 - <ProjectReference Include="..\libetpan\build-windows\libetpan\libetpan.vcxproj">
3.175 - <Project>{ba4ded3c-e56f-4484-bfc3-9c13e461a1be}</Project>
3.176 - </ProjectReference>
3.177 - </ItemGroup>
3.178 - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
3.179 - <ImportGroup Label="ExtensionTargets">
3.180 - </ImportGroup>
3.181 -</Project>
3.182 \ No newline at end of file
4.1 --- a/pEpEngine.vcxproj.filters Mon Oct 10 16:34:43 2016 +0200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,207 +0,0 @@
4.4 -<?xml version="1.0" encoding="utf-8"?>
4.5 -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4.6 - <ItemGroup>
4.7 - <Filter Include="Quelldateien">
4.8 - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
4.9 - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
4.10 - </Filter>
4.11 - <Filter Include="Headerdateien">
4.12 - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
4.13 - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
4.14 - </Filter>
4.15 - <Filter Include="Ressourcendateien">
4.16 - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
4.17 - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
4.18 - </Filter>
4.19 - </ItemGroup>
4.20 - <ItemGroup>
4.21 - <ClCompile Include="src\keymanagement.c">
4.22 - <Filter>Quelldateien</Filter>
4.23 - </ClCompile>
4.24 - <ClCompile Include="src\pEpEngine.c">
4.25 - <Filter>Quelldateien</Filter>
4.26 - </ClCompile>
4.27 - <ClCompile Include="src\platform_windows.cpp">
4.28 - <Filter>Quelldateien</Filter>
4.29 - </ClCompile>
4.30 - <ClCompile Include="src\sqlite3.c">
4.31 - <Filter>Quelldateien</Filter>
4.32 - </ClCompile>
4.33 - <ClCompile Include="src\transport.c">
4.34 - <Filter>Quelldateien</Filter>
4.35 - </ClCompile>
4.36 - <ClCompile Include="src\cryptotech.c">
4.37 - <Filter>Quelldateien</Filter>
4.38 - </ClCompile>
4.39 - <ClCompile Include="src\pgp_gpg.c">
4.40 - <Filter>Quelldateien</Filter>
4.41 - </ClCompile>
4.42 - <ClCompile Include="src\email.c">
4.43 - <Filter>Quelldateien</Filter>
4.44 - </ClCompile>
4.45 - <ClCompile Include="src\trans_auto.c">
4.46 - <Filter>Quelldateien</Filter>
4.47 - </ClCompile>
4.48 - <ClCompile Include="src\stringlist.c">
4.49 - <Filter>Quelldateien</Filter>
4.50 - </ClCompile>
4.51 - <ClCompile Include="src\stringpair.c">
4.52 - <Filter>Quelldateien</Filter>
4.53 - </ClCompile>
4.54 - <ClCompile Include="src\timestamp.c">
4.55 - <Filter>Quelldateien</Filter>
4.56 - </ClCompile>
4.57 - <ClCompile Include="src\bloblist.c">
4.58 - <Filter>Quelldateien</Filter>
4.59 - </ClCompile>
4.60 - <ClCompile Include="src\etpan_mime.c">
4.61 - <Filter>Quelldateien</Filter>
4.62 - </ClCompile>
4.63 - <ClCompile Include="src\identity_list.c">
4.64 - <Filter>Quelldateien</Filter>
4.65 - </ClCompile>
4.66 - <ClCompile Include="src\message.c">
4.67 - <Filter>Quelldateien</Filter>
4.68 - </ClCompile>
4.69 - <ClCompile Include="src\message_api.c">
4.70 - <Filter>Quelldateien</Filter>
4.71 - </ClCompile>
4.72 - <ClCompile Include="src\mime.c">
4.73 - <Filter>Quelldateien</Filter>
4.74 - </ClCompile>
4.75 - <ClCompile Include="src\blacklist.c">
4.76 - <Filter>Quelldateien</Filter>
4.77 - </ClCompile>
4.78 - <ClCompile Include="src\sync.c">
4.79 - <Filter>Quelldateien</Filter>
4.80 - </ClCompile>
4.81 - <ClCompile Include="src\sync_actions.c">
4.82 - <Filter>Quelldateien</Filter>
4.83 - </ClCompile>
4.84 - <ClCompile Include="src\sync_driver.c">
4.85 - <Filter>Quelldateien</Filter>
4.86 - </ClCompile>
4.87 - <ClCompile Include="src\sync_fsm.c">
4.88 - <Filter>Quelldateien</Filter>
4.89 - </ClCompile>
4.90 - <ClCompile Include="src\map_asn1.c">
4.91 - <Filter>Quelldateien</Filter>
4.92 - </ClCompile>
4.93 - <ClCompile Include="src\baseprotocol.c">
4.94 - <Filter>Quelldateien</Filter>
4.95 - </ClCompile>
4.96 - <ClCompile Include="src\sync_send_actions.c">
4.97 - <Filter>Quelldateien</Filter>
4.98 - </ClCompile>
4.99 - <ClCompile Include="src\openpgp_compat.c">
4.100 - <Filter>Quelldateien</Filter>
4.101 - </ClCompile>
4.102 - <ClCompile Include="src\asn1_helper.c">
4.103 - <Filter>Quelldateien</Filter>
4.104 - </ClCompile>
4.105 - <ClCompile Include="src\sync_impl.c">
4.106 - <Filter>Quelldateien</Filter>
4.107 - </ClCompile>
4.108 - </ItemGroup>
4.109 - <ItemGroup>
4.110 - <ClInclude Include="src\keymanagement.h">
4.111 - <Filter>Headerdateien</Filter>
4.112 - </ClInclude>
4.113 - <ClInclude Include="src\pEpEngine.h">
4.114 - <Filter>Headerdateien</Filter>
4.115 - </ClInclude>
4.116 - <ClInclude Include="src\platform_windows.h">
4.117 - <Filter>Headerdateien</Filter>
4.118 - </ClInclude>
4.119 - <ClInclude Include="src\sqlite3.h">
4.120 - <Filter>Headerdateien</Filter>
4.121 - </ClInclude>
4.122 - <ClInclude Include="src\transport.h">
4.123 - <Filter>Headerdateien</Filter>
4.124 - </ClInclude>
4.125 - <ClInclude Include="src\cryptotech.h">
4.126 - <Filter>Headerdateien</Filter>
4.127 - </ClInclude>
4.128 - <ClInclude Include="src\pgp_gpg.h">
4.129 - <Filter>Headerdateien</Filter>
4.130 - </ClInclude>
4.131 - <ClInclude Include="src\pEp_internal.h">
4.132 - <Filter>Headerdateien</Filter>
4.133 - </ClInclude>
4.134 - <ClInclude Include="src\pgp_gpg_internal.h">
4.135 - <Filter>Headerdateien</Filter>
4.136 - </ClInclude>
4.137 - <ClInclude Include="src\resource.h">
4.138 - <Filter>Ressourcendateien</Filter>
4.139 - </ClInclude>
4.140 - <ClInclude Include="src\email.h">
4.141 - <Filter>Headerdateien</Filter>
4.142 - </ClInclude>
4.143 - <ClInclude Include="src\stringlist.h">
4.144 - <Filter>Headerdateien</Filter>
4.145 - </ClInclude>
4.146 - <ClInclude Include="src\stringpair.h">
4.147 - <Filter>Headerdateien</Filter>
4.148 - </ClInclude>
4.149 - <ClInclude Include="src\timestamp.h">
4.150 - <Filter>Headerdateien</Filter>
4.151 - </ClInclude>
4.152 - <ClInclude Include="src\trans_auto.h">
4.153 - <Filter>Headerdateien</Filter>
4.154 - </ClInclude>
4.155 - <ClInclude Include="src\wrappers.h">
4.156 - <Filter>Headerdateien</Filter>
4.157 - </ClInclude>
4.158 - <ClInclude Include="src\bloblist.h">
4.159 - <Filter>Headerdateien</Filter>
4.160 - </ClInclude>
4.161 - <ClInclude Include="src\dynamic_api.h">
4.162 - <Filter>Headerdateien</Filter>
4.163 - </ClInclude>
4.164 - <ClInclude Include="src\etpan_mime.h">
4.165 - <Filter>Headerdateien</Filter>
4.166 - </ClInclude>
4.167 - <ClInclude Include="src\identity_list.h">
4.168 - <Filter>Headerdateien</Filter>
4.169 - </ClInclude>
4.170 - <ClInclude Include="src\message.h">
4.171 - <Filter>Headerdateien</Filter>
4.172 - </ClInclude>
4.173 - <ClInclude Include="src\message_api.h">
4.174 - <Filter>Headerdateien</Filter>
4.175 - </ClInclude>
4.176 - <ClInclude Include="src\mime.h">
4.177 - <Filter>Headerdateien</Filter>
4.178 - </ClInclude>
4.179 - <ClInclude Include="src\platform.h">
4.180 - <Filter>Headerdateien</Filter>
4.181 - </ClInclude>
4.182 - <ClInclude Include="src\blacklist.h">
4.183 - <Filter>Headerdateien</Filter>
4.184 - </ClInclude>
4.185 - <ClInclude Include="src\sync.h">
4.186 - <Filter>Headerdateien</Filter>
4.187 - </ClInclude>
4.188 - <ClInclude Include="src\sync_fsm.h">
4.189 - <Filter>Headerdateien</Filter>
4.190 - </ClInclude>
4.191 - <ClInclude Include="src\map_asn1.h">
4.192 - <Filter>Headerdateien</Filter>
4.193 - </ClInclude>
4.194 - <ClInclude Include="src\baseprotocol.h">
4.195 - <Filter>Headerdateien</Filter>
4.196 - </ClInclude>
4.197 - <ClInclude Include="src\openpgp_compat.h">
4.198 - <Filter>Headerdateien</Filter>
4.199 - </ClInclude>
4.200 - <ClInclude Include="src\asn1_helper.h">
4.201 - <Filter>Headerdateien</Filter>
4.202 - </ClInclude>
4.203 - <ClInclude Include="src\sync_impl.h">
4.204 - <Filter>Headerdateien</Filter>
4.205 - </ClInclude>
4.206 - </ItemGroup>
4.207 - <ItemGroup>
4.208 - <Text Include="LICENSE.txt" />
4.209 - </ItemGroup>
4.210 -</Project>
4.211 \ No newline at end of file
5.1 --- a/src/sync_fsm.c Mon Oct 10 16:34:43 2016 +0200
5.2 +++ b/src/sync_fsm.c Tue Oct 11 16:39:40 2016 +0200
5.3 @@ -1,5 +1,4 @@
5.4 #include "sync_fsm.h"
5.5 -#include <stdio.h>
5.6
5.7 // state machine for DeviceState
5.8
5.9 @@ -16,10 +15,8 @@
5.10
5.11 switch (state) {
5.12 case InitState:
5.13 - printf("State : InitState\n");
5.14 switch (event) {
5.15 case Init:
5.16 - printf("Event : Init\n");
5.17 cond_result = storedGroupKeys(session);
5.18 if (cond_result < 0)
5.19 return cond_result;
5.20 @@ -33,11 +30,9 @@
5.21 break;
5.22
5.23 case Sole:
5.24 - printf("State : Sole\n");
5.25 switch (event) {
5.26 - case Init: printf("Event : Init\n"); break;
5.27 + case Init: break;
5.28 case KeyGen:
5.29 - printf("Event : KeyGen\n");
5.30 status = sendBeacon(session, state, NULL, NULL);
5.31 if (status == PEP_OUT_OF_MEMORY)
5.32 return (int) invalid_out_of_memory;
5.33 @@ -45,7 +40,6 @@
5.34 return (int) invalid_action;
5.35 break;
5.36 case CannotDecrypt:
5.37 - printf("Event : CannotDecrypt\n");
5.38 status = sendBeacon(session, state, NULL, NULL);
5.39 if (status == PEP_OUT_OF_MEMORY)
5.40 return (int) invalid_out_of_memory;
5.41 @@ -53,7 +47,6 @@
5.42 return (int) invalid_action;
5.43 break;
5.44 case Beacon:
5.45 - printf("Event : Beacon\n");
5.46 status = sendHandshakeRequest(session, state, partner, NULL);
5.47 if (status == PEP_OUT_OF_MEMORY)
5.48 return (int) invalid_out_of_memory;
5.49 @@ -61,7 +54,6 @@
5.50 return (int) invalid_action;
5.51 break;
5.52 case HandshakeRequest:
5.53 - printf("Event : HandshakeRequest\n");
5.54 status = sendHandshakeRequest(session, state, partner, NULL);
5.55 if (status == PEP_OUT_OF_MEMORY)
5.56 return (int) invalid_out_of_memory;
5.57 @@ -74,10 +66,8 @@
5.58 break;
5.59
5.60 case HandshakingSole:
5.61 - printf("State : HandshakingSole\n");
5.62 switch (event) {
5.63 case Init:
5.64 - printf("Event : Init\n");
5.65 status = showHandshake(session, state, partner, NULL);
5.66 if (status == PEP_OUT_OF_MEMORY)
5.67 return (int) invalid_out_of_memory;
5.68 @@ -85,7 +75,6 @@
5.69 return (int) invalid_action;
5.70 break;
5.71 case HandshakeRejected:
5.72 - printf("Event : HandshakeRejected\n");
5.73 status = rejectHandshake(session, state, partner, NULL);
5.74 if (status == PEP_OUT_OF_MEMORY)
5.75 return (int) invalid_out_of_memory;
5.76 @@ -93,7 +82,6 @@
5.77 return (int) invalid_action;
5.78 return Sole;
5.79 case HandshakeAccepted:
5.80 - printf("Event : HandshakeAccepted\n");
5.81 status = acceptHandshake(session, state, partner, NULL);
5.82 if (status == PEP_OUT_OF_MEMORY)
5.83 return (int) invalid_out_of_memory;
5.84 @@ -117,11 +105,9 @@
5.85 break;
5.86
5.87 case WaitForGroupKeysSole:
5.88 - printf("State : WaitForGroupKeysSole\n");
5.89 switch (event) {
5.90 - case Init: printf("Event : Init\n"); break;
5.91 + case Init: break;
5.92 case GroupKeys:
5.93 - printf("Event : GroupKeys\n");
5.94 status = storeGroupKeys(session, state, partner, extra /*keys*/);
5.95 if (status == PEP_OUT_OF_MEMORY)
5.96 return (int) invalid_out_of_memory;
5.97 @@ -129,10 +115,8 @@
5.98 return (int) invalid_action;
5.99 return Grouped;
5.100 case Cancel:
5.101 - printf("Event : Cancel\n");
5.102 return Sole;
5.103 case Reject:
5.104 - printf("Event : Reject\n");
5.105 status = rejectHandshake(session, state, partner, NULL);
5.106 if (status == PEP_OUT_OF_MEMORY)
5.107 return (int) invalid_out_of_memory;
5.108 @@ -145,11 +129,9 @@
5.109 break;
5.110
5.111 case Grouped:
5.112 - printf("State : Grouped\n");
5.113 switch (event) {
5.114 - case Init: printf("Event : Init\n"); break;
5.115 + case Init: break;
5.116 case KeyGen:
5.117 - printf("Event : KeyGen\n");
5.118 status = sendGroupKeys(session, state, NULL, NULL);
5.119 if (status == PEP_OUT_OF_MEMORY)
5.120 return (int) invalid_out_of_memory;
5.121 @@ -157,7 +139,6 @@
5.122 return (int) invalid_action;
5.123 break;
5.124 case Beacon:
5.125 - printf("Event : Beacon\n");
5.126 status = sendHandshakeRequest(session, state, partner, NULL);
5.127 if (status == PEP_OUT_OF_MEMORY)
5.128 return (int) invalid_out_of_memory;
5.129 @@ -165,7 +146,6 @@
5.130 return (int) invalid_action;
5.131 break;
5.132 case HandshakeRequest:
5.133 - printf("Event : HandshakeRequest\n");
5.134 status = sendHandshakeRequest(session, state, partner, NULL);
5.135 if (status == PEP_OUT_OF_MEMORY)
5.136 return (int) invalid_out_of_memory;
5.137 @@ -173,7 +153,6 @@
5.138 return (int) invalid_action;
5.139 return HandshakingGrouped;
5.140 case GroupKeys:
5.141 - printf("Event : GroupKeys\n");
5.142 status = storeGroupKeys(session, state, partner, extra /*keys*/);
5.143 if (status == PEP_OUT_OF_MEMORY)
5.144 return (int) invalid_out_of_memory;
5.145 @@ -186,10 +165,8 @@
5.146 break;
5.147
5.148 case HandshakingGrouped:
5.149 - printf("State : HandshakingGrouped\n");
5.150 switch (event) {
5.151 case Init:
5.152 - printf("Event : Init\n");
5.153 status = showHandshake(session, state, partner, NULL);
5.154 if (status == PEP_OUT_OF_MEMORY)
5.155 return (int) invalid_out_of_memory;
5.156 @@ -197,7 +174,6 @@
5.157 return (int) invalid_action;
5.158 break;
5.159 case HandshakeRejected:
5.160 - printf("Event : HandshakeRejected\n");
5.161 status = rejectHandshake(session, state, partner, NULL);
5.162 if (status == PEP_OUT_OF_MEMORY)
5.163 return (int) invalid_out_of_memory;
5.164 @@ -205,7 +181,6 @@
5.165 return (int) invalid_action;
5.166 return Grouped;
5.167 case HandshakeAccepted:
5.168 - printf("Event : HandshakeAccepted\n");
5.169 status = acceptHandshake(session, state, partner, NULL);
5.170 if (status == PEP_OUT_OF_MEMORY)
5.171 return (int) invalid_out_of_memory;