merge default into my branch roker-linux
authorRoker <roker@pep-project.org>
Fri, 02 Sep 2016 14:35:00 +0200
branchroker-linux
changeset 11441e8cff893f55
parent 1143 7189eb035523
parent 1142 b0b208f85c88
child 1168 4d4e3ecbaf8b
merge default into my branch
test/pEpEngineTest.cc
     1.1 --- a/pEpEngine.vcxproj	Wed Aug 31 11:47:56 2016 +0200
     1.2 +++ b/pEpEngine.vcxproj	Fri Sep 02 14:35:00 2016 +0200
     1.3 @@ -14,7 +14,7 @@
     1.4      <ProjectGuid>{146E69F8-E1DA-456A-B048-6DD29D9ACF6B}</ProjectGuid>
     1.5      <Keyword>Win32Proj</Keyword>
     1.6      <RootNamespace>pEpEngine</RootNamespace>
     1.7 -	<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
     1.8 +    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
     1.9    </PropertyGroup>
    1.10    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    1.11    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    1.12 @@ -60,7 +60,7 @@
    1.13        <SDLCheck>true</SDLCheck>
    1.14        <EnablePREfast>false</EnablePREfast>
    1.15        <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.16 -	  <CompileAs>Default</CompileAs>
    1.17 +      <CompileAs>Default</CompileAs>
    1.18      </ClCompile>
    1.19      <Link>
    1.20        <SubSystem>Windows</SubSystem>
    1.21 @@ -83,7 +83,7 @@
    1.22        <SDLCheck>false</SDLCheck>
    1.23        <TreatWarningAsError>false</TreatWarningAsError>
    1.24        <AdditionalIncludeDirectories>C:\Users\vb\share\asn1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.25 -	  <CompileAs>Default</CompileAs>
    1.26 +      <CompileAs>Default</CompileAs>
    1.27      </ClCompile>
    1.28      <Link>
    1.29        <SubSystem>Windows</SubSystem>
    1.30 @@ -110,6 +110,7 @@
    1.31      <ClCompile Include="src\message.c" />
    1.32      <ClCompile Include="src\message_api.c" />
    1.33      <ClCompile Include="src\mime.c" />
    1.34 +    <ClCompile Include="src\openpgp_compat.c" />
    1.35      <ClCompile Include="src\pEpEngine.c" />
    1.36      <ClCompile Include="src\pgp_gpg.c" />
    1.37      <ClCompile Include="src\platform_windows.cpp" />
    1.38 @@ -139,6 +140,7 @@
    1.39      <ClInclude Include="src\message.h" />
    1.40      <ClInclude Include="src\message_api.h" />
    1.41      <ClInclude Include="src\mime.h" />
    1.42 +    <ClInclude Include="src\openpgp_compat.h" />
    1.43      <ClInclude Include="src\pEpEngine.h" />
    1.44      <ClInclude Include="src\pEp_internal.h" />
    1.45      <ClInclude Include="src\pgp_gpg.h" />
     2.1 --- a/pEpEngine.vcxproj.filters	Wed Aug 31 11:47:56 2016 +0200
     2.2 +++ b/pEpEngine.vcxproj.filters	Fri Sep 02 14:35:00 2016 +0200
     2.3 @@ -93,6 +93,9 @@
     2.4      <ClCompile Include="src\sync_send_actions.c">
     2.5        <Filter>Quelldateien</Filter>
     2.6      </ClCompile>
     2.7 +    <ClCompile Include="src\openpgp_compat.c">
     2.8 +      <Filter>Quelldateien</Filter>
     2.9 +    </ClCompile>
    2.10    </ItemGroup>
    2.11    <ItemGroup>
    2.12      <ClInclude Include="src\keymanagement.h">
    2.13 @@ -182,6 +185,9 @@
    2.14      <ClInclude Include="src\baseprotocol.h">
    2.15        <Filter>Headerdateien</Filter>
    2.16      </ClInclude>
    2.17 +    <ClInclude Include="src\openpgp_compat.h">
    2.18 +      <Filter>Headerdateien</Filter>
    2.19 +    </ClInclude>
    2.20    </ItemGroup>
    2.21    <ItemGroup>
    2.22      <Text Include="LICENSE.txt" />
     3.1 --- a/test/pEpEngineTest.cc	Wed Aug 31 11:47:56 2016 +0200
     3.2 +++ b/test/pEpEngineTest.cc	Fri Sep 02 14:35:00 2016 +0200
     3.3 @@ -110,21 +110,24 @@
     3.4      release(second_session);
     3.5  
     3.6      cout << "logging test\n";
     3.7 -    log_event(session, "log test", "pEp Enginge Test", "This is a logging test sample.", "please ignore this line");
     3.8 +    log_event(session, "log test", "pEp Engine Test", "This is a logging test sample.", "please ignore this line");
     3.9  
    3.10      // Our test user :
    3.11      // pEp Test Alice (test key don't use) <pep.test.alice@pep-project.org>
    3.12 -    //         6FF00E97
    3.13 -    // A9411D176FF00E97
    3.14 +    //                                 6FF00E97 -- won't work as search term with NetPGP
    3.15 +    //                         A9411D176FF00E97 -- won't work as search term with NetPGP
    3.16 +    // 4ABE3AAF59AC32CFE4F86500A9411D176FF00E97 -- full key fingerprint
    3.17      // 
    3.18      // Other peers :
    3.19      // pEp Test Bob (test key, don't use) <pep.test.bob@pep-project.org> 
    3.20 -    //         C9C2EE39
    3.21 -    // 59BFF488C9C2EE39
    3.22 +    //                                 C9C2EE39 -- won't work as search term with NetPGP
    3.23 +    //                         59BFF488C9C2EE39 -- won't work as search term with NetPGP
    3.24 +    // BFCDB7F301DEEEBBF947F29659BFF488C9C2EE39 -- full key fingerprint
    3.25      // 
    3.26      // pEp Test John (test key, don't use) <pep.test.john@pep-project.org>
    3.27 -    //         70DCF575
    3.28 -    // 135CD6D170DCF575
    3.29 +    //                                 70DCF575 -- won't work as search term with NetPGP
    3.30 +    //                         135CD6D170DCF575 -- won't work as search term with NetPGP
    3.31 +    // AA2E4BEB93E5FE33DEFD8BE1135CD6D170DCF575 -- full key fingerprint
    3.32  
    3.33      const char *kflist[] = {
    3.34          "0x6FF00E97.asc",
    3.35 @@ -187,9 +190,9 @@
    3.36      assert(verify_result == PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH);
    3.37      free_stringlist(keylist);
    3.38  
    3.39 -    keylist = new_stringlist("A9411D176FF00E97");
    3.40 -    stringlist_add(keylist, "59BFF488C9C2EE39");
    3.41 -    stringlist_add(keylist, "135CD6D170DCF575");
    3.42 +    keylist = new_stringlist("4ABE3AAF59AC32CFE4F86500A9411D176FF00E97");
    3.43 +    stringlist_add(keylist, "BFCDB7F301DEEEBBF947F29659BFF488C9C2EE39");
    3.44 +    stringlist_add(keylist, "AA2E4BEB93E5FE33DEFD8BE1135CD6D170DCF575");
    3.45  
    3.46      buf_text = NULL;
    3.47      buf_size = 0;
    3.48 @@ -313,7 +316,7 @@
    3.49      assert(send_key_status == PEP_STATUS_OK);
    3.50  
    3.51      PEP_comm_type tcomm_type;
    3.52 -    PEP_STATUS tstatus = get_key_rating(session, "59BFF488C9C2EE39", &tcomm_type);
    3.53 +    PEP_STATUS tstatus = get_key_rating(session, "BFCDB7F301DEEEBBF947F29659BFF488C9C2EE39", &tcomm_type);
    3.54      cout << "get_key_rating() exits with " << tstatus << "\n";
    3.55      assert(tstatus == PEP_STATUS_OK);
    3.56      assert(tcomm_type == PEP_ct_OpenPGP_unconfirmed);