merge sync IOS-1576
authorbuff <andreas@pep-project.org>
Mon, 15 Jul 2019 16:37:42 +0200
branchIOS-1576
changeset 3930dbd227c0fef8
parent 3929 408594db81f1
parent 3927 fd89f666f4e4
child 3932 c487731d164d
child 3933 c536b60490a4
merge sync
     1.1 --- a/src/message_api.c	Wed Jul 10 11:44:43 2019 +0200
     1.2 +++ b/src/message_api.c	Mon Jul 15 16:37:42 2019 +0200
     1.3 @@ -2604,8 +2604,8 @@
     1.4      
     1.5      if ((!slong || slong[0] == '\0')
     1.6           && (!sform || sform[0] == '\0')) {
     1.7 -        if (satt) {
     1.8 -            const char* inner_mime_type = satt->mime_type;
     1.9 +        const char* inner_mime_type = (satt ? satt->mime_type : NULL);     
    1.10 +        if (inner_mime_type) {
    1.11              if (strcasecmp(inner_mime_type, "text/plain") == 0) {
    1.12                  free(slong); /* in case of "" */
    1.13                  src->longmsg = strndup(satt->value, satt->size); 
     2.1 --- a/sync/gen_statemachine.ysl2	Wed Jul 10 11:44:43 2019 +0200
     2.2 +++ b/sync/gen_statemachine.ysl2	Mon Jul 15 16:37:42 2019 +0200
     2.3 @@ -552,6 +552,7 @@
     2.4                                  status = PEP_«yml:ucase(@name)»_CANNOT_ENCRYPT;
     2.5                                  goto the_end;
     2.6                              }
     2.7 +                            add_opt_field(m, "pEp-auto-consume", "yes");
     2.8                              free_message(_m);
     2.9                              break;
    2.10  
    2.11 @@ -729,6 +730,7 @@
    2.12                                  status = PEP_«yml:ucase(@name)»_CANNOT_ENCRYPT;
    2.13                                  goto the_end;
    2.14                              }
    2.15 +                            add_opt_field(m, "pEp-auto-consume", "yes");
    2.16                              free_message(_m);
    2.17                              break;
    2.18  
    2.19 @@ -752,6 +754,7 @@
    2.20                                  status = PEP_«yml:ucase(@name)»_CANNOT_ENCRYPT;
    2.21                                  goto the_end;
    2.22                              }
    2.23 +                            add_opt_field(m, "pEp-auto-consume", "yes");
    2.24                              free_message(_m);
    2.25                      }
    2.26  
     3.1 --- a/test/src/SuiteMaker.cc	Wed Jul 10 11:44:43 2019 +0200
     3.2 +++ b/test/src/SuiteMaker.cc	Mon Jul 15 16:37:42 2019 +0200
     3.3 @@ -21,7 +21,6 @@
     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 @@ -30,7 +29,6 @@
    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 @@ -89,7 +87,6 @@
    3.20      "Engine463Tests",
    3.21      "IOS1664Tests",
    3.22      "BloblistTests",
    3.23 -    "KeyImportAndRetrieveTests",
    3.24      "NewUpdateIdAndMyselfTests",
    3.25      "NoOwnIdentWritesOnDecryptTests",
    3.26      "LiteralFilenameTests",
    3.27 @@ -98,7 +95,6 @@
    3.28      "PgpBinaryTests",
    3.29      "SubkeyRatingEvalTests",
    3.30      "MessageNullFromTests",
    3.31 -    "Engine587Tests",
    3.32      "ExportKeyTests",
    3.33      "LeastCommonDenomColorTests",
    3.34      "StringlistTests",
    3.35 @@ -148,7 +144,7 @@
    3.36  };
    3.37  
    3.38  // This file is generated, so magic constants are ok.
    3.39 -int SuiteMaker::num_suites = 65;
    3.40 +int SuiteMaker::num_suites = 63;
    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 @@ -169,8 +165,6 @@
    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 @@ -187,8 +181,6 @@
    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)