Merge with ENGINE-602 sequoia_windows
authorThomas
Wed, 07 Aug 2019 08:16:15 +0200
branchsequoia_windows
changeset 3946407b8c05e11a
parent 3937 8889abf6d2da
parent 3945 7de09fb6c9c9
child 3966 67a11b194bbb
Merge with ENGINE-602
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Mon Jul 29 07:05:03 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Aug 07 08:16:15 2019 +0200
     1.3 @@ -1128,6 +1128,7 @@
     1.4  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
     1.5  				COPY_PHASE_STRIP = NO;
     1.6  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
     1.7 +				ENABLE_BITCODE = NO;
     1.8  				ENABLE_STRICT_OBJC_MSGSEND = YES;
     1.9  				ENABLE_TESTABILITY = YES;
    1.10  				GCC_C_LANGUAGE_STANDARD = gnu99;
    1.11 @@ -1189,6 +1190,7 @@
    1.12  				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
    1.13  				COPY_PHASE_STRIP = NO;
    1.14  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
    1.15 +				ENABLE_BITCODE = NO;
    1.16  				ENABLE_NS_ASSERTIONS = NO;
    1.17  				ENABLE_STRICT_OBJC_MSGSEND = YES;
    1.18  				GCC_C_LANGUAGE_STANDARD = gnu99;
     2.1 --- a/src/message_api.c	Mon Jul 29 07:05:03 2019 +0200
     2.2 +++ b/src/message_api.c	Wed Aug 07 08:16:15 2019 +0200
     2.3 @@ -1118,8 +1118,9 @@
     2.4          return false;
     2.5      if (msg->attachments->next->next)
     2.6          return false;
     2.7 -    if (!msg->attachments->mime_type ||
     2.8 -        strcmp(msg->attachments->mime_type, "application/pgp-encrypted") != 0)    
     2.9 +    if (!msg->attachments->mime_type)
    2.10 +        return false;        
    2.11 +    if (strcmp(msg->attachments->mime_type, "application/pgp-encrypted") != 0)    
    2.12          return false;
    2.13      if (!msg->attachments->next->mime_type || 
    2.14          strcmp(msg->attachments->next->mime_type, "application/octet-stream") != 0)        
    2.15 @@ -3417,7 +3418,8 @@
    2.16      // This import is from the outermost message.
    2.17      // We don't do this for PGP_mime.
    2.18      bool imported_keys = false;
    2.19 -    if (!_has_PGP_MIME_format(src))
    2.20 +    PEP_cryptotech enc_type = determine_encryption_format(src);
    2.21 +    if (enc_type != PEP_crypt_OpenPGP || !(src->enc_format == PEP_enc_PGP_MIME || src->enc_format == PEP_enc_PGP_MIME_Outlook1))
    2.22          imported_keys = import_attached_keys(session, src, NULL);
    2.23              
    2.24      import_header_keys(session, src);
     3.1 --- a/test/src/SuiteMaker.cc	Mon Jul 29 07:05:03 2019 +0200
     3.2 +++ b/test/src/SuiteMaker.cc	Wed Aug 07 08:16:15 2019 +0200
     3.3 @@ -21,6 +21,7 @@
     3.4  #include "Engine463Tests.h"
     3.5  #include "IOS1664Tests.h"
     3.6  #include "BloblistTests.h"
     3.7 +#include "KeyImportAndRetrieveTests.h"
     3.8  #include "NewUpdateIdAndMyselfTests.h"
     3.9  #include "NoOwnIdentWritesOnDecryptTests.h"
    3.10  #include "LiteralFilenameTests.h"
    3.11 @@ -29,6 +30,7 @@
    3.12  #include "PgpBinaryTests.h"
    3.13  #include "SubkeyRatingEvalTests.h"
    3.14  #include "MessageNullFromTests.h"
    3.15 +#include "Engine587Tests.h"
    3.16  #include "ExportKeyTests.h"
    3.17  #include "LeastCommonDenomColorTests.h"
    3.18  #include "StringlistTests.h"
    3.19 @@ -87,6 +89,7 @@
    3.20      "Engine463Tests",
    3.21      "IOS1664Tests",
    3.22      "BloblistTests",
    3.23 +    "KeyImportAndRetrieveTests",
    3.24      "NewUpdateIdAndMyselfTests",
    3.25      "NoOwnIdentWritesOnDecryptTests",
    3.26      "LiteralFilenameTests",
    3.27 @@ -95,6 +98,7 @@
    3.28      "PgpBinaryTests",
    3.29      "SubkeyRatingEvalTests",
    3.30      "MessageNullFromTests",
    3.31 +    "Engine587Tests",
    3.32      "ExportKeyTests",
    3.33      "LeastCommonDenomColorTests",
    3.34      "StringlistTests",
    3.35 @@ -144,7 +148,7 @@
    3.36  };
    3.37  
    3.38  // This file is generated, so magic constants are ok.
    3.39 -int SuiteMaker::num_suites = 63;
    3.40 +int SuiteMaker::num_suites = 65;
    3.41  
    3.42  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    3.43      if (strcmp(test_class_name, "URIAddressTests") == 0)
    3.44 @@ -165,6 +169,8 @@
    3.45          *test_suite = new IOS1664Tests(test_class_name, test_home);
    3.46      else if (strcmp(test_class_name, "BloblistTests") == 0)
    3.47          *test_suite = new BloblistTests(test_class_name, test_home);
    3.48 +    else if (strcmp(test_class_name, "KeyImportAndRetrieveTests") == 0)
    3.49 +        *test_suite = new KeyImportAndRetrieveTests(test_class_name, test_home);
    3.50      else if (strcmp(test_class_name, "NewUpdateIdAndMyselfTests") == 0)
    3.51          *test_suite = new NewUpdateIdAndMyselfTests(test_class_name, test_home);
    3.52      else if (strcmp(test_class_name, "NoOwnIdentWritesOnDecryptTests") == 0)
    3.53 @@ -181,6 +187,8 @@
    3.54          *test_suite = new SubkeyRatingEvalTests(test_class_name, test_home);
    3.55      else if (strcmp(test_class_name, "MessageNullFromTests") == 0)
    3.56          *test_suite = new MessageNullFromTests(test_class_name, test_home);
    3.57 +    else if (strcmp(test_class_name, "Engine587Tests") == 0)
    3.58 +        *test_suite = new Engine587Tests(test_class_name, test_home);
    3.59      else if (strcmp(test_class_name, "ExportKeyTests") == 0)
    3.60          *test_suite = new ExportKeyTests(test_class_name, test_home);
    3.61      else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)