IOSAD-103 merge in sync IOSAD-103
authorDirk Zimmermann <dz@pep.security>
Wed, 12 Dec 2018 09:04:03 +0100
branchIOSAD-103
changeset 3185a5c137f87a9c
parent 3177 990b7d72351c
parent 3184 557a689068aa
child 3215 724e09e831f1
IOSAD-103 merge in sync
     1.1 --- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Tue Dec 11 07:03:34 2018 +0100
     1.2 +++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj	Wed Dec 12 09:04:03 2018 +0100
     1.3 @@ -1,5 +1,5 @@
     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 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.7    <ItemGroup Label="ProjectConfigurations">
     1.8      <ProjectConfiguration Include="Debug|Win32">
     1.9        <Configuration>Debug</Configuration>
    1.10 @@ -14,19 +14,19 @@
    1.11      <ProjectGuid>{F8B454D8-E2DA-455C-AA56-3F076CAA1A6E}</ProjectGuid>
    1.12      <Keyword>Win32Proj</Keyword>
    1.13      <RootNamespace>pEpEngineASN1</RootNamespace>
    1.14 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    1.15 +    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
    1.16    </PropertyGroup>
    1.17    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    1.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    1.19      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.20      <UseDebugLibraries>true</UseDebugLibraries>
    1.21 -    <PlatformToolset>v140</PlatformToolset>
    1.22 +    <PlatformToolset>v141</PlatformToolset>
    1.23      <CharacterSet>Unicode</CharacterSet>
    1.24    </PropertyGroup>
    1.25    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1.26      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.27      <UseDebugLibraries>false</UseDebugLibraries>
    1.28 -    <PlatformToolset>v140</PlatformToolset>
    1.29 +    <PlatformToolset>v141</PlatformToolset>
    1.30      <WholeProgramOptimization>true</WholeProgramOptimization>
    1.31      <CharacterSet>Unicode</CharacterSet>
    1.32    </PropertyGroup>
     2.1 --- a/build-windows/pEpEngine.vcxproj	Tue Dec 11 07:03:34 2018 +0100
     2.2 +++ b/build-windows/pEpEngine.vcxproj	Wed Dec 12 09:04:03 2018 +0100
     2.3 @@ -1,5 +1,5 @@
     2.4  <?xml version="1.0" encoding="utf-8"?>
     2.5 -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.6 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2.7    <ItemGroup Label="ProjectConfigurations">
     2.8      <ProjectConfiguration Include="Debug|Win32">
     2.9        <Configuration>Debug</Configuration>
    2.10 @@ -14,19 +14,19 @@
    2.11      <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
    2.12      <Keyword>Win32Proj</Keyword>
    2.13      <RootNamespace>pEpEngine</RootNamespace>
    2.14 -    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    2.15 +    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
    2.16    </PropertyGroup>
    2.17    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    2.18    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    2.19      <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.20      <UseDebugLibraries>true</UseDebugLibraries>
    2.21 -    <PlatformToolset>v140</PlatformToolset>
    2.22 +    <PlatformToolset>v141</PlatformToolset>
    2.23      <CharacterSet>Unicode</CharacterSet>
    2.24    </PropertyGroup>
    2.25    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2.26      <ConfigurationType>DynamicLibrary</ConfigurationType>
    2.27      <UseDebugLibraries>false</UseDebugLibraries>
    2.28 -    <PlatformToolset>v140</PlatformToolset>
    2.29 +    <PlatformToolset>v141</PlatformToolset>
    2.30      <WholeProgramOptimization>true</WholeProgramOptimization>
    2.31      <CharacterSet>Unicode</CharacterSet>
    2.32    </PropertyGroup>
     3.1 --- a/src/keymanagement.c	Tue Dec 11 07:03:34 2018 +0100
     3.2 +++ b/src/keymanagement.c	Wed Dec 12 09:04:03 2018 +0100
     3.3 @@ -1408,10 +1408,10 @@
     3.4          if (status != PEP_STATUS_OK && status != PEP_KEY_NOT_FOUND)
     3.5              goto pEp_free;
     3.6              
     3.7 -        if (has_private) {
     3.8 -            status = set_own_key(session, ident_copy, ident->fpr); 
     3.9 -            goto pEp_free;
    3.10 -        }
    3.11 +        // if (has_private) {
    3.12 +        //     status = set_own_key(session, ident_copy, ident->fpr); 
    3.13 +        //     goto pEp_free;
    3.14 +        // }
    3.15      }
    3.16      
    3.17      // Either it's not me, or it's me but the key has no private key. 
     4.1 --- a/src/message_api.c	Tue Dec 11 07:03:34 2018 +0100
     4.2 +++ b/src/message_api.c	Wed Dec 12 09:04:03 2018 +0100
     4.3 @@ -2311,7 +2311,8 @@
     4.4      *signature_blob = NULL;
     4.5  
     4.6      while (attach_curr) {
     4.7 -        if (strcasecmp(attach_curr->mime_type, "application/pgp-signature") == 0) {
     4.8 +        if (attach_curr->mime_type &&
     4.9 +            (strcasecmp(attach_curr->mime_type, "application/pgp-signature") == 0)) {
    4.10              *signature_blob = attach_curr;
    4.11              break;
    4.12          }
     5.1 --- a/src/message_api.h	Tue Dec 11 07:03:34 2018 +0100
     5.2 +++ b/src/message_api.h	Wed Dec 12 09:04:03 2018 +0100
     5.3 @@ -58,7 +58,9 @@
     5.4  //
     5.5  //  parameters:
     5.6  //      session (in)        session handle
     5.7 -//      src (in)            message to encrypt
     5.8 +//      src (inout)         message to encrypt - usually in-only, but can be 
     5.9 +//                          in-out for unencrypted messages; in that case, 
    5.10 +//                          we may attach the key and decorate the message
    5.11  //      extra (in)          extra keys for encryption
    5.12  //      dst (out)           pointer to new encrypted message or NULL if no
    5.13  //                          encryption could take place
     6.1 --- a/src/pEpEngine.c	Tue Dec 11 07:03:34 2018 +0100
     6.2 +++ b/src/pEpEngine.c	Wed Dec 12 09:04:03 2018 +0100
     6.3 @@ -2929,6 +2929,8 @@
     6.4      }
     6.5  
     6.6      sqlite3_reset(session->is_pEp_user);
     6.7 +    
     6.8 +    free(alias_default);
     6.9      return PEP_STATUS_OK;
    6.10  }
    6.11