Merge with sequoia_windows sync
authorThomas
Fri, 30 Aug 2019 17:14:39 +0200
branchsync
changeset 40369ecb9fbb5f6b
parent 4032 0f2b0543b90a
parent 4035 e87da0dd6136
child 4037 fbc2e35b0ad2
Merge with sequoia_windows
src/pEp_internal.h
src/pgp_sequoia.c
src/platform_windows.cpp
src/platform_windows.h
     1.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj	Fri Aug 30 10:23:31 2019 +0200
     1.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj	Fri Aug 30 17:14:39 2019 +0200
     1.3 @@ -9,14 +9,6 @@
     1.4        <Configuration>Release</Configuration>
     1.5        <Platform>Win32</Platform>
     1.6      </ProjectConfiguration>
     1.7 -    <ProjectConfiguration Include="Debug|x64">
     1.8 -      <Configuration>Debug</Configuration>
     1.9 -      <Platform>x64</Platform>
    1.10 -    </ProjectConfiguration>
    1.11 -    <ProjectConfiguration Include="Release|x64">
    1.12 -      <Configuration>Release</Configuration>
    1.13 -      <Platform>x64</Platform>
    1.14 -    </ProjectConfiguration>
    1.15    </ItemGroup>
    1.16    <PropertyGroup Label="Globals">
    1.17      <ProjectGuid>{9A67164D-B8F8-4601-A24B-28AFE774D41C}</ProjectGuid>
    1.18 @@ -38,19 +30,6 @@
    1.19      <WholeProgramOptimization>true</WholeProgramOptimization>
    1.20      <CharacterSet>Unicode</CharacterSet>
    1.21    </PropertyGroup>
    1.22 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    1.23 -    <ConfigurationType>StaticLibrary</ConfigurationType>
    1.24 -    <UseDebugLibraries>true</UseDebugLibraries>
    1.25 -    <PlatformToolset>v141</PlatformToolset>
    1.26 -    <CharacterSet>Unicode</CharacterSet>
    1.27 -  </PropertyGroup>
    1.28 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    1.29 -    <ConfigurationType>StaticLibrary</ConfigurationType>
    1.30 -    <UseDebugLibraries>false</UseDebugLibraries>
    1.31 -    <PlatformToolset>v141</PlatformToolset>
    1.32 -    <WholeProgramOptimization>true</WholeProgramOptimization>
    1.33 -    <CharacterSet>Unicode</CharacterSet>
    1.34 -  </PropertyGroup>
    1.35    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    1.36    <ImportGroup Label="ExtensionSettings">
    1.37    </ImportGroup>
    1.38 @@ -62,15 +41,9 @@
    1.39    <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='Debug|x64'">
    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 -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    1.46 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    1.47 -  </ImportGroup>
    1.48    <PropertyGroup Label="UserMacros" />
    1.49    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    1.50 -    <IncludePath>$(ProjectDir)..\..\asn.1;$(IncludePath)</IncludePath>
    1.51 +    <IncludePath>$(IncludePath)</IncludePath>
    1.52    </PropertyGroup>
    1.53    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    1.54      <IncludePath>$(ProjectDir)..\..\asn.1;$(IncludePath)</IncludePath>
    1.55 @@ -82,6 +55,7 @@
    1.56        <WarningLevel>Level3</WarningLevel>
    1.57        <Optimization>Disabled</Optimization>
    1.58        <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.59 +      <AdditionalIncludeDirectories>$(ProjectDir)..\..\asn.1</AdditionalIncludeDirectories>
    1.60      </ClCompile>
    1.61      <Link>
    1.62        <SubSystem>Windows</SubSystem>
    1.63 @@ -91,18 +65,6 @@
    1.64        <Message>Generating Code for pEp Sync</Message>
    1.65      </PreBuildEvent>
    1.66    </ItemDefinitionGroup>
    1.67 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    1.68 -    <ClCompile>
    1.69 -      <PrecompiledHeader>
    1.70 -      </PrecompiledHeader>
    1.71 -      <WarningLevel>Level3</WarningLevel>
    1.72 -      <Optimization>Disabled</Optimization>
    1.73 -      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.74 -    </ClCompile>
    1.75 -    <Link>
    1.76 -      <SubSystem>Windows</SubSystem>
    1.77 -    </Link>
    1.78 -  </ItemDefinitionGroup>
    1.79    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    1.80      <ClCompile>
    1.81        <WarningLevel>Level3</WarningLevel>
    1.82 @@ -112,6 +74,7 @@
    1.83        <FunctionLevelLinking>true</FunctionLevelLinking>
    1.84        <IntrinsicFunctions>true</IntrinsicFunctions>
    1.85        <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.86 +      <AdditionalIncludeDirectories>$(ProjectDir)..\..\asn.1</AdditionalIncludeDirectories>
    1.87      </ClCompile>
    1.88      <Link>
    1.89        <SubSystem>Windows</SubSystem>
    1.90 @@ -123,22 +86,6 @@
    1.91        <Message>Generating Code for pEp Sync</Message>
    1.92      </PreBuildEvent>
    1.93    </ItemDefinitionGroup>
    1.94 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    1.95 -    <ClCompile>
    1.96 -      <WarningLevel>Level3</WarningLevel>
    1.97 -      <PrecompiledHeader>
    1.98 -      </PrecompiledHeader>
    1.99 -      <Optimization>MaxSpeed</Optimization>
   1.100 -      <FunctionLevelLinking>true</FunctionLevelLinking>
   1.101 -      <IntrinsicFunctions>true</IntrinsicFunctions>
   1.102 -      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   1.103 -    </ClCompile>
   1.104 -    <Link>
   1.105 -      <SubSystem>Windows</SubSystem>
   1.106 -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
   1.107 -      <OptimizeReferences>true</OptimizeReferences>
   1.108 -    </Link>
   1.109 -  </ItemDefinitionGroup>
   1.110    <ItemGroup>
   1.111      <Text Include="ReadMe.txt" />
   1.112    </ItemGroup>
   1.113 @@ -149,6 +96,5 @@
   1.114      <ClCompile Include="..\..\asn.1\*.c" />
   1.115    </ItemGroup>
   1.116    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   1.117 -  <ImportGroup Label="ExtensionTargets">
   1.118 -  </ImportGroup>
   1.119 +  <ImportGroup Label="ExtensionTargets" />
   1.120  </Project>
   1.121 \ No newline at end of file
     2.1 --- a/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Fri Aug 30 10:23:31 2019 +0200
     2.2 +++ b/build-windows/libpEpasn1/libpEpasn1.vcxproj.filters	Fri Aug 30 17:14:39 2019 +0200
     2.3 @@ -18,336 +18,975 @@
     2.4      <Text Include="ReadMe.txt" />
     2.5    </ItemGroup>
     2.6    <ItemGroup>
     2.7 -    <ClInclude Include="..\..\asn.1\asn_application.h">
     2.8 +    <ClInclude Include="..\..\asn.1\*.h">
     2.9        <Filter>Header Files</Filter>
    2.10      </ClInclude>
    2.11 -    <ClInclude Include="..\..\asn.1\asn_codecs.h">
    2.12 +    <ClInclude Include="..\..\asn.1\*.h">
    2.13        <Filter>Header Files</Filter>
    2.14      </ClInclude>
    2.15 -    <ClInclude Include="..\..\asn.1\asn_codecs_prim.h">
    2.16 +    <ClInclude Include="..\..\asn.1\*.h">
    2.17        <Filter>Header Files</Filter>
    2.18      </ClInclude>
    2.19 -    <ClInclude Include="..\..\asn.1\asn_internal.h">
    2.20 +    <ClInclude Include="..\..\asn.1\*.h">
    2.21        <Filter>Header Files</Filter>
    2.22      </ClInclude>
    2.23 -    <ClInclude Include="..\..\asn.1\asn_SEQUENCE_OF.h">
    2.24 +    <ClInclude Include="..\..\asn.1\*.h">
    2.25        <Filter>Header Files</Filter>
    2.26      </ClInclude>
    2.27 -    <ClInclude Include="..\..\asn.1\asn_SET_OF.h">
    2.28 +    <ClInclude Include="..\..\asn.1\*.h">
    2.29        <Filter>Header Files</Filter>
    2.30      </ClInclude>
    2.31 -    <ClInclude Include="..\..\asn.1\asn_system.h">
    2.32 +    <ClInclude Include="..\..\asn.1\*.h">
    2.33        <Filter>Header Files</Filter>
    2.34      </ClInclude>
    2.35 -    <ClInclude Include="..\..\asn.1\Beacon.h">
    2.36 +    <ClInclude Include="..\..\asn.1\*.h">
    2.37        <Filter>Header Files</Filter>
    2.38      </ClInclude>
    2.39 -    <ClInclude Include="..\..\asn.1\ber_decoder.h">
    2.40 +    <ClInclude Include="..\..\asn.1\*.h">
    2.41        <Filter>Header Files</Filter>
    2.42      </ClInclude>
    2.43 -    <ClInclude Include="..\..\asn.1\ber_tlv_length.h">
    2.44 +    <ClInclude Include="..\..\asn.1\*.h">
    2.45        <Filter>Header Files</Filter>
    2.46      </ClInclude>
    2.47 -    <ClInclude Include="..\..\asn.1\ber_tlv_tag.h">
    2.48 +    <ClInclude Include="..\..\asn.1\*.h">
    2.49        <Filter>Header Files</Filter>
    2.50      </ClInclude>
    2.51 -    <ClInclude Include="..\..\asn.1\BIT_STRING.h">
    2.52 +    <ClInclude Include="..\..\asn.1\*.h">
    2.53        <Filter>Header Files</Filter>
    2.54      </ClInclude>
    2.55 -    <ClInclude Include="..\..\asn.1\BOOLEAN.h">
    2.56 +    <ClInclude Include="..\..\asn.1\*.h">
    2.57        <Filter>Header Files</Filter>
    2.58      </ClInclude>
    2.59 -    <ClInclude Include="..\..\asn.1\CommitAccept.h">
    2.60 +    <ClInclude Include="..\..\asn.1\*.h">
    2.61        <Filter>Header Files</Filter>
    2.62      </ClInclude>
    2.63 -    <ClInclude Include="..\..\asn.1\CommitReject.h">
    2.64 +    <ClInclude Include="..\..\asn.1\*.h">
    2.65        <Filter>Header Files</Filter>
    2.66      </ClInclude>
    2.67 -    <ClInclude Include="..\..\asn.1\constr_CHOICE.h">
    2.68 +    <ClInclude Include="..\..\asn.1\*.h">
    2.69        <Filter>Header Files</Filter>
    2.70      </ClInclude>
    2.71 -    <ClInclude Include="..\..\asn.1\constr_SEQUENCE.h">
    2.72 +    <ClInclude Include="..\..\asn.1\*.h">
    2.73        <Filter>Header Files</Filter>
    2.74      </ClInclude>
    2.75 -    <ClInclude Include="..\..\asn.1\constr_SEQUENCE_OF.h">
    2.76 +    <ClInclude Include="..\..\asn.1\*.h">
    2.77        <Filter>Header Files</Filter>
    2.78      </ClInclude>
    2.79 -    <ClInclude Include="..\..\asn.1\constr_SET_OF.h">
    2.80 +    <ClInclude Include="..\..\asn.1\*.h">
    2.81        <Filter>Header Files</Filter>
    2.82      </ClInclude>
    2.83 -    <ClInclude Include="..\..\asn.1\constr_TYPE.h">
    2.84 +    <ClInclude Include="..\..\asn.1\*.h">
    2.85        <Filter>Header Files</Filter>
    2.86      </ClInclude>
    2.87 -    <ClInclude Include="..\..\asn.1\constraints.h">
    2.88 +    <ClInclude Include="..\..\asn.1\*.h">
    2.89        <Filter>Header Files</Filter>
    2.90      </ClInclude>
    2.91 -    <ClInclude Include="..\..\asn.1\der_encoder.h">
    2.92 +    <ClInclude Include="..\..\asn.1\*.h">
    2.93        <Filter>Header Files</Filter>
    2.94      </ClInclude>
    2.95 -    <ClInclude Include="..\..\asn.1\GroupKeys.h">
    2.96 +    <ClInclude Include="..\..\asn.1\*.h">
    2.97        <Filter>Header Files</Filter>
    2.98      </ClInclude>
    2.99 -    <ClInclude Include="..\..\asn.1\GroupKeysAndClose.h">
   2.100 +    <ClInclude Include="..\..\asn.1\*.h">
   2.101        <Filter>Header Files</Filter>
   2.102      </ClInclude>
   2.103 -    <ClInclude Include="..\..\asn.1\HandshakeAnswer.h">
   2.104 +    <ClInclude Include="..\..\asn.1\*.h">
   2.105        <Filter>Header Files</Filter>
   2.106      </ClInclude>
   2.107 -    <ClInclude Include="..\..\asn.1\HandshakeRequest.h">
   2.108 +    <ClInclude Include="..\..\asn.1\*.h">
   2.109        <Filter>Header Files</Filter>
   2.110      </ClInclude>
   2.111 -    <ClInclude Include="..\..\asn.1\Hash.h">
   2.112 +    <ClInclude Include="..\..\asn.1\*.h">
   2.113        <Filter>Header Files</Filter>
   2.114      </ClInclude>
   2.115 -    <ClInclude Include="..\..\asn.1\Hex.h">
   2.116 +    <ClInclude Include="..\..\asn.1\*.h">
   2.117        <Filter>Header Files</Filter>
   2.118      </ClInclude>
   2.119 -    <ClInclude Include="..\..\asn.1\Identity.h">
   2.120 +    <ClInclude Include="..\..\asn.1\*.h">
   2.121        <Filter>Header Files</Filter>
   2.122      </ClInclude>
   2.123 -    <ClInclude Include="..\..\asn.1\IdentityList.h">
   2.124 +    <ClInclude Include="..\..\asn.1\*.h">
   2.125        <Filter>Header Files</Filter>
   2.126      </ClInclude>
   2.127 -    <ClInclude Include="..\..\asn.1\INTEGER.h">
   2.128 +    <ClInclude Include="..\..\asn.1\*.h">
   2.129        <Filter>Header Files</Filter>
   2.130      </ClInclude>
   2.131 -    <ClInclude Include="..\..\asn.1\ISO639-1.h">
   2.132 +    <ClInclude Include="..\..\asn.1\*.h">
   2.133        <Filter>Header Files</Filter>
   2.134      </ClInclude>
   2.135 -    <ClInclude Include="..\..\asn.1\KeySync.h">
   2.136 +    <ClInclude Include="..\..\asn.1\*.h">
   2.137        <Filter>Header Files</Filter>
   2.138      </ClInclude>
   2.139 -    <ClInclude Include="..\..\asn.1\NativeEnumerated.h">
   2.140 +    <ClInclude Include="..\..\asn.1\*.h">
   2.141        <Filter>Header Files</Filter>
   2.142      </ClInclude>
   2.143 -    <ClInclude Include="..\..\asn.1\NativeInteger.h">
   2.144 +    <ClInclude Include="..\..\asn.1\*.h">
   2.145        <Filter>Header Files</Filter>
   2.146      </ClInclude>
   2.147 -    <ClInclude Include="..\..\asn.1\OCTET_STRING.h">
   2.148 +    <ClInclude Include="..\..\asn.1\*.h">
   2.149        <Filter>Header Files</Filter>
   2.150      </ClInclude>
   2.151 -    <ClInclude Include="..\..\asn.1\per_decoder.h">
   2.152 +    <ClInclude Include="..\..\asn.1\*.h">
   2.153        <Filter>Header Files</Filter>
   2.154      </ClInclude>
   2.155 -    <ClInclude Include="..\..\asn.1\per_encoder.h">
   2.156 +    <ClInclude Include="..\..\asn.1\*.h">
   2.157        <Filter>Header Files</Filter>
   2.158      </ClInclude>
   2.159 -    <ClInclude Include="..\..\asn.1\per_opentype.h">
   2.160 +    <ClInclude Include="..\..\asn.1\*.h">
   2.161        <Filter>Header Files</Filter>
   2.162      </ClInclude>
   2.163 -    <ClInclude Include="..\..\asn.1\per_support.h">
   2.164 +    <ClInclude Include="..\..\asn.1\*.h">
   2.165        <Filter>Header Files</Filter>
   2.166      </ClInclude>
   2.167 -    <ClInclude Include="..\..\asn.1\PrintableString.h">
   2.168 +    <ClInclude Include="..\..\asn.1\*.h">
   2.169        <Filter>Header Files</Filter>
   2.170      </ClInclude>
   2.171 -    <ClInclude Include="..\..\asn.1\PString.h">
   2.172 +    <ClInclude Include="..\..\asn.1\*.h">
   2.173        <Filter>Header Files</Filter>
   2.174      </ClInclude>
   2.175 -    <ClInclude Include="..\..\asn.1\Rollback.h">
   2.176 +    <ClInclude Include="..\..\asn.1\*.h">
   2.177        <Filter>Header Files</Filter>
   2.178      </ClInclude>
   2.179 -    <ClInclude Include="..\..\asn.1\Sync.h">
   2.180 +    <ClInclude Include="..\..\asn.1\*.h">
   2.181        <Filter>Header Files</Filter>
   2.182      </ClInclude>
   2.183 -    <ClInclude Include="..\..\asn.1\TID.h">
   2.184 +    <ClInclude Include="..\..\asn.1\*.h">
   2.185        <Filter>Header Files</Filter>
   2.186      </ClInclude>
   2.187 -    <ClInclude Include="..\..\asn.1\UTF8String.h">
   2.188 +    <ClInclude Include="..\..\asn.1\*.h">
   2.189        <Filter>Header Files</Filter>
   2.190      </ClInclude>
   2.191 -    <ClInclude Include="..\..\asn.1\Version.h">
   2.192 +    <ClInclude Include="..\..\asn.1\*.h">
   2.193        <Filter>Header Files</Filter>
   2.194      </ClInclude>
   2.195 -    <ClInclude Include="..\..\asn.1\xer_decoder.h">
   2.196 +    <ClInclude Include="..\..\asn.1\*.h">
   2.197        <Filter>Header Files</Filter>
   2.198      </ClInclude>
   2.199 -    <ClInclude Include="..\..\asn.1\xer_encoder.h">
   2.200 +    <ClInclude Include="..\..\asn.1\*.h">
   2.201        <Filter>Header Files</Filter>
   2.202      </ClInclude>
   2.203 -    <ClInclude Include="..\..\asn.1\xer_support.h">
   2.204 +    <ClInclude Include="..\..\asn.1\*.h">
   2.205        <Filter>Header Files</Filter>
   2.206      </ClInclude>
   2.207 -    <ClInclude Include="..\..\asn.1\CommitAcceptForGroup.h">
   2.208 +    <ClInclude Include="..\..\asn.1\*.h">
   2.209        <Filter>Header Files</Filter>
   2.210      </ClInclude>
   2.211 -    <ClInclude Include="..\..\asn.1\GroupTrustThisKey.h">
   2.212 +    <ClInclude Include="..\..\asn.1\*.h">
   2.213        <Filter>Header Files</Filter>
   2.214      </ClInclude>
   2.215 -    <ClInclude Include="..\..\asn.1\CommitAcceptFirst.h">
   2.216 +    <ClInclude Include="..\..\asn.1\*.h">
   2.217        <Filter>Header Files</Filter>
   2.218      </ClInclude>
   2.219 -    <ClInclude Include="..\..\asn.1\CommitAcceptSecond.h">
   2.220 +    <ClInclude Include="..\..\asn.1\*.h">
   2.221        <Filter>Header Files</Filter>
   2.222      </ClInclude>
   2.223 -    <ClInclude Include="..\..\asn.1\OwnKeys.h">
   2.224 +    <ClInclude Include="..\..\asn.1\*.h">
   2.225        <Filter>Header Files</Filter>
   2.226      </ClInclude>
   2.227 -    <ClInclude Include="..\..\asn.1\OwnKeysFirst.h">
   2.228 +    <ClInclude Include="..\..\asn.1\*.h">
   2.229        <Filter>Header Files</Filter>
   2.230      </ClInclude>
   2.231 -    <ClInclude Include="..\..\asn.1\OwnKeysSecond.h">
   2.232 +    <ClInclude Include="..\..\asn.1\*.h">
   2.233 +      <Filter>Header Files</Filter>
   2.234 +    </ClInclude>
   2.235 +    <ClInclude Include="..\..\asn.1\*.h">
   2.236 +      <Filter>Header Files</Filter>
   2.237 +    </ClInclude>
   2.238 +    <ClInclude Include="..\..\asn.1\*.h">
   2.239 +      <Filter>Header Files</Filter>
   2.240 +    </ClInclude>
   2.241 +    <ClInclude Include="..\..\asn.1\*.h">
   2.242 +      <Filter>Header Files</Filter>
   2.243 +    </ClInclude>
   2.244 +    <ClInclude Include="..\..\asn.1\*.h">
   2.245 +      <Filter>Header Files</Filter>
   2.246 +    </ClInclude>
   2.247 +    <ClInclude Include="..\..\asn.1\*.h">
   2.248 +      <Filter>Header Files</Filter>
   2.249 +    </ClInclude>
   2.250 +    <ClInclude Include="..\..\asn.1\*.h">
   2.251 +      <Filter>Header Files</Filter>
   2.252 +    </ClInclude>
   2.253 +    <ClInclude Include="..\..\asn.1\*.h">
   2.254 +      <Filter>Header Files</Filter>
   2.255 +    </ClInclude>
   2.256 +    <ClInclude Include="..\..\asn.1\*.h">
   2.257 +      <Filter>Header Files</Filter>
   2.258 +    </ClInclude>
   2.259 +    <ClInclude Include="..\..\asn.1\*.h">
   2.260 +      <Filter>Header Files</Filter>
   2.261 +    </ClInclude>
   2.262 +    <ClInclude Include="..\..\asn.1\*.h">
   2.263 +      <Filter>Header Files</Filter>
   2.264 +    </ClInclude>
   2.265 +    <ClInclude Include="..\..\asn.1\*.h">
   2.266 +      <Filter>Header Files</Filter>
   2.267 +    </ClInclude>
   2.268 +    <ClInclude Include="..\..\asn.1\*.h">
   2.269 +      <Filter>Header Files</Filter>
   2.270 +    </ClInclude>
   2.271 +    <ClInclude Include="..\..\asn.1\*.h">
   2.272 +      <Filter>Header Files</Filter>
   2.273 +    </ClInclude>
   2.274 +    <ClInclude Include="..\..\asn.1\*.h">
   2.275 +      <Filter>Header Files</Filter>
   2.276 +    </ClInclude>
   2.277 +    <ClInclude Include="..\..\asn.1\*.h">
   2.278 +      <Filter>Header Files</Filter>
   2.279 +    </ClInclude>
   2.280 +    <ClInclude Include="..\..\asn.1\*.h">
   2.281 +      <Filter>Header Files</Filter>
   2.282 +    </ClInclude>
   2.283 +    <ClInclude Include="..\..\asn.1\*.h">
   2.284 +      <Filter>Header Files</Filter>
   2.285 +    </ClInclude>
   2.286 +    <ClInclude Include="..\..\asn.1\*.h">
   2.287 +      <Filter>Header Files</Filter>
   2.288 +    </ClInclude>
   2.289 +    <ClInclude Include="..\..\asn.1\*.h">
   2.290 +      <Filter>Header Files</Filter>
   2.291 +    </ClInclude>
   2.292 +    <ClInclude Include="..\..\asn.1\*.h">
   2.293 +      <Filter>Header Files</Filter>
   2.294 +    </ClInclude>
   2.295 +    <ClInclude Include="..\..\asn.1\*.h">
   2.296 +      <Filter>Header Files</Filter>
   2.297 +    </ClInclude>
   2.298 +    <ClInclude Include="..\..\asn.1\*.h">
   2.299 +      <Filter>Header Files</Filter>
   2.300 +    </ClInclude>
   2.301 +    <ClInclude Include="..\..\asn.1\*.h">
   2.302 +      <Filter>Header Files</Filter>
   2.303 +    </ClInclude>
   2.304 +    <ClInclude Include="..\..\asn.1\*.h">
   2.305 +      <Filter>Header Files</Filter>
   2.306 +    </ClInclude>
   2.307 +    <ClInclude Include="..\..\asn.1\*.h">
   2.308 +      <Filter>Header Files</Filter>
   2.309 +    </ClInclude>
   2.310 +    <ClInclude Include="..\..\asn.1\*.h">
   2.311 +      <Filter>Header Files</Filter>
   2.312 +    </ClInclude>
   2.313 +    <ClInclude Include="..\..\asn.1\*.h">
   2.314 +      <Filter>Header Files</Filter>
   2.315 +    </ClInclude>
   2.316 +    <ClInclude Include="..\..\asn.1\*.h">
   2.317 +      <Filter>Header Files</Filter>
   2.318 +    </ClInclude>
   2.319 +    <ClInclude Include="..\..\asn.1\*.h">
   2.320 +      <Filter>Header Files</Filter>
   2.321 +    </ClInclude>
   2.322 +    <ClInclude Include="..\..\asn.1\*.h">
   2.323 +      <Filter>Header Files</Filter>
   2.324 +    </ClInclude>
   2.325 +    <ClInclude Include="..\..\asn.1\*.h">
   2.326 +      <Filter>Header Files</Filter>
   2.327 +    </ClInclude>
   2.328 +    <ClInclude Include="..\..\asn.1\*.h">
   2.329 +      <Filter>Header Files</Filter>
   2.330 +    </ClInclude>
   2.331 +    <ClInclude Include="..\..\asn.1\*.h">
   2.332 +      <Filter>Header Files</Filter>
   2.333 +    </ClInclude>
   2.334 +    <ClInclude Include="..\..\asn.1\*.h">
   2.335 +      <Filter>Header Files</Filter>
   2.336 +    </ClInclude>
   2.337 +    <ClInclude Include="..\..\asn.1\*.h">
   2.338 +      <Filter>Header Files</Filter>
   2.339 +    </ClInclude>
   2.340 +    <ClInclude Include="..\..\asn.1\*.h">
   2.341 +      <Filter>Header Files</Filter>
   2.342 +    </ClInclude>
   2.343 +    <ClInclude Include="..\..\asn.1\*.h">
   2.344 +      <Filter>Header Files</Filter>
   2.345 +    </ClInclude>
   2.346 +    <ClInclude Include="..\..\asn.1\*.h">
   2.347 +      <Filter>Header Files</Filter>
   2.348 +    </ClInclude>
   2.349 +    <ClInclude Include="..\..\asn.1\*.h">
   2.350 +      <Filter>Header Files</Filter>
   2.351 +    </ClInclude>
   2.352 +    <ClInclude Include="..\..\asn.1\*.h">
   2.353 +      <Filter>Header Files</Filter>
   2.354 +    </ClInclude>
   2.355 +    <ClInclude Include="..\..\asn.1\*.h">
   2.356 +      <Filter>Header Files</Filter>
   2.357 +    </ClInclude>
   2.358 +    <ClInclude Include="..\..\asn.1\*.h">
   2.359 +      <Filter>Header Files</Filter>
   2.360 +    </ClInclude>
   2.361 +    <ClInclude Include="..\..\asn.1\*.h">
   2.362 +      <Filter>Header Files</Filter>
   2.363 +    </ClInclude>
   2.364 +    <ClInclude Include="..\..\asn.1\*.h">
   2.365 +      <Filter>Header Files</Filter>
   2.366 +    </ClInclude>
   2.367 +    <ClInclude Include="..\..\asn.1\*.h">
   2.368 +      <Filter>Header Files</Filter>
   2.369 +    </ClInclude>
   2.370 +    <ClInclude Include="..\..\asn.1\*.h">
   2.371 +      <Filter>Header Files</Filter>
   2.372 +    </ClInclude>
   2.373 +    <ClInclude Include="..\..\asn.1\*.h">
   2.374 +      <Filter>Header Files</Filter>
   2.375 +    </ClInclude>
   2.376 +    <ClInclude Include="..\..\asn.1\*.h">
   2.377 +      <Filter>Header Files</Filter>
   2.378 +    </ClInclude>
   2.379 +    <ClInclude Include="..\..\asn.1\*.h">
   2.380 +      <Filter>Header Files</Filter>
   2.381 +    </ClInclude>
   2.382 +    <ClInclude Include="..\..\asn.1\*.h">
   2.383 +      <Filter>Header Files</Filter>
   2.384 +    </ClInclude>
   2.385 +    <ClInclude Include="..\..\asn.1\*.h">
   2.386 +      <Filter>Header Files</Filter>
   2.387 +    </ClInclude>
   2.388 +    <ClInclude Include="..\..\asn.1\*.h">
   2.389 +      <Filter>Header Files</Filter>
   2.390 +    </ClInclude>
   2.391 +    <ClInclude Include="..\..\asn.1\*.h">
   2.392 +      <Filter>Header Files</Filter>
   2.393 +    </ClInclude>
   2.394 +    <ClInclude Include="..\..\asn.1\*.h">
   2.395 +      <Filter>Header Files</Filter>
   2.396 +    </ClInclude>
   2.397 +    <ClInclude Include="..\..\asn.1\*.h">
   2.398 +      <Filter>Header Files</Filter>
   2.399 +    </ClInclude>
   2.400 +    <ClInclude Include="..\..\asn.1\*.h">
   2.401 +      <Filter>Header Files</Filter>
   2.402 +    </ClInclude>
   2.403 +    <ClInclude Include="..\..\asn.1\*.h">
   2.404 +      <Filter>Header Files</Filter>
   2.405 +    </ClInclude>
   2.406 +    <ClInclude Include="..\..\asn.1\*.h">
   2.407 +      <Filter>Header Files</Filter>
   2.408 +    </ClInclude>
   2.409 +    <ClInclude Include="..\..\asn.1\*.h">
   2.410 +      <Filter>Header Files</Filter>
   2.411 +    </ClInclude>
   2.412 +    <ClInclude Include="..\..\asn.1\*.h">
   2.413 +      <Filter>Header Files</Filter>
   2.414 +    </ClInclude>
   2.415 +    <ClInclude Include="..\..\asn.1\*.h">
   2.416 +      <Filter>Header Files</Filter>
   2.417 +    </ClInclude>
   2.418 +    <ClInclude Include="..\..\asn.1\*.h">
   2.419 +      <Filter>Header Files</Filter>
   2.420 +    </ClInclude>
   2.421 +    <ClInclude Include="..\..\asn.1\*.h">
   2.422 +      <Filter>Header Files</Filter>
   2.423 +    </ClInclude>
   2.424 +    <ClInclude Include="..\..\asn.1\*.h">
   2.425 +      <Filter>Header Files</Filter>
   2.426 +    </ClInclude>
   2.427 +    <ClInclude Include="..\..\asn.1\*.h">
   2.428 +      <Filter>Header Files</Filter>
   2.429 +    </ClInclude>
   2.430 +    <ClInclude Include="..\..\asn.1\*.h">
   2.431 +      <Filter>Header Files</Filter>
   2.432 +    </ClInclude>
   2.433 +    <ClInclude Include="..\..\asn.1\*.h">
   2.434 +      <Filter>Header Files</Filter>
   2.435 +    </ClInclude>
   2.436 +    <ClInclude Include="..\..\asn.1\*.h">
   2.437 +      <Filter>Header Files</Filter>
   2.438 +    </ClInclude>
   2.439 +    <ClInclude Include="..\..\asn.1\*.h">
   2.440 +      <Filter>Header Files</Filter>
   2.441 +    </ClInclude>
   2.442 +    <ClInclude Include="..\..\asn.1\*.h">
   2.443 +      <Filter>Header Files</Filter>
   2.444 +    </ClInclude>
   2.445 +    <ClInclude Include="..\..\asn.1\*.h">
   2.446 +      <Filter>Header Files</Filter>
   2.447 +    </ClInclude>
   2.448 +    <ClInclude Include="..\..\asn.1\*.h">
   2.449 +      <Filter>Header Files</Filter>
   2.450 +    </ClInclude>
   2.451 +    <ClInclude Include="..\..\asn.1\*.h">
   2.452 +      <Filter>Header Files</Filter>
   2.453 +    </ClInclude>
   2.454 +    <ClInclude Include="..\..\asn.1\*.h">
   2.455 +      <Filter>Header Files</Filter>
   2.456 +    </ClInclude>
   2.457 +    <ClInclude Include="..\..\asn.1\*.h">
   2.458 +      <Filter>Header Files</Filter>
   2.459 +    </ClInclude>
   2.460 +    <ClInclude Include="..\..\asn.1\*.h">
   2.461 +      <Filter>Header Files</Filter>
   2.462 +    </ClInclude>
   2.463 +    <ClInclude Include="..\..\asn.1\*.h">
   2.464 +      <Filter>Header Files</Filter>
   2.465 +    </ClInclude>
   2.466 +    <ClInclude Include="..\..\asn.1\*.h">
   2.467 +      <Filter>Header Files</Filter>
   2.468 +    </ClInclude>
   2.469 +    <ClInclude Include="..\..\asn.1\*.h">
   2.470 +      <Filter>Header Files</Filter>
   2.471 +    </ClInclude>
   2.472 +    <ClInclude Include="..\..\asn.1\*.h">
   2.473 +      <Filter>Header Files</Filter>
   2.474 +    </ClInclude>
   2.475 +    <ClInclude Include="..\..\asn.1\*.h">
   2.476 +      <Filter>Header Files</Filter>
   2.477 +    </ClInclude>
   2.478 +    <ClInclude Include="..\..\asn.1\*.h">
   2.479 +      <Filter>Header Files</Filter>
   2.480 +    </ClInclude>
   2.481 +    <ClInclude Include="..\..\asn.1\*.h">
   2.482 +      <Filter>Header Files</Filter>
   2.483 +    </ClInclude>
   2.484 +    <ClInclude Include="..\..\asn.1\*.h">
   2.485 +      <Filter>Header Files</Filter>
   2.486 +    </ClInclude>
   2.487 +    <ClInclude Include="..\..\asn.1\*.h">
   2.488 +      <Filter>Header Files</Filter>
   2.489 +    </ClInclude>
   2.490 +    <ClInclude Include="..\..\asn.1\*.h">
   2.491 +      <Filter>Header Files</Filter>
   2.492 +    </ClInclude>
   2.493 +    <ClInclude Include="..\..\asn.1\*.h">
   2.494 +      <Filter>Header Files</Filter>
   2.495 +    </ClInclude>
   2.496 +    <ClInclude Include="..\..\asn.1\*.h">
   2.497 +      <Filter>Header Files</Filter>
   2.498 +    </ClInclude>
   2.499 +    <ClInclude Include="..\..\asn.1\*.h">
   2.500 +      <Filter>Header Files</Filter>
   2.501 +    </ClInclude>
   2.502 +    <ClInclude Include="..\..\asn.1\*.h">
   2.503 +      <Filter>Header Files</Filter>
   2.504 +    </ClInclude>
   2.505 +    <ClInclude Include="..\..\asn.1\*.h">
   2.506 +      <Filter>Header Files</Filter>
   2.507 +    </ClInclude>
   2.508 +    <ClInclude Include="..\..\asn.1\*.h">
   2.509 +      <Filter>Header Files</Filter>
   2.510 +    </ClInclude>
   2.511 +    <ClInclude Include="..\..\asn.1\*.h">
   2.512 +      <Filter>Header Files</Filter>
   2.513 +    </ClInclude>
   2.514 +    <ClInclude Include="..\..\asn.1\*.h">
   2.515 +      <Filter>Header Files</Filter>
   2.516 +    </ClInclude>
   2.517 +    <ClInclude Include="..\..\asn.1\*.h">
   2.518 +      <Filter>Header Files</Filter>
   2.519 +    </ClInclude>
   2.520 +    <ClInclude Include="..\..\asn.1\*.h">
   2.521 +      <Filter>Header Files</Filter>
   2.522 +    </ClInclude>
   2.523 +    <ClInclude Include="..\..\asn.1\*.h">
   2.524 +      <Filter>Header Files</Filter>
   2.525 +    </ClInclude>
   2.526 +    <ClInclude Include="..\..\asn.1\*.h">
   2.527 +      <Filter>Header Files</Filter>
   2.528 +    </ClInclude>
   2.529 +    <ClInclude Include="..\..\asn.1\*.h">
   2.530 +      <Filter>Header Files</Filter>
   2.531 +    </ClInclude>
   2.532 +    <ClInclude Include="..\..\asn.1\*.h">
   2.533 +      <Filter>Header Files</Filter>
   2.534 +    </ClInclude>
   2.535 +    <ClInclude Include="..\..\asn.1\*.h">
   2.536 +      <Filter>Header Files</Filter>
   2.537 +    </ClInclude>
   2.538 +    <ClInclude Include="..\..\asn.1\*.h">
   2.539 +      <Filter>Header Files</Filter>
   2.540 +    </ClInclude>
   2.541 +    <ClInclude Include="..\..\asn.1\*.h">
   2.542 +      <Filter>Header Files</Filter>
   2.543 +    </ClInclude>
   2.544 +    <ClInclude Include="..\..\asn.1\*.h">
   2.545 +      <Filter>Header Files</Filter>
   2.546 +    </ClInclude>
   2.547 +    <ClInclude Include="..\..\asn.1\*.h">
   2.548 +      <Filter>Header Files</Filter>
   2.549 +    </ClInclude>
   2.550 +    <ClInclude Include="..\..\asn.1\*.h">
   2.551 +      <Filter>Header Files</Filter>
   2.552 +    </ClInclude>
   2.553 +    <ClInclude Include="..\..\asn.1\*.h">
   2.554 +      <Filter>Header Files</Filter>
   2.555 +    </ClInclude>
   2.556 +    <ClInclude Include="..\..\asn.1\*.h">
   2.557 +      <Filter>Header Files</Filter>
   2.558 +    </ClInclude>
   2.559 +    <ClInclude Include="..\..\asn.1\*.h">
   2.560        <Filter>Header Files</Filter>
   2.561      </ClInclude>
   2.562    </ItemGroup>
   2.563    <ItemGroup>
   2.564 -    <ClCompile Include="..\..\asn.1\asn_codecs_prim.c">
   2.565 +    <ClCompile Include="..\..\asn.1\*.c">
   2.566        <Filter>Source Files</Filter>
   2.567      </ClCompile>
   2.568 -    <ClCompile Include="..\..\asn.1\asn_SEQUENCE_OF.c">
   2.569 +    <ClCompile Include="..\..\asn.1\*.c">
   2.570        <Filter>Source Files</Filter>
   2.571      </ClCompile>
   2.572 -    <ClCompile Include="..\..\asn.1\asn_SET_OF.c">
   2.573 +    <ClCompile Include="..\..\asn.1\*.c">
   2.574        <Filter>Source Files</Filter>
   2.575      </ClCompile>
   2.576 -    <ClCompile Include="..\..\asn.1\Beacon.c">
   2.577 +    <ClCompile Include="..\..\asn.1\*.c">
   2.578        <Filter>Source Files</Filter>
   2.579      </ClCompile>
   2.580 -    <ClCompile Include="..\..\asn.1\ber_decoder.c">
   2.581 +    <ClCompile Include="..\..\asn.1\*.c">
   2.582        <Filter>Source Files</Filter>
   2.583      </ClCompile>
   2.584 -    <ClCompile Include="..\..\asn.1\ber_tlv_length.c">
   2.585 +    <ClCompile Include="..\..\asn.1\*.c">
   2.586        <Filter>Source Files</Filter>
   2.587      </ClCompile>
   2.588 -    <ClCompile Include="..\..\asn.1\ber_tlv_tag.c">
   2.589 +    <ClCompile Include="..\..\asn.1\*.c">
   2.590        <Filter>Source Files</Filter>
   2.591      </ClCompile>
   2.592 -    <ClCompile Include="..\..\asn.1\BIT_STRING.c">
   2.593 +    <ClCompile Include="..\..\asn.1\*.c">
   2.594        <Filter>Source Files</Filter>
   2.595      </ClCompile>
   2.596 -    <ClCompile Include="..\..\asn.1\BOOLEAN.c">
   2.597 +    <ClCompile Include="..\..\asn.1\*.c">
   2.598        <Filter>Source Files</Filter>
   2.599      </ClCompile>
   2.600 -    <ClCompile Include="..\..\asn.1\CommitAccept.c">
   2.601 +    <ClCompile Include="..\..\asn.1\*.c">
   2.602        <Filter>Source Files</Filter>
   2.603      </ClCompile>
   2.604 -    <ClCompile Include="..\..\asn.1\CommitReject.c">
   2.605 +    <ClCompile Include="..\..\asn.1\*.c">
   2.606        <Filter>Source Files</Filter>
   2.607      </ClCompile>
   2.608 -    <ClCompile Include="..\..\asn.1\constr_CHOICE.c">
   2.609 +    <ClCompile Include="..\..\asn.1\*.c">
   2.610        <Filter>Source Files</Filter>
   2.611      </ClCompile>
   2.612 -    <ClCompile Include="..\..\asn.1\constr_SEQUENCE.c">
   2.613 +    <ClCompile Include="..\..\asn.1\*.c">
   2.614        <Filter>Source Files</Filter>
   2.615      </ClCompile>
   2.616 -    <ClCompile Include="..\..\asn.1\constr_SEQUENCE_OF.c">
   2.617 +    <ClCompile Include="..\..\asn.1\*.c">
   2.618        <Filter>Source Files</Filter>
   2.619      </ClCompile>
   2.620 -    <ClCompile Include="..\..\asn.1\constr_SET_OF.c">
   2.621 +    <ClCompile Include="..\..\asn.1\*.c">
   2.622        <Filter>Source Files</Filter>
   2.623      </ClCompile>
   2.624 -    <ClCompile Include="..\..\asn.1\constr_TYPE.c">
   2.625 +    <ClCompile Include="..\..\asn.1\*.c">
   2.626        <Filter>Source Files</Filter>
   2.627      </ClCompile>
   2.628 -    <ClCompile Include="..\..\asn.1\constraints.c">
   2.629 +    <ClCompile Include="..\..\asn.1\*.c">
   2.630        <Filter>Source Files</Filter>
   2.631      </ClCompile>
   2.632 -    <ClCompile Include="..\..\asn.1\der_encoder.c">
   2.633 +    <ClCompile Include="..\..\asn.1\*.c">
   2.634        <Filter>Source Files</Filter>
   2.635      </ClCompile>
   2.636 -    <ClCompile Include="..\..\asn.1\GroupKeys.c">
   2.637 +    <ClCompile Include="..\..\asn.1\*.c">
   2.638        <Filter>Source Files</Filter>
   2.639      </ClCompile>
   2.640 -    <ClCompile Include="..\..\asn.1\HandshakeAnswer.c">
   2.641 +    <ClCompile Include="..\..\asn.1\*.c">
   2.642        <Filter>Source Files</Filter>
   2.643      </ClCompile>
   2.644 -    <ClCompile Include="..\..\asn.1\HandshakeRequest.c">
   2.645 +    <ClCompile Include="..\..\asn.1\*.c">
   2.646        <Filter>Source Files</Filter>
   2.647      </ClCompile>
   2.648 -    <ClCompile Include="..\..\asn.1\Hash.c">
   2.649 +    <ClCompile Include="..\..\asn.1\*.c">
   2.650        <Filter>Source Files</Filter>
   2.651      </ClCompile>
   2.652 -    <ClCompile Include="..\..\asn.1\Hex.c">
   2.653 +    <ClCompile Include="..\..\asn.1\*.c">
   2.654        <Filter>Source Files</Filter>
   2.655      </ClCompile>
   2.656 -    <ClCompile Include="..\..\asn.1\Identity.c">
   2.657 +    <ClCompile Include="..\..\asn.1\*.c">
   2.658        <Filter>Source Files</Filter>
   2.659      </ClCompile>
   2.660 -    <ClCompile Include="..\..\asn.1\IdentityList.c">
   2.661 +    <ClCompile Include="..\..\asn.1\*.c">
   2.662        <Filter>Source Files</Filter>
   2.663      </ClCompile>
   2.664 -    <ClCompile Include="..\..\asn.1\INTEGER.c">
   2.665 +    <ClCompile Include="..\..\asn.1\*.c">
   2.666        <Filter>Source Files</Filter>
   2.667      </ClCompile>
   2.668 -    <ClCompile Include="..\..\asn.1\ISO639-1.c">
   2.669 +    <ClCompile Include="..\..\asn.1\*.c">
   2.670        <Filter>Source Files</Filter>
   2.671      </ClCompile>
   2.672 -    <ClCompile Include="..\..\asn.1\KeySync.c">
   2.673 +    <ClCompile Include="..\..\asn.1\*.c">
   2.674        <Filter>Source Files</Filter>
   2.675      </ClCompile>
   2.676 -    <ClCompile Include="..\..\asn.1\NativeEnumerated.c">
   2.677 +    <ClCompile Include="..\..\asn.1\*.c">
   2.678        <Filter>Source Files</Filter>
   2.679      </ClCompile>
   2.680 -    <ClCompile Include="..\..\asn.1\NativeInteger.c">
   2.681 +    <ClCompile Include="..\..\asn.1\*.c">
   2.682        <Filter>Source Files</Filter>
   2.683      </ClCompile>
   2.684 -    <ClCompile Include="..\..\asn.1\OCTET_STRING.c">
   2.685 +    <ClCompile Include="..\..\asn.1\*.c">
   2.686        <Filter>Source Files</Filter>
   2.687      </ClCompile>
   2.688 -    <ClCompile Include="..\..\asn.1\pdu_collection.c">
   2.689 +    <ClCompile Include="..\..\asn.1\*.c">
   2.690        <Filter>Source Files</Filter>
   2.691      </ClCompile>
   2.692 -    <ClCompile Include="..\..\asn.1\per_decoder.c">
   2.693 +    <ClCompile Include="..\..\asn.1\*.c">
   2.694        <Filter>Source Files</Filter>
   2.695      </ClCompile>
   2.696 -    <ClCompile Include="..\..\asn.1\per_encoder.c">
   2.697 +    <ClCompile Include="..\..\asn.1\*.c">
   2.698        <Filter>Source Files</Filter>
   2.699      </ClCompile>
   2.700 -    <ClCompile Include="..\..\asn.1\per_opentype.c">
   2.701 +    <ClCompile Include="..\..\asn.1\*.c">
   2.702        <Filter>Source Files</Filter>
   2.703      </ClCompile>
   2.704 -    <ClCompile Include="..\..\asn.1\per_support.c">
   2.705 +    <ClCompile Include="..\..\asn.1\*.c">
   2.706        <Filter>Source Files</Filter>
   2.707      </ClCompile>
   2.708 -    <ClCompile Include="..\..\asn.1\PrintableString.c">
   2.709 +    <ClCompile Include="..\..\asn.1\*.c">
   2.710        <Filter>Source Files</Filter>
   2.711      </ClCompile>
   2.712 -    <ClCompile Include="..\..\asn.1\PString.c">
   2.713 +    <ClCompile Include="..\..\asn.1\*.c">
   2.714        <Filter>Source Files</Filter>
   2.715      </ClCompile>
   2.716 -    <ClCompile Include="..\..\asn.1\Rollback.c">
   2.717 +    <ClCompile Include="..\..\asn.1\*.c">
   2.718        <Filter>Source Files</Filter>
   2.719      </ClCompile>
   2.720 -    <ClCompile Include="..\..\asn.1\Sync.c">
   2.721 +    <ClCompile Include="..\..\asn.1\*.c">
   2.722        <Filter>Source Files</Filter>
   2.723      </ClCompile>
   2.724 -    <ClCompile Include="..\..\asn.1\TID.c">
   2.725 +    <ClCompile Include="..\..\asn.1\*.c">
   2.726        <Filter>Source Files</Filter>
   2.727      </ClCompile>
   2.728 -    <ClCompile Include="..\..\asn.1\UTF8String.c">
   2.729 +    <ClCompile Include="..\..\asn.1\*.c">
   2.730        <Filter>Source Files</Filter>
   2.731      </ClCompile>
   2.732 -    <ClCompile Include="..\..\asn.1\Version.c">
   2.733 +    <ClCompile Include="..\..\asn.1\*.c">
   2.734        <Filter>Source Files</Filter>
   2.735      </ClCompile>
   2.736 -    <ClCompile Include="..\..\asn.1\xer_decoder.c">
   2.737 +    <ClCompile Include="..\..\asn.1\*.c">
   2.738        <Filter>Source Files</Filter>
   2.739      </ClCompile>
   2.740 -    <ClCompile Include="..\..\asn.1\xer_encoder.c">
   2.741 +    <ClCompile Include="..\..\asn.1\*.c">
   2.742        <Filter>Source Files</Filter>
   2.743      </ClCompile>
   2.744 -    <ClCompile Include="..\..\asn.1\xer_support.c">
   2.745 +    <ClCompile Include="..\..\asn.1\*.c">
   2.746        <Filter>Source Files</Filter>
   2.747      </ClCompile>
   2.748 -    <ClCompile Include="..\..\asn.1\CommitAcceptForGroup.c">
   2.749 +    <ClCompile Include="..\..\asn.1\*.c">
   2.750        <Filter>Source Files</Filter>
   2.751      </ClCompile>
   2.752 -    <ClCompile Include="..\..\asn.1\GroupTrustThisKey.c">
   2.753 +    <ClCompile Include="..\..\asn.1\*.c">
   2.754        <Filter>Source Files</Filter>
   2.755      </ClCompile>
   2.756 -    <ClCompile Include="..\..\asn.1\CommitAcceptFirst.c">
   2.757 +    <ClCompile Include="..\..\asn.1\*.c">
   2.758        <Filter>Source Files</Filter>
   2.759      </ClCompile>
   2.760 -    <ClCompile Include="..\..\asn.1\CommitAcceptSecond.c">
   2.761 +    <ClCompile Include="..\..\asn.1\*.c">
   2.762        <Filter>Source Files</Filter>
   2.763      </ClCompile>
   2.764 -    <ClCompile Include="..\..\asn.1\OwnKeys.c">
   2.765 +    <ClCompile Include="..\..\asn.1\*.c">
   2.766        <Filter>Source Files</Filter>
   2.767      </ClCompile>
   2.768 -    <ClCompile Include="..\..\asn.1\OwnKeysFirst.c">
   2.769 +    <ClCompile Include="..\..\asn.1\*.c">
   2.770        <Filter>Source Files</Filter>
   2.771      </ClCompile>
   2.772 -    <ClCompile Include="..\..\asn.1\OwnKeysSecond.c">
   2.773 +    <ClCompile Include="..\..\asn.1\*.c">
   2.774 +      <Filter>Source Files</Filter>
   2.775 +    </ClCompile>
   2.776 +    <ClCompile Include="..\..\asn.1\*.c">
   2.777 +      <Filter>Source Files</Filter>
   2.778 +    </ClCompile>
   2.779 +    <ClCompile Include="..\..\asn.1\*.c">
   2.780 +      <Filter>Source Files</Filter>
   2.781 +    </ClCompile>
   2.782 +    <ClCompile Include="..\..\asn.1\*.c">
   2.783 +      <Filter>Source Files</Filter>
   2.784 +    </ClCompile>
   2.785 +    <ClCompile Include="..\..\asn.1\*.c">
   2.786 +      <Filter>Source Files</Filter>
   2.787 +    </ClCompile>
   2.788 +    <ClCompile Include="..\..\asn.1\*.c">
   2.789 +      <Filter>Source Files</Filter>
   2.790 +    </ClCompile>
   2.791 +    <ClCompile Include="..\..\asn.1\*.c">
   2.792 +      <Filter>Source Files</Filter>
   2.793 +    </ClCompile>
   2.794 +    <ClCompile Include="..\..\asn.1\*.c">
   2.795 +      <Filter>Source Files</Filter>
   2.796 +    </ClCompile>
   2.797 +    <ClCompile Include="..\..\asn.1\*.c">
   2.798 +      <Filter>Source Files</Filter>
   2.799 +    </ClCompile>
   2.800 +    <ClCompile Include="..\..\asn.1\*.c">
   2.801 +      <Filter>Source Files</Filter>
   2.802 +    </ClCompile>
   2.803 +    <ClCompile Include="..\..\asn.1\*.c">
   2.804 +      <Filter>Source Files</Filter>
   2.805 +    </ClCompile>
   2.806 +    <ClCompile Include="..\..\asn.1\*.c">
   2.807 +      <Filter>Source Files</Filter>
   2.808 +    </ClCompile>
   2.809 +    <ClCompile Include="..\..\asn.1\*.c">
   2.810 +      <Filter>Source Files</Filter>
   2.811 +    </ClCompile>
   2.812 +    <ClCompile Include="..\..\asn.1\*.c">
   2.813 +      <Filter>Source Files</Filter>
   2.814 +    </ClCompile>
   2.815 +    <ClCompile Include="..\..\asn.1\*.c">
   2.816 +      <Filter>Source Files</Filter>
   2.817 +    </ClCompile>
   2.818 +    <ClCompile Include="..\..\asn.1\*.c">
   2.819 +      <Filter>Source Files</Filter>
   2.820 +    </ClCompile>
   2.821 +    <ClCompile Include="..\..\asn.1\*.c">
   2.822 +      <Filter>Source Files</Filter>
   2.823 +    </ClCompile>
   2.824 +    <ClCompile Include="..\..\asn.1\*.c">
   2.825 +      <Filter>Source Files</Filter>
   2.826 +    </ClCompile>
   2.827 +    <ClCompile Include="..\..\asn.1\*.c">
   2.828 +      <Filter>Source Files</Filter>
   2.829 +    </ClCompile>
   2.830 +    <ClCompile Include="..\..\asn.1\*.c">
   2.831 +      <Filter>Source Files</Filter>
   2.832 +    </ClCompile>
   2.833 +    <ClCompile Include="..\..\asn.1\*.c">
   2.834 +      <Filter>Source Files</Filter>
   2.835 +    </ClCompile>
   2.836 +    <ClCompile Include="..\..\asn.1\*.c">
   2.837 +      <Filter>Source Files</Filter>
   2.838 +    </ClCompile>
   2.839 +    <ClCompile Include="..\..\asn.1\*.c">
   2.840 +      <Filter>Source Files</Filter>
   2.841 +    </ClCompile>
   2.842 +    <ClCompile Include="..\..\asn.1\*.c">
   2.843 +      <Filter>Source Files</Filter>
   2.844 +    </ClCompile>
   2.845 +    <ClCompile Include="..\..\asn.1\*.c">
   2.846 +      <Filter>Source Files</Filter>
   2.847 +    </ClCompile>
   2.848 +    <ClCompile Include="..\..\asn.1\*.c">
   2.849 +      <Filter>Source Files</Filter>
   2.850 +    </ClCompile>
   2.851 +    <ClCompile Include="..\..\asn.1\*.c">
   2.852 +      <Filter>Source Files</Filter>
   2.853 +    </ClCompile>
   2.854 +    <ClCompile Include="..\..\asn.1\*.c">
   2.855 +      <Filter>Source Files</Filter>
   2.856 +    </ClCompile>
   2.857 +    <ClCompile Include="..\..\asn.1\*.c">
   2.858 +      <Filter>Source Files</Filter>
   2.859 +    </ClCompile>
   2.860 +    <ClCompile Include="..\..\asn.1\*.c">
   2.861 +      <Filter>Source Files</Filter>
   2.862 +    </ClCompile>
   2.863 +    <ClCompile Include="..\..\asn.1\*.c">
   2.864 +      <Filter>Source Files</Filter>
   2.865 +    </ClCompile>
   2.866 +    <ClCompile Include="..\..\asn.1\*.c">
   2.867 +      <Filter>Source Files</Filter>
   2.868 +    </ClCompile>
   2.869 +    <ClCompile Include="..\..\asn.1\*.c">
   2.870 +      <Filter>Source Files</Filter>
   2.871 +    </ClCompile>
   2.872 +    <ClCompile Include="..\..\asn.1\*.c">
   2.873 +      <Filter>Source Files</Filter>
   2.874 +    </ClCompile>
   2.875 +    <ClCompile Include="..\..\asn.1\*.c">
   2.876 +      <Filter>Source Files</Filter>
   2.877 +    </ClCompile>
   2.878 +    <ClCompile Include="..\..\asn.1\*.c">
   2.879 +      <Filter>Source Files</Filter>
   2.880 +    </ClCompile>
   2.881 +    <ClCompile Include="..\..\asn.1\*.c">
   2.882 +      <Filter>Source Files</Filter>
   2.883 +    </ClCompile>
   2.884 +    <ClCompile Include="..\..\asn.1\*.c">
   2.885 +      <Filter>Source Files</Filter>
   2.886 +    </ClCompile>
   2.887 +    <ClCompile Include="..\..\asn.1\*.c">
   2.888 +      <Filter>Source Files</Filter>
   2.889 +    </ClCompile>
   2.890 +    <ClCompile Include="..\..\asn.1\*.c">
   2.891 +      <Filter>Source Files</Filter>
   2.892 +    </ClCompile>
   2.893 +    <ClCompile Include="..\..\asn.1\*.c">
   2.894 +      <Filter>Source Files</Filter>
   2.895 +    </ClCompile>
   2.896 +    <ClCompile Include="..\..\asn.1\*.c">
   2.897 +      <Filter>Source Files</Filter>
   2.898 +    </ClCompile>
   2.899 +    <ClCompile Include="..\..\asn.1\*.c">
   2.900 +      <Filter>Source Files</Filter>
   2.901 +    </ClCompile>
   2.902 +    <ClCompile Include="..\..\asn.1\*.c">
   2.903 +      <Filter>Source Files</Filter>
   2.904 +    </ClCompile>
   2.905 +    <ClCompile Include="..\..\asn.1\*.c">
   2.906 +      <Filter>Source Files</Filter>
   2.907 +    </ClCompile>
   2.908 +    <ClCompile Include="..\..\asn.1\*.c">
   2.909 +      <Filter>Source Files</Filter>
   2.910 +    </ClCompile>
   2.911 +    <ClCompile Include="..\..\asn.1\*.c">
   2.912 +      <Filter>Source Files</Filter>
   2.913 +    </ClCompile>
   2.914 +    <ClCompile Include="..\..\asn.1\*.c">
   2.915 +      <Filter>Source Files</Filter>
   2.916 +    </ClCompile>
   2.917 +    <ClCompile Include="..\..\asn.1\*.c">
   2.918 +      <Filter>Source Files</Filter>
   2.919 +    </ClCompile>
   2.920 +    <ClCompile Include="..\..\asn.1\*.c">
   2.921 +      <Filter>Source Files</Filter>
   2.922 +    </ClCompile>
   2.923 +    <ClCompile Include="..\..\asn.1\*.c">
   2.924 +      <Filter>Source Files</Filter>
   2.925 +    </ClCompile>
   2.926 +    <ClCompile Include="..\..\asn.1\*.c">
   2.927 +      <Filter>Source Files</Filter>
   2.928 +    </ClCompile>
   2.929 +    <ClCompile Include="..\..\asn.1\*.c">
   2.930 +      <Filter>Source Files</Filter>
   2.931 +    </ClCompile>
   2.932 +    <ClCompile Include="..\..\asn.1\*.c">
   2.933 +      <Filter>Source Files</Filter>
   2.934 +    </ClCompile>
   2.935 +    <ClCompile Include="..\..\asn.1\*.c">
   2.936 +      <Filter>Source Files</Filter>
   2.937 +    </ClCompile>
   2.938 +    <ClCompile Include="..\..\asn.1\*.c">
   2.939 +      <Filter>Source Files</Filter>
   2.940 +    </ClCompile>
   2.941 +    <ClCompile Include="..\..\asn.1\*.c">
   2.942 +      <Filter>Source Files</Filter>
   2.943 +    </ClCompile>
   2.944 +    <ClCompile Include="..\..\asn.1\*.c">
   2.945 +      <Filter>Source Files</Filter>
   2.946 +    </ClCompile>
   2.947 +    <ClCompile Include="..\..\asn.1\*.c">
   2.948 +      <Filter>Source Files</Filter>
   2.949 +    </ClCompile>
   2.950 +    <ClCompile Include="..\..\asn.1\*.c">
   2.951 +      <Filter>Source Files</Filter>
   2.952 +    </ClCompile>
   2.953 +    <ClCompile Include="..\..\asn.1\*.c">
   2.954 +      <Filter>Source Files</Filter>
   2.955 +    </ClCompile>
   2.956 +    <ClCompile Include="..\..\asn.1\*.c">
   2.957 +      <Filter>Source Files</Filter>
   2.958 +    </ClCompile>
   2.959 +    <ClCompile Include="..\..\asn.1\*.c">
   2.960 +      <Filter>Source Files</Filter>
   2.961 +    </ClCompile>
   2.962 +    <ClCompile Include="..\..\asn.1\*.c">
   2.963 +      <Filter>Source Files</Filter>
   2.964 +    </ClCompile>
   2.965 +    <ClCompile Include="..\..\asn.1\*.c">
   2.966 +      <Filter>Source Files</Filter>
   2.967 +    </ClCompile>
   2.968 +    <ClCompile Include="..\..\asn.1\*.c">
   2.969 +      <Filter>Source Files</Filter>
   2.970 +    </ClCompile>
   2.971 +    <ClCompile Include="..\..\asn.1\*.c">
   2.972 +      <Filter>Source Files</Filter>
   2.973 +    </ClCompile>
   2.974 +    <ClCompile Include="..\..\asn.1\*.c">
   2.975 +      <Filter>Source Files</Filter>
   2.976 +    </ClCompile>
   2.977 +    <ClCompile Include="..\..\asn.1\*.c">
   2.978 +      <Filter>Source Files</Filter>
   2.979 +    </ClCompile>
   2.980 +    <ClCompile Include="..\..\asn.1\*.c">
   2.981 +      <Filter>Source Files</Filter>
   2.982 +    </ClCompile>
   2.983 +    <ClCompile Include="..\..\asn.1\*.c">
   2.984 +      <Filter>Source Files</Filter>
   2.985 +    </ClCompile>
   2.986 +    <ClCompile Include="..\..\asn.1\*.c">
   2.987 +      <Filter>Source Files</Filter>
   2.988 +    </ClCompile>
   2.989 +    <ClCompile Include="..\..\asn.1\*.c">
   2.990 +      <Filter>Source Files</Filter>
   2.991 +    </ClCompile>
   2.992 +    <ClCompile Include="..\..\asn.1\*.c">
   2.993 +      <Filter>Source Files</Filter>
   2.994 +    </ClCompile>
   2.995 +    <ClCompile Include="..\..\asn.1\*.c">
   2.996 +      <Filter>Source Files</Filter>
   2.997 +    </ClCompile>
   2.998 +    <ClCompile Include="..\..\asn.1\*.c">
   2.999 +      <Filter>Source Files</Filter>
  2.1000 +    </ClCompile>
  2.1001 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1002 +      <Filter>Source Files</Filter>
  2.1003 +    </ClCompile>
  2.1004 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1005 +      <Filter>Source Files</Filter>
  2.1006 +    </ClCompile>
  2.1007 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1008 +      <Filter>Source Files</Filter>
  2.1009 +    </ClCompile>
  2.1010 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1011 +      <Filter>Source Files</Filter>
  2.1012 +    </ClCompile>
  2.1013 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1014 +      <Filter>Source Files</Filter>
  2.1015 +    </ClCompile>
  2.1016 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1017 +      <Filter>Source Files</Filter>
  2.1018 +    </ClCompile>
  2.1019 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1020 +      <Filter>Source Files</Filter>
  2.1021 +    </ClCompile>
  2.1022 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1023 +      <Filter>Source Files</Filter>
  2.1024 +    </ClCompile>
  2.1025 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1026 +      <Filter>Source Files</Filter>
  2.1027 +    </ClCompile>
  2.1028 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1029 +      <Filter>Source Files</Filter>
  2.1030 +    </ClCompile>
  2.1031 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1032 +      <Filter>Source Files</Filter>
  2.1033 +    </ClCompile>
  2.1034 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1035 +      <Filter>Source Files</Filter>
  2.1036 +    </ClCompile>
  2.1037 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1038 +      <Filter>Source Files</Filter>
  2.1039 +    </ClCompile>
  2.1040 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1041 +      <Filter>Source Files</Filter>
  2.1042 +    </ClCompile>
  2.1043 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1044 +      <Filter>Source Files</Filter>
  2.1045 +    </ClCompile>
  2.1046 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1047 +      <Filter>Source Files</Filter>
  2.1048 +    </ClCompile>
  2.1049 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1050 +      <Filter>Source Files</Filter>
  2.1051 +    </ClCompile>
  2.1052 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1053 +      <Filter>Source Files</Filter>
  2.1054 +    </ClCompile>
  2.1055 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1056 +      <Filter>Source Files</Filter>
  2.1057 +    </ClCompile>
  2.1058 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1059 +      <Filter>Source Files</Filter>
  2.1060 +    </ClCompile>
  2.1061 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1062 +      <Filter>Source Files</Filter>
  2.1063 +    </ClCompile>
  2.1064 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1065 +      <Filter>Source Files</Filter>
  2.1066 +    </ClCompile>
  2.1067 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1068 +      <Filter>Source Files</Filter>
  2.1069 +    </ClCompile>
  2.1070 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1071 +      <Filter>Source Files</Filter>
  2.1072 +    </ClCompile>
  2.1073 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1074 +      <Filter>Source Files</Filter>
  2.1075 +    </ClCompile>
  2.1076 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1077 +      <Filter>Source Files</Filter>
  2.1078 +    </ClCompile>
  2.1079 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1080 +      <Filter>Source Files</Filter>
  2.1081 +    </ClCompile>
  2.1082 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1083 +      <Filter>Source Files</Filter>
  2.1084 +    </ClCompile>
  2.1085 +    <ClCompile Include="..\..\asn.1\*.c">
  2.1086        <Filter>Source Files</Filter>
  2.1087      </ClCompile>
  2.1088    </ItemGroup>
     3.1 --- a/build-windows/pEpEngine.vcxproj	Fri Aug 30 10:23:31 2019 +0200
     3.2 +++ b/build-windows/pEpEngine.vcxproj	Fri Aug 30 17:14:39 2019 +0200
     3.3 @@ -43,46 +43,56 @@
     3.4    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     3.5      <LinkIncremental>true</LinkIncremental>
     3.6      <RunCodeAnalysis>false</RunCodeAnalysis>
     3.7 -    <IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
     3.8 -    <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
     3.9 +    <IncludePath>$(IncludePath)</IncludePath>
    3.10 +    <LibraryPath>$(LibraryPath)</LibraryPath>
    3.11      <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
    3.12      <PreLinkEventUseInBuild>true</PreLinkEventUseInBuild>
    3.13      <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
    3.14      <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3.15 +    <Linkage-libiconv>
    3.16 +    </Linkage-libiconv>
    3.17    </PropertyGroup>
    3.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    3.19      <LinkIncremental>false</LinkIncremental>
    3.20 -    <IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
    3.21 -    <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
    3.22 +    <IncludePath>$(IncludePath)</IncludePath>
    3.23 +    <LibraryPath>$(LibraryPath)</LibraryPath>
    3.24      <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
    3.25      <PreLinkEventUseInBuild>true</PreLinkEventUseInBuild>
    3.26      <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
    3.27      <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3.28      <RunCodeAnalysis>false</RunCodeAnalysis>
    3.29 +    <Linkage-libiconv>
    3.30 +    </Linkage-libiconv>
    3.31    </PropertyGroup>
    3.32    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    3.33      <ClCompile>
    3.34        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    3.35        <WarningLevel>Level3</WarningLevel>
    3.36        <Optimization>Disabled</Optimization>
    3.37 -      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.38 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;_CRT_SECURE_NO_WARNINGS;USE_SEQUOIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.39        <SDLCheck>true</SDLCheck>
    3.40        <EnablePREfast>false</EnablePREfast>
    3.41 -      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.42 +      <AdditionalIncludeDirectories>$(SolutionDir)libetpan\build-windows\include;$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.43        <CompileAs>Default</CompileAs>
    3.44 +      <DisableSpecificWarnings>4703</DisableSpecificWarnings>
    3.45      </ClCompile>
    3.46      <Link>
    3.47        <SubSystem>Windows</SubSystem>
    3.48        <GenerateDebugInformation>true</GenerateDebugInformation>
    3.49 -      <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
    3.50 +      <AdditionalDependencies>sequoia_openpgp_ffi.lib;gmp.lib;nettle.lib;hogweed.lib;ws2_32.lib;userenv.lib;dbghelp.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
    3.51        <ShowProgress>NotSet</ShowProgress>
    3.52 +      <AdditionalLibraryDirectories>$(SolutionDir)sequoia\target\debug;C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
    3.53 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
    3.54 +      <SuppressStartupBanner>false</SuppressStartupBanner>
    3.55      </Link>
    3.56      <PreBuildEvent>
    3.57 -      <Command>
    3.58 -      </Command>
    3.59 +      <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" -p sequoia-openpgp-ffi</Command>
    3.60        <Message>
    3.61        </Message>
    3.62      </PreBuildEvent>
    3.63 +    <PostBuildEvent>
    3.64 +      <Command>xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.lib" "$(TargetDir)" /Y</Command>
    3.65 +    </PostBuildEvent>
    3.66    </ItemDefinitionGroup>
    3.67    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    3.68      <ClCompile>
    3.69 @@ -91,28 +101,32 @@
    3.70        <Optimization>MaxSpeed</Optimization>
    3.71        <FunctionLevelLinking>true</FunctionLevelLinking>
    3.72        <IntrinsicFunctions>true</IntrinsicFunctions>
    3.73 -      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.74 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PEPENGINE_EXPORTS;USE_SEQUOIA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.75        <SDLCheck>false</SDLCheck>
    3.76        <TreatWarningAsError>false</TreatWarningAsError>
    3.77 -      <AdditionalIncludeDirectories>$(SolutionDir)Tools\asn1c\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.78 +      <AdditionalIncludeDirectories>$(SolutionDir)libetpan\build-windows\include;$(SolutionDir)Tools\asn1c\share\asn1c;$(SolutionDir)sequoia\openpgp-ffi\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.79        <CompileAs>Default</CompileAs>
    3.80        <MultiProcessorCompilation>true</MultiProcessorCompilation>
    3.81        <ControlFlowGuard>Guard</ControlFlowGuard>
    3.82        <EnablePREfast>false</EnablePREfast>
    3.83 +      <DisableSpecificWarnings>4703</DisableSpecificWarnings>
    3.84      </ClCompile>
    3.85      <Link>
    3.86        <SubSystem>Windows</SubSystem>
    3.87        <GenerateDebugInformation>true</GenerateDebugInformation>
    3.88        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    3.89        <OptimizeReferences>true</OptimizeReferences>
    3.90 -      <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
    3.91 +      <AdditionalDependencies>sequoia_openpgp_ffi.lib;gmp.lib;nettle.lib;hogweed.lib;ws2_32.lib;userenv.lib;dbghelp.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
    3.92 +      <AdditionalLibraryDirectories>$(SolutionDir)sequoia\target\release;C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
    3.93      </Link>
    3.94      <PreBuildEvent>
    3.95 -      <Command>
    3.96 -      </Command>
    3.97 +      <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release -p sequoia-openpgp-ffi</Command>
    3.98        <Message>
    3.99        </Message>
   3.100      </PreBuildEvent>
   3.101 +    <PostBuildEvent>
   3.102 +      <Command>xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.lib" "$(TargetDir)" /Y</Command>
   3.103 +    </PostBuildEvent>
   3.104    </ItemDefinitionGroup>
   3.105    <ItemGroup>
   3.106      <ClCompile Include="..\src\base64.c" />
   3.107 @@ -135,7 +149,7 @@
   3.108      <ClCompile Include="..\src\openpgp_compat.c" />
   3.109      <ClCompile Include="..\src\pEpEngine.c" />
   3.110      <ClCompile Include="..\src\pEp_string.c" />
   3.111 -    <ClCompile Include="..\src\pgp_gpg.c" />
   3.112 +    <ClCompile Include="..\src\pgp_sequoia.c" />
   3.113      <ClCompile Include="..\src\platform_windows.cpp" />
   3.114      <ClCompile Include="..\src\resource_id.c" />
   3.115      <ClCompile Include="..\src\sqlite3.c" />
   3.116 @@ -161,6 +175,7 @@
   3.117      <ClInclude Include="..\src\dynamic_api.h" />
   3.118      <ClInclude Include="..\src\email.h" />
   3.119      <ClInclude Include="..\src\etpan_mime.h" />
   3.120 +    <ClInclude Include="..\src\fsm_common.h" />
   3.121      <ClInclude Include="..\src\growing_buf.h" />
   3.122      <ClInclude Include="..\src\identity_list.h" />
   3.123      <ClInclude Include="..\src\keymanagement.h" />
   3.124 @@ -175,8 +190,8 @@
   3.125      <ClInclude Include="..\src\pEpEngine.h" />
   3.126      <ClInclude Include="..\src\pEp_internal.h" />
   3.127      <ClInclude Include="..\src\pEp_string.h" />
   3.128 -    <ClInclude Include="..\src\pgp_gpg.h" />
   3.129 -    <ClInclude Include="..\src\pgp_gpg_internal.h" />
   3.130 +    <ClInclude Include="..\src\pgp_sequoia.h" />
   3.131 +    <ClInclude Include="..\src\pgp_sequoia_internal.h" />
   3.132      <ClInclude Include="..\src\platform.h" />
   3.133      <ClInclude Include="..\src\platform_windows.h" />
   3.134      <ClInclude Include="..\src\resource.h" />
   3.135 @@ -205,7 +220,17 @@
   3.136        <Project>{9a67164d-b8f8-4601-a24b-28afe774d41c}</Project>
   3.137      </ProjectReference>
   3.138    </ItemGroup>
   3.139 +  <ItemGroup>
   3.140 +    <None Include="packages.config" />
   3.141 +  </ItemGroup>
   3.142    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   3.143    <ImportGroup Label="ExtensionTargets">
   3.144 +    <Import Project="..\..\packages\boost.1.70.0.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.70.0.0\build\boost.targets')" />
   3.145    </ImportGroup>
   3.146 +  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
   3.147 +    <PropertyGroup>
   3.148 +      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
   3.149 +    </PropertyGroup>
   3.150 +    <Error Condition="!Exists('..\..\packages\boost.1.70.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.70.0.0\build\boost.targets'))" />
   3.151 +  </Target>
   3.152  </Project>
   3.153 \ No newline at end of file
     4.1 --- a/build-windows/pEpEngine.vcxproj.filters	Fri Aug 30 10:23:31 2019 +0200
     4.2 +++ b/build-windows/pEpEngine.vcxproj.filters	Fri Aug 30 17:14:39 2019 +0200
     4.3 @@ -33,9 +33,6 @@
     4.4      <ClCompile Include="..\src\cryptotech.c">
     4.5        <Filter>Quelldateien</Filter>
     4.6      </ClCompile>
     4.7 -    <ClCompile Include="..\src\pgp_gpg.c">
     4.8 -      <Filter>Quelldateien</Filter>
     4.9 -    </ClCompile>
    4.10      <ClCompile Include="..\src\email.c">
    4.11        <Filter>Quelldateien</Filter>
    4.12      </ClCompile>
    4.13 @@ -54,9 +51,6 @@
    4.14      <ClCompile Include="..\src\bloblist.c">
    4.15        <Filter>Quelldateien</Filter>
    4.16      </ClCompile>
    4.17 -    <ClCompile Include="..\src\etpan_mime.c">
    4.18 -      <Filter>Quelldateien</Filter>
    4.19 -    </ClCompile>
    4.20      <ClCompile Include="..\src\identity_list.c">
    4.21        <Filter>Quelldateien</Filter>
    4.22      </ClCompile>
    4.23 @@ -120,6 +114,12 @@
    4.24      <ClCompile Include="..\src\base64.c">
    4.25        <Filter>Quelldateien</Filter>
    4.26      </ClCompile>
    4.27 +    <ClCompile Include="..\src\pgp_sequoia.c">
    4.28 +      <Filter>Quelldateien</Filter>
    4.29 +    </ClCompile>
    4.30 +    <ClCompile Include="..\src\etpan_mime.c">
    4.31 +      <Filter>Quelldateien</Filter>
    4.32 +    </ClCompile>
    4.33    </ItemGroup>
    4.34    <ItemGroup>
    4.35      <ClInclude Include="..\src\keymanagement.h">
    4.36 @@ -140,15 +140,9 @@
    4.37      <ClInclude Include="..\src\cryptotech.h">
    4.38        <Filter>Headerdateien</Filter>
    4.39      </ClInclude>
    4.40 -    <ClInclude Include="..\src\pgp_gpg.h">
    4.41 -      <Filter>Headerdateien</Filter>
    4.42 -    </ClInclude>
    4.43      <ClInclude Include="..\src\pEp_internal.h">
    4.44        <Filter>Headerdateien</Filter>
    4.45      </ClInclude>
    4.46 -    <ClInclude Include="..\src\pgp_gpg_internal.h">
    4.47 -      <Filter>Headerdateien</Filter>
    4.48 -    </ClInclude>
    4.49      <ClInclude Include="..\src\resource.h">
    4.50        <Filter>Ressourcendateien</Filter>
    4.51      </ClInclude>
    4.52 @@ -176,9 +170,6 @@
    4.53      <ClInclude Include="..\src\dynamic_api.h">
    4.54        <Filter>Headerdateien</Filter>
    4.55      </ClInclude>
    4.56 -    <ClInclude Include="..\src\etpan_mime.h">
    4.57 -      <Filter>Headerdateien</Filter>
    4.58 -    </ClInclude>
    4.59      <ClInclude Include="..\src\identity_list.h">
    4.60        <Filter>Headerdateien</Filter>
    4.61      </ClInclude>
    4.62 @@ -236,12 +227,6 @@
    4.63      <ClInclude Include="..\src\Sync_event.h">
    4.64        <Filter>Headerdateien</Filter>
    4.65      </ClInclude>
    4.66 -    <ClInclude Include="..\src\Sync_func.h">
    4.67 -      <Filter>Headerdateien</Filter>
    4.68 -    </ClInclude>
    4.69 -    <ClInclude Include="..\src\Sync_impl.h">
    4.70 -      <Filter>Headerdateien</Filter>
    4.71 -    </ClInclude>
    4.72      <ClInclude Include="..\src\growing_buf.h">
    4.73        <Filter>Headerdateien</Filter>
    4.74      </ClInclude>
    4.75 @@ -257,8 +242,29 @@
    4.76      <ClInclude Include="..\src\KeySync_fsm.h">
    4.77        <Filter>Quelldateien</Filter>
    4.78      </ClInclude>
    4.79 +    <ClInclude Include="..\src\fsm_common.h">
    4.80 +      <Filter>Headerdateien</Filter>
    4.81 +    </ClInclude>
    4.82 +    <ClInclude Include="..\src\pgp_sequoia.h">
    4.83 +      <Filter>Headerdateien</Filter>
    4.84 +    </ClInclude>
    4.85 +    <ClInclude Include="..\src\pgp_sequoia_internal.h">
    4.86 +      <Filter>Headerdateien</Filter>
    4.87 +    </ClInclude>
    4.88 +    <ClInclude Include="..\src\Sync_func.h">
    4.89 +      <Filter>Headerdateien</Filter>
    4.90 +    </ClInclude>
    4.91 +    <ClInclude Include="..\src\Sync_impl.h">
    4.92 +      <Filter>Headerdateien</Filter>
    4.93 +    </ClInclude>
    4.94 +    <ClInclude Include="..\src\etpan_mime.h">
    4.95 +      <Filter>Headerdateien</Filter>
    4.96 +    </ClInclude>
    4.97    </ItemGroup>
    4.98    <ItemGroup>
    4.99      <Text Include="..\LICENSE.txt" />
   4.100    </ItemGroup>
   4.101 +  <ItemGroup>
   4.102 +    <None Include="packages.config" />
   4.103 +  </ItemGroup>
   4.104  </Project>
   4.105 \ No newline at end of file
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/build-windows/packages.config	Fri Aug 30 17:14:39 2019 +0200
     5.3 @@ -0,0 +1,4 @@
     5.4 +<?xml version="1.0" encoding="utf-8"?>
     5.5 +<packages>
     5.6 +  <package id="boost" version="1.70.0.0" targetFramework="native" />
     5.7 +</packages>
     5.8 \ No newline at end of file
     6.1 --- a/src/etpan_mime.h	Fri Aug 30 10:23:31 2019 +0200
     6.2 +++ b/src/etpan_mime.h	Fri Aug 30 17:14:39 2019 +0200
     6.3 @@ -3,6 +3,8 @@
     6.4  
     6.5  #pragma once
     6.6  
     6.7 +#define _EXPORT_PEP_ENGINE_DLL
     6.8 +
     6.9  #include <libetpan/libetpan.h>
    6.10  #include <libetpan/mailmime.h>
    6.11  #include <libetpan/mailmime_encode.h>
     7.1 --- a/src/pEpEngine.c	Fri Aug 30 10:23:31 2019 +0200
     7.2 +++ b/src/pEpEngine.c	Fri Aug 30 17:14:39 2019 +0200
     7.3 @@ -2155,6 +2155,10 @@
     7.4      )
     7.5  {
     7.6  
     7.7 +#if defined(_WIN32) && !defined(NDEBUG)
     7.8 +	log_output_debug(title, entity, description, comment);
     7.9 +#endif
    7.10 +
    7.11  // N.B. If testing (so NDEBUG not defined) but this message is spam,
    7.12  //      put -D_PEP_SERVICE_LOG_OFF into CFLAGS/CXXFLAGS     
    7.13  #if !defined(NDEBUG) && !defined(_PEP_SERVICE_LOG_OFF)
     8.1 --- a/src/pEp_internal.h	Fri Aug 30 10:23:31 2019 +0200
     8.2 +++ b/src/pEp_internal.h	Fri Aug 30 17:14:39 2019 +0200
     8.3 @@ -62,6 +62,7 @@
     8.4  #include "platform.h"
     8.5  
     8.6  #ifdef WIN32
     8.7 +#define KEYS_DB windoze_keys_db()
     8.8  #define LOCAL_DB windoze_local_db()
     8.9  #define SYSTEM_DB windoze_system_db()
    8.10  #define LIBGPGME "libgpgme-11.dll"
     9.1 --- a/src/pgp_sequoia.c	Fri Aug 30 10:23:31 2019 +0200
     9.2 +++ b/src/pgp_sequoia.c	Fri Aug 30 17:14:39 2019 +0200
     9.3 @@ -7,7 +7,7 @@
     9.4  
     9.5  #include "platform.h"
     9.6  #include "pEp_internal.h"
     9.7 -#include "pgp_gpg.h"
     9.8 +#include "pgp_sequoia.h"
     9.9  
    9.10  #include <limits.h>
    9.11  #include <sys/stat.h>
    9.12 @@ -34,6 +34,13 @@
    9.13          __android_log_print(ANDROID_LOG_DEBUG, "pEpEngine-sequoia",     \
    9.14                              ##__VA_ARGS__);                             \
    9.15      } while (0)
    9.16 +#  elif _WIN32
    9.17 +#    define _T(...) do {                        \
    9.18 +		char str[256];                          \
    9.19 +		snprintf(str, 256, ##__VA_ARGS__);      \
    9.20 +		OutputDebugStringA(str);                \
    9.21 +    } while (0)
    9.22 +
    9.23  #  else
    9.24  #    define _T(...) do {                        \
    9.25          fprintf(stderr, ##__VA_ARGS__);         \
    9.26 @@ -182,15 +189,27 @@
    9.27  {
    9.28      PEP_STATUS status = PEP_STATUS_OK;
    9.29  
    9.30 -#define PEP_KEYS_PATH "/.pEp_keys.db"
    9.31 -
    9.32 +#ifdef _WIN32
    9.33 +	int sqlite_result;
    9.34 +	sqlite_result = sqlite3_open_v2(KEYS_DB,
    9.35 +		&session->key_db,
    9.36 +		SQLITE_OPEN_READWRITE
    9.37 +		| SQLITE_OPEN_CREATE
    9.38 +		| SQLITE_OPEN_FULLMUTEX
    9.39 +		| SQLITE_OPEN_PRIVATECACHE,
    9.40 +		NULL);
    9.41 +#else
    9.42      // Create the home directory.
    9.43      char *home_env = NULL;
    9.44  #ifndef NDEBUG
    9.45      home_env = getenv("PEP_HOME");
    9.46  #endif
    9.47 +
    9.48 +#define PEP_KEYS_PATH "/.pEp/keys.db"
    9.49 +
    9.50      if (!home_env)
    9.51          home_env = getenv("HOME");
    9.52 +
    9.53      if (!home_env)
    9.54          ERROR_OUT(NULL, PEP_INIT_GPGME_INIT_FAILED, "HOME unset");
    9.55  
    9.56 @@ -201,7 +220,7 @@
    9.57      if (!path)
    9.58          ERROR_OUT(NULL, PEP_OUT_OF_MEMORY, "out of memory");
    9.59  
    9.60 -    int r = snprintf(path, path_size, "%s" PEP_KEYS_PATH, home_env);
    9.61 +	int r = snprintf(path, path_size, "%s" PEP_KEYS_PATH, home_env);
    9.62      assert(r >= 0 && r < path_size);
    9.63      if (r < 0)
    9.64          ERROR_OUT(NULL, PEP_UNKNOWN_ERROR, "snprintf");
    9.65 @@ -215,6 +234,8 @@
    9.66                                      | SQLITE_OPEN_PRIVATECACHE,
    9.67                                      NULL);
    9.68      free(path);
    9.69 +#endif
    9.70 +
    9.71      if (sqlite_result != SQLITE_OK)
    9.72          ERROR_OUT(NULL, PEP_INIT_CANNOT_OPEN_DB,
    9.73                    "opening keys DB: %s", sqlite3_errmsg(session->key_db));
    10.1 --- a/src/platform_windows.cpp	Fri Aug 30 10:23:31 2019 +0200
    10.2 +++ b/src/platform_windows.cpp	Fri Aug 30 17:14:39 2019 +0200
    10.3 @@ -24,11 +24,15 @@
    10.4  
    10.5  #define LOCAL_DB_FILENAME "management.db"
    10.6  #define SYSTEM_DB_FILENAME "system.db"
    10.7 +#define KEYS_DB "keys.db"
    10.8 +#define USER_FOLDER_PATH pEpUserFolderPath().c_str()
    10.9 +#define SYSTEM_FOLDER_PATH pEpSystemFolderPath().c_str()
   10.10  
   10.11  #ifndef WC_ERR_INVALID_CHARS
   10.12  #define WC_ERR_INVALID_CHARS      0x00000080  // error for invalid chars
   10.13  #endif
   10.14  
   10.15 +
   10.16  using namespace std;
   10.17  
   10.18  static string utf8_string(wstring wstr) {
   10.19 @@ -136,6 +140,38 @@
   10.20  	return path;
   10.21  }
   10.22  
   10.23 +static inline string pEpSystemFolderPath(void)
   10.24 +{
   10.25 +	static TCHAR tPath[PATH_BUF_SIZE];
   10.26 +	string path = PER_MACHINE_DIRECTORY;
   10.27 +
   10.28 +	// Get SystemFolder Registry value and use if available
   10.29 +	bool result = readRegistryString(HKEY_CURRENT_USER,
   10.30 +		TEXT("SOFTWARE\\pEp"), TEXT("SystemFolder"), tPath,
   10.31 +		PATH_BUF_SIZE, NULL);
   10.32 +
   10.33 +	if (result)
   10.34 +		path = utf8_string(tPath);
   10.35 +
   10.36 +	return path;
   10.37 +}
   10.38 +
   10.39 +static inline string pEpUserFolderPath(void)
   10.40 +{
   10.41 +	static TCHAR tPath[PATH_BUF_SIZE];
   10.42 +	string path = PER_USER_DIRECTORY;
   10.43 +
   10.44 +	// Get UserFolder Registry value and use if available
   10.45 +	bool result = readRegistryString(HKEY_CURRENT_USER,
   10.46 +		TEXT("SOFTWARE\\pEp"), TEXT("UserFolder"), tPath,
   10.47 +		PATH_BUF_SIZE, NULL);
   10.48 +
   10.49 +	if (result)
   10.50 +		path = utf8_string(tPath);
   10.51 +	
   10.52 +	return path;
   10.53 +}
   10.54 +
   10.55  extern "C" {
   10.56  
   10.57  DYNAMIC_API const char *per_user_directory(void)
   10.58 @@ -231,6 +267,14 @@
   10.59  	return (void *) (intptr_t) GetProcAddress((HMODULE) handle, symbol);
   10.60  }
   10.61  
   10.62 +const char *windoze_keys_db(void) {
   10.63 +	static string path;
   10.64 +	if (path.length() == 0) {
   10.65 +		path = managementPath(USER_FOLDER_PATH, KEYS_DB);
   10.66 +	}
   10.67 +	return path.c_str();
   10.68 +}
   10.69 +
   10.70  const char *windoze_local_db(void) {
   10.71  	static string path;
   10.72  	if (path.length() == 0)
   10.73 @@ -397,6 +441,18 @@
   10.74      }
   10.75  }
   10.76  
   10.77 +void log_output_debug(const char *title,
   10.78 +                       const char *entity,
   10.79 +                       const char *description,
   10.80 +                       const char *comment)
   10.81 +{
   10.82 +	const size_t size = 256;
   10.83 +	char str[size];
   10.84 +	
   10.85 +	snprintf(str, size, "*** %s %s %s %s\n", title, entity, description, comment);
   10.86 +	OutputDebugStringA(str);
   10.87 +}
   10.88 +
   10.89  time_t timegm(struct tm* tm) {
   10.90      return _mkgmtime(tm);
   10.91  }
    11.1 --- a/src/platform_windows.h	Fri Aug 30 10:23:31 2019 +0200
    11.2 +++ b/src/platform_windows.h	Fri Aug 30 17:14:39 2019 +0200
    11.3 @@ -87,11 +87,14 @@
    11.4  char *strnstr(const char *big, const char *little, size_t len);
    11.5  
    11.6  
    11.7 +const char *windoze_keys_db(void);
    11.8  const char *windoze_local_db(void);
    11.9  const char *windoze_system_db(void);
   11.10  const char *gpg_conf(void);
   11.11  const char *gpg_agent_conf(void);
   11.12  
   11.13 +void log_output_debug(const char *title, const char *entity, const char *description, const char *comment);
   11.14 +
   11.15  long random(void);
   11.16  
   11.17  // on Windoze, uuid_t needs pointer semantics