... sync
authorVolker Birk <vb@pep-project.org>
Thu, 09 May 2019 18:05:12 +0200
branchsync
changeset 36559ca9bfc0e3f6
parent 3654 f0962656dd57
child 3656 a2f10fa2843e
...
src/message_api.c
test/src/SuiteMaker.cc
     1.1 --- a/src/message_api.c	Thu May 09 10:22:48 2019 +0200
     1.2 +++ b/src/message_api.c	Thu May 09 18:05:12 2019 +0200
     1.3 @@ -1484,6 +1484,7 @@
     1.4                          break;
     1.5                      // else fall through and delete    
     1.6                  case PEP_KEY_IMPORTED:
     1.7 +                case PEP_STATUS_OK:
     1.8                      to_delete = bl;
     1.9                      if (prev)
    1.10                          prev->next = bl->next;
    1.11 @@ -3183,7 +3184,7 @@
    1.12          return false;
    1.13      PEP_STATUS status = import_key(session, the_key->value, the_key->size, NULL);
    1.14      free_bloblist(the_key);
    1.15 -    if (status == PEP_KEY_IMPORTED)
    1.16 +    if (status == PEP_STATUS_OK || status == PEP_KEY_IMPORTED)
    1.17          return true;
    1.18      return false;
    1.19  }
     2.1 --- a/test/src/SuiteMaker.cc	Thu May 09 10:22:48 2019 +0200
     2.2 +++ b/test/src/SuiteMaker.cc	Thu May 09 18:05:12 2019 +0200
     2.3 @@ -33,6 +33,7 @@
     2.4  #include "EncryptMissingPrivateKeyTests.h"
     2.5  #include "CaseAndDotAddressTests.h"
     2.6  #include "UserIDAliasTests.h"
     2.7 +#include "KeyringImportTests.h"
     2.8  #include "EnterLeaveDeviceGroupTests.h"
     2.9  #include "SignOnlyTests.h"
    2.10  #include "BCCTests.h"
    2.11 @@ -46,6 +47,7 @@
    2.12  #include "HeaderKeyImportTests.h"
    2.13  #include "EncryptAttachPrivateKeyTests.h"
    2.14  #include "ExternalRevokeTests.h"
    2.15 +#include "LookupTests.h"
    2.16  #include "KeyeditTests.h"
    2.17  #include "LeastColorGroupTests.h"
    2.18  #include "DecryptAttachPrivateKeyTrustedTests.h"
    2.19 @@ -90,6 +92,7 @@
    2.20      "EncryptMissingPrivateKeyTests",
    2.21      "CaseAndDotAddressTests",
    2.22      "UserIDAliasTests",
    2.23 +    "KeyringImportTests",
    2.24      "EnterLeaveDeviceGroupTests",
    2.25      "SignOnlyTests",
    2.26      "BCCTests",
    2.27 @@ -103,6 +106,7 @@
    2.28      "HeaderKeyImportTests",
    2.29      "EncryptAttachPrivateKeyTests",
    2.30      "ExternalRevokeTests",
    2.31 +    "LookupTests",
    2.32      "KeyeditTests",
    2.33      "LeastColorGroupTests",
    2.34      "DecryptAttachPrivateKeyTrustedTests",
    2.35 @@ -126,7 +130,7 @@
    2.36  };
    2.37  
    2.38  // This file is generated, so magic constants are ok.
    2.39 -int SuiteMaker::num_suites = 54;
    2.40 +int SuiteMaker::num_suites = 56;
    2.41  
    2.42  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    2.43      if (strcmp(test_class_name, "MimeTests") == 0)
    2.44 @@ -171,6 +175,8 @@
    2.45          *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
    2.46      else if (strcmp(test_class_name, "UserIDAliasTests") == 0)
    2.47          *test_suite = new UserIDAliasTests(test_class_name, test_home);
    2.48 +    else if (strcmp(test_class_name, "KeyringImportTests") == 0)
    2.49 +        *test_suite = new KeyringImportTests(test_class_name, test_home);
    2.50      else if (strcmp(test_class_name, "EnterLeaveDeviceGroupTests") == 0)
    2.51          *test_suite = new EnterLeaveDeviceGroupTests(test_class_name, test_home);
    2.52      else if (strcmp(test_class_name, "SignOnlyTests") == 0)
    2.53 @@ -197,6 +203,8 @@
    2.54          *test_suite = new EncryptAttachPrivateKeyTests(test_class_name, test_home);
    2.55      else if (strcmp(test_class_name, "ExternalRevokeTests") == 0)
    2.56          *test_suite = new ExternalRevokeTests(test_class_name, test_home);
    2.57 +    else if (strcmp(test_class_name, "LookupTests") == 0)
    2.58 +        *test_suite = new LookupTests(test_class_name, test_home);
    2.59      else if (strcmp(test_class_name, "KeyeditTests") == 0)
    2.60          *test_suite = new KeyeditTests(test_class_name, test_home);
    2.61      else if (strcmp(test_class_name, "LeastColorGroupTests") == 0)