merging sync
authorVolker Birk <vb@pep.foundation>
Mon, 15 Oct 2018 21:35:52 +0200
branchsync
changeset 3057fff5fb5e01fe
parent 3056 924a5dfb5367
parent 3054 446b47c16304
child 3058 9626ee1d22c3
merging
src/keymanagement.c
src/keymanagement.h
     1.1 --- a/src/keymanagement.c	Mon Oct 15 21:35:08 2018 +0200
     1.2 +++ b/src/keymanagement.c	Mon Oct 15 21:35:52 2018 +0200
     1.3 @@ -1886,3 +1886,4 @@
     1.4      return status;
     1.5  }
     1.6  #endif // USE_GPG
     1.7 +
     2.1 --- a/src/keymanagement.h	Mon Oct 15 21:35:08 2018 +0200
     2.2 +++ b/src/keymanagement.h	Mon Oct 15 21:35:52 2018 +0200
     2.3 @@ -207,25 +207,6 @@
     2.4          pEp_identity *ident
     2.5      );
     2.6  
     2.7 -// undo_last_mistrust() - reset identity and trust status for the last
     2.8 -//                        identity in this session marked as mistrusted
     2.9 -//                        to their cached values from the time of mistrust
    2.10 -//  parameters:
    2.11 -//      session (in)        session to use
    2.12 -//
    2.13 -//  return value:
    2.14 -//      PEP_STATUS_OK if identity and trust were successfully restored.
    2.15 -//      Otherwise, error status from attempts to set.
    2.16 -//
    2.17 -//  caveat:
    2.18 -//      only works for this session, and only once. cache is invalidated
    2.19 -//      upon use.
    2.20 -//
    2.21 -//      WILL NOT WORK ON MISTRUSTED OWN KEY
    2.22 -
    2.23 -DYNAMIC_API PEP_STATUS undo_last_mistrust(PEP_SESSION session);
    2.24 -
    2.25 -
    2.26  // trust_personal_key() - mark a key as trusted for a user
    2.27  //
    2.28  //  parameters:
     3.1 --- a/src/message_api.c	Mon Oct 15 21:35:08 2018 +0200
     3.2 +++ b/src/message_api.c	Mon Oct 15 21:35:52 2018 +0200
     3.3 @@ -3775,6 +3775,8 @@
     3.4                                                true);
     3.5                      if (status != PEP_STATUS_OK || il->ident->fpr == NULL) {
     3.6                          il->ident->comm_type = PEP_ct_key_not_found;
     3.7 +                        if (*max_comm_type > PEP_ct_no_encryption)
     3.8 +                            *max_comm_type = PEP_ct_no_encryption;
     3.9                      }
    3.10                  }    
    3.11              }
     4.1 --- a/src/sync_api.h	Mon Oct 15 21:35:08 2018 +0200
     4.2 +++ b/src/sync_api.h	Mon Oct 15 21:35:52 2018 +0200
     4.3 @@ -49,7 +49,6 @@
     4.4  //      ownership of self and partner go to the callee
     4.5  
     4.6  typedef PEP_STATUS (*notifyHandshake_t)(
     4.7 -        void *obj,
     4.8          pEp_identity *me,
     4.9          pEp_identity *partner,
    4.10          sync_handshake_signal signal
     5.1 --- a/sync/cond_act_sync.yml2	Mon Oct 15 21:35:08 2018 +0200
     5.2 +++ b/sync/cond_act_sync.yml2	Mon Oct 15 21:35:52 2018 +0200
     5.3 @@ -136,8 +136,7 @@
     5.4              return PEP_OUT_OF_MEMORY;
     5.5          }
     5.6  
     5.7 -        status = session->notifyHandshake(session->sync_management, me,
     5.8 -                partner, «$type»);
     5.9 +        status = session->notifyHandshake(me, partner, «$type»);
    5.10          if (status)
    5.11              return status;
    5.12      ||
     6.1 --- a/test/src/SuiteMaker.cc	Mon Oct 15 21:35:08 2018 +0200
     6.2 +++ b/test/src/SuiteMaker.cc	Mon Oct 15 21:35:52 2018 +0200
     6.3 @@ -12,175 +12,175 @@
     6.4  #include "SuiteMaker.h"
     6.5  
     6.6  // Begin where we generate stuff
     6.7 +#include "MimeTests.h"
     6.8 +#include "UserIdCollisionTests.h"
     6.9 +#include "Engine463Tests.h"
    6.10 +#include "BloblistTests.h"
    6.11 +#include "NewUpdateIdAndMyselfTests.h"
    6.12 +#include "I18nTests.h"
    6.13 +#include "IdentityListTests.h"
    6.14 +#include "PgpBinaryTests.h"
    6.15 +#include "MessageNullFromTests.h"
    6.16 +#include "LeastCommonDenomColorTests.h"
    6.17 +#include "StringlistTests.h"
    6.18 +#include "PgpListKeysTests.h"
    6.19 +#include "MessageApiTests.h"
    6.20 +#include "EncryptMissingPrivateKeyTests.h"
    6.21 +#include "CaseAndDotAddressTests.h"
    6.22 +#include "UserIDAliasTests.h"
    6.23 +#include "BCCTests.h"
    6.24 +#include "BlacklistAcceptNewKeyTests.h"
    6.25 +#include "DecryptAttachPrivateKeyUntrustedTests.h"
    6.26 +#include "BlacklistTests.h"
    6.27 +#include "RevokeRegenAttachTests.h"
    6.28 +#include "PepSubjectReceivedTests.h"
    6.29 +#include "SequenceTests.h"
    6.30 +#include "EncryptAttachPrivateKeyTests.h"
    6.31 +#include "ExternalRevokeTests.h"
    6.32 +#include "KeyeditTests.h"
    6.33 +#include "LeastColorGroupTests.h"
    6.34 +#include "DecryptAttachPrivateKeyTrustedTests.h"
    6.35 +#include "TrustwordsTests.h"
    6.36 +#include "ReencryptPlusExtraKeysTests.h"
    6.37 +#include "MapAsn1Tests.h"
    6.38  #include "DecorateTests.h"
    6.39 -#include "UserIdCollisionTests.h"
    6.40 -#include "ReencryptPlusExtraKeysTests.h"
    6.41 -#include "BlacklistTests.h"
    6.42 -#include "AppleMailTests.h"
    6.43  #include "MessageTwoPointOhTests.h"
    6.44 -#include "IdentityListTests.h"
    6.45 -#include "I18nTests.h"
    6.46 -#include "Engine463Tests.h"
    6.47 -#include "DecryptAttachPrivateKeyUntrustedTests.h"
    6.48 -#include "BCCTests.h"
    6.49 -#include "LeastColorGroupTests.h"
    6.50 -#include "BlacklistAcceptNewKeyTests.h"
    6.51 -#include "MessageApiTests.h"
    6.52 -#include "StringlistTests.h"
    6.53 +#include "CrashdumpTests.h"
    6.54  #include "StringpairListTests.h"
    6.55 +#include "EncryptForIdentityTests.h"
    6.56 +#include "KeyResetMessageTests.h"
    6.57  #include "TrustManipulationTests.h"
    6.58  #include "SyncTests.h"
    6.59 -#include "EncryptAttachPrivateKeyTests.h"
    6.60 -#include "BloblistTests.h"
    6.61 -#include "KeyResetMessageTests.h"
    6.62 -#include "SequenceTests.h"
    6.63 -#include "TrustwordsTests.h"
    6.64 -#include "RevokeRegenAttachTests.h"
    6.65 -#include "EncryptMissingPrivateKeyTests.h"
    6.66 -#include "PepSubjectReceivedTests.h"
    6.67 -#include "KeyeditTests.h"
    6.68 -#include "MapAsn1Tests.h"
    6.69 -#include "PgpBinaryTests.h"
    6.70 -#include "DecryptAttachPrivateKeyTrustedTests.h"
    6.71 -#include "MessageNullFromTests.h"
    6.72 -#include "MimeTests.h"
    6.73 -#include "PgpListKeysTests.h"
    6.74 -#include "NewUpdateIdAndMyselfTests.h"
    6.75 -#include "EncryptForIdentityTests.h"
    6.76 -#include "CrashdumpTests.h"
    6.77 -#include "CaseAndDotAddressTests.h"
    6.78 -#include "LeastCommonDenomColorTests.h"
    6.79 -#include "ExternalRevokeTests.h"
    6.80 -#include "UserIDAliasTests.h"
    6.81 +#include "AppleMailTests.h"
    6.82  
    6.83  
    6.84  const char* SuiteMaker::all_suites[] = {
    6.85 +    "MimeTests",
    6.86 +    "UserIdCollisionTests",
    6.87 +    "Engine463Tests",
    6.88 +    "BloblistTests",
    6.89 +    "NewUpdateIdAndMyselfTests",
    6.90 +    "I18nTests",
    6.91 +    "IdentityListTests",
    6.92 +    "PgpBinaryTests",
    6.93 +    "MessageNullFromTests",
    6.94 +    "LeastCommonDenomColorTests",
    6.95 +    "StringlistTests",
    6.96 +    "PgpListKeysTests",
    6.97 +    "MessageApiTests",
    6.98 +    "EncryptMissingPrivateKeyTests",
    6.99 +    "CaseAndDotAddressTests",
   6.100 +    "UserIDAliasTests",
   6.101 +    "BCCTests",
   6.102 +    "BlacklistAcceptNewKeyTests",
   6.103 +    "DecryptAttachPrivateKeyUntrustedTests",
   6.104 +    "BlacklistTests",
   6.105 +    "RevokeRegenAttachTests",
   6.106 +    "PepSubjectReceivedTests",
   6.107 +    "SequenceTests",
   6.108 +    "EncryptAttachPrivateKeyTests",
   6.109 +    "ExternalRevokeTests",
   6.110 +    "KeyeditTests",
   6.111 +    "LeastColorGroupTests",
   6.112 +    "DecryptAttachPrivateKeyTrustedTests",
   6.113 +    "TrustwordsTests",
   6.114 +    "ReencryptPlusExtraKeysTests",
   6.115 +    "MapAsn1Tests",
   6.116      "DecorateTests",
   6.117 -    "UserIdCollisionTests",
   6.118 -    "ReencryptPlusExtraKeysTests",
   6.119 -    "BlacklistTests",
   6.120 -    "AppleMailTests",
   6.121      "MessageTwoPointOhTests",
   6.122 -    "IdentityListTests",
   6.123 -    "I18nTests",
   6.124 -    "Engine463Tests",
   6.125 -    "DecryptAttachPrivateKeyUntrustedTests",
   6.126 -    "BCCTests",
   6.127 -    "LeastColorGroupTests",
   6.128 -    "BlacklistAcceptNewKeyTests",
   6.129 -    "MessageApiTests",
   6.130 -    "StringlistTests",
   6.131 +    "CrashdumpTests",
   6.132      "StringpairListTests",
   6.133 +    "EncryptForIdentityTests",
   6.134 +    "KeyResetMessageTests",
   6.135      "TrustManipulationTests",
   6.136      "SyncTests",
   6.137 -    "EncryptAttachPrivateKeyTests",
   6.138 -    "BloblistTests",
   6.139 -    "KeyResetMessageTests",
   6.140 -    "SequenceTests",
   6.141 -    "TrustwordsTests",
   6.142 -    "RevokeRegenAttachTests",
   6.143 -    "EncryptMissingPrivateKeyTests",
   6.144 -    "PepSubjectReceivedTests",
   6.145 -    "KeyeditTests",
   6.146 -    "MapAsn1Tests",
   6.147 -    "PgpBinaryTests",
   6.148 -    "DecryptAttachPrivateKeyTrustedTests",
   6.149 -    "MessageNullFromTests",
   6.150 -    "MimeTests",
   6.151 -    "PgpListKeysTests",
   6.152 -    "NewUpdateIdAndMyselfTests",
   6.153 -    "EncryptForIdentityTests",
   6.154 -    "CrashdumpTests",
   6.155 -    "CaseAndDotAddressTests",
   6.156 -    "LeastCommonDenomColorTests",
   6.157 -    "ExternalRevokeTests",
   6.158 -    "UserIDAliasTests",
   6.159 +    "AppleMailTests",
   6.160  };
   6.161  
   6.162  // This file is generated, so magic constants are ok.
   6.163  int SuiteMaker::num_suites = 40;
   6.164  
   6.165  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
   6.166 -    if (strcmp(test_class_name, "DecorateTests") == 0)
   6.167 -        *test_suite = new DecorateTests(test_class_name, test_home);
   6.168 +    if (strcmp(test_class_name, "MimeTests") == 0)
   6.169 +        *test_suite = new MimeTests(test_class_name, test_home);
   6.170      else if (strcmp(test_class_name, "UserIdCollisionTests") == 0)
   6.171          *test_suite = new UserIdCollisionTests(test_class_name, test_home);
   6.172 +    else if (strcmp(test_class_name, "Engine463Tests") == 0)
   6.173 +        *test_suite = new Engine463Tests(test_class_name, test_home);
   6.174 +    else if (strcmp(test_class_name, "BloblistTests") == 0)
   6.175 +        *test_suite = new BloblistTests(test_class_name, test_home);
   6.176 +    else if (strcmp(test_class_name, "NewUpdateIdAndMyselfTests") == 0)
   6.177 +        *test_suite = new NewUpdateIdAndMyselfTests(test_class_name, test_home);
   6.178 +    else if (strcmp(test_class_name, "I18nTests") == 0)
   6.179 +        *test_suite = new I18nTests(test_class_name, test_home);
   6.180 +    else if (strcmp(test_class_name, "IdentityListTests") == 0)
   6.181 +        *test_suite = new IdentityListTests(test_class_name, test_home);
   6.182 +    else if (strcmp(test_class_name, "PgpBinaryTests") == 0)
   6.183 +        *test_suite = new PgpBinaryTests(test_class_name, test_home);
   6.184 +    else if (strcmp(test_class_name, "MessageNullFromTests") == 0)
   6.185 +        *test_suite = new MessageNullFromTests(test_class_name, test_home);
   6.186 +    else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)
   6.187 +        *test_suite = new LeastCommonDenomColorTests(test_class_name, test_home);
   6.188 +    else if (strcmp(test_class_name, "StringlistTests") == 0)
   6.189 +        *test_suite = new StringlistTests(test_class_name, test_home);
   6.190 +    else if (strcmp(test_class_name, "PgpListKeysTests") == 0)
   6.191 +        *test_suite = new PgpListKeysTests(test_class_name, test_home);
   6.192 +    else if (strcmp(test_class_name, "MessageApiTests") == 0)
   6.193 +        *test_suite = new MessageApiTests(test_class_name, test_home);
   6.194 +    else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
   6.195 +        *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
   6.196 +    else if (strcmp(test_class_name, "CaseAndDotAddressTests") == 0)
   6.197 +        *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
   6.198 +    else if (strcmp(test_class_name, "UserIDAliasTests") == 0)
   6.199 +        *test_suite = new UserIDAliasTests(test_class_name, test_home);
   6.200 +    else if (strcmp(test_class_name, "BCCTests") == 0)
   6.201 +        *test_suite = new BCCTests(test_class_name, test_home);
   6.202 +    else if (strcmp(test_class_name, "BlacklistAcceptNewKeyTests") == 0)
   6.203 +        *test_suite = new BlacklistAcceptNewKeyTests(test_class_name, test_home);
   6.204 +    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyUntrustedTests") == 0)
   6.205 +        *test_suite = new DecryptAttachPrivateKeyUntrustedTests(test_class_name, test_home);
   6.206 +    else if (strcmp(test_class_name, "BlacklistTests") == 0)
   6.207 +        *test_suite = new BlacklistTests(test_class_name, test_home);
   6.208 +    else if (strcmp(test_class_name, "RevokeRegenAttachTests") == 0)
   6.209 +        *test_suite = new RevokeRegenAttachTests(test_class_name, test_home);
   6.210 +    else if (strcmp(test_class_name, "PepSubjectReceivedTests") == 0)
   6.211 +        *test_suite = new PepSubjectReceivedTests(test_class_name, test_home);
   6.212 +    else if (strcmp(test_class_name, "SequenceTests") == 0)
   6.213 +        *test_suite = new SequenceTests(test_class_name, test_home);
   6.214 +    else if (strcmp(test_class_name, "EncryptAttachPrivateKeyTests") == 0)
   6.215 +        *test_suite = new EncryptAttachPrivateKeyTests(test_class_name, test_home);
   6.216 +    else if (strcmp(test_class_name, "ExternalRevokeTests") == 0)
   6.217 +        *test_suite = new ExternalRevokeTests(test_class_name, test_home);
   6.218 +    else if (strcmp(test_class_name, "KeyeditTests") == 0)
   6.219 +        *test_suite = new KeyeditTests(test_class_name, test_home);
   6.220 +    else if (strcmp(test_class_name, "LeastColorGroupTests") == 0)
   6.221 +        *test_suite = new LeastColorGroupTests(test_class_name, test_home);
   6.222 +    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyTrustedTests") == 0)
   6.223 +        *test_suite = new DecryptAttachPrivateKeyTrustedTests(test_class_name, test_home);
   6.224 +    else if (strcmp(test_class_name, "TrustwordsTests") == 0)
   6.225 +        *test_suite = new TrustwordsTests(test_class_name, test_home);
   6.226      else if (strcmp(test_class_name, "ReencryptPlusExtraKeysTests") == 0)
   6.227          *test_suite = new ReencryptPlusExtraKeysTests(test_class_name, test_home);
   6.228 -    else if (strcmp(test_class_name, "BlacklistTests") == 0)
   6.229 -        *test_suite = new BlacklistTests(test_class_name, test_home);
   6.230 -    else if (strcmp(test_class_name, "AppleMailTests") == 0)
   6.231 -        *test_suite = new AppleMailTests(test_class_name, test_home);
   6.232 +    else if (strcmp(test_class_name, "MapAsn1Tests") == 0)
   6.233 +        *test_suite = new MapAsn1Tests(test_class_name, test_home);
   6.234 +    else if (strcmp(test_class_name, "DecorateTests") == 0)
   6.235 +        *test_suite = new DecorateTests(test_class_name, test_home);
   6.236      else if (strcmp(test_class_name, "MessageTwoPointOhTests") == 0)
   6.237          *test_suite = new MessageTwoPointOhTests(test_class_name, test_home);
   6.238 -    else if (strcmp(test_class_name, "IdentityListTests") == 0)
   6.239 -        *test_suite = new IdentityListTests(test_class_name, test_home);
   6.240 -    else if (strcmp(test_class_name, "I18nTests") == 0)
   6.241 -        *test_suite = new I18nTests(test_class_name, test_home);
   6.242 -    else if (strcmp(test_class_name, "Engine463Tests") == 0)
   6.243 -        *test_suite = new Engine463Tests(test_class_name, test_home);
   6.244 -    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyUntrustedTests") == 0)
   6.245 -        *test_suite = new DecryptAttachPrivateKeyUntrustedTests(test_class_name, test_home);
   6.246 -    else if (strcmp(test_class_name, "BCCTests") == 0)
   6.247 -        *test_suite = new BCCTests(test_class_name, test_home);
   6.248 -    else if (strcmp(test_class_name, "LeastColorGroupTests") == 0)
   6.249 -        *test_suite = new LeastColorGroupTests(test_class_name, test_home);
   6.250 -    else if (strcmp(test_class_name, "BlacklistAcceptNewKeyTests") == 0)
   6.251 -        *test_suite = new BlacklistAcceptNewKeyTests(test_class_name, test_home);
   6.252 -    else if (strcmp(test_class_name, "MessageApiTests") == 0)
   6.253 -        *test_suite = new MessageApiTests(test_class_name, test_home);
   6.254 -    else if (strcmp(test_class_name, "StringlistTests") == 0)
   6.255 -        *test_suite = new StringlistTests(test_class_name, test_home);
   6.256 +    else if (strcmp(test_class_name, "CrashdumpTests") == 0)
   6.257 +        *test_suite = new CrashdumpTests(test_class_name, test_home);
   6.258      else if (strcmp(test_class_name, "StringpairListTests") == 0)
   6.259          *test_suite = new StringpairListTests(test_class_name, test_home);
   6.260 +    else if (strcmp(test_class_name, "EncryptForIdentityTests") == 0)
   6.261 +        *test_suite = new EncryptForIdentityTests(test_class_name, test_home);
   6.262 +    else if (strcmp(test_class_name, "KeyResetMessageTests") == 0)
   6.263 +        *test_suite = new KeyResetMessageTests(test_class_name, test_home);
   6.264      else if (strcmp(test_class_name, "TrustManipulationTests") == 0)
   6.265          *test_suite = new TrustManipulationTests(test_class_name, test_home);
   6.266      else if (strcmp(test_class_name, "SyncTests") == 0)
   6.267          *test_suite = new SyncTests(test_class_name, test_home);
   6.268 -    else if (strcmp(test_class_name, "EncryptAttachPrivateKeyTests") == 0)
   6.269 -        *test_suite = new EncryptAttachPrivateKeyTests(test_class_name, test_home);
   6.270 -    else if (strcmp(test_class_name, "BloblistTests") == 0)
   6.271 -        *test_suite = new BloblistTests(test_class_name, test_home);
   6.272 -    else if (strcmp(test_class_name, "KeyResetMessageTests") == 0)
   6.273 -        *test_suite = new KeyResetMessageTests(test_class_name, test_home);
   6.274 -    else if (strcmp(test_class_name, "SequenceTests") == 0)
   6.275 -        *test_suite = new SequenceTests(test_class_name, test_home);
   6.276 -    else if (strcmp(test_class_name, "TrustwordsTests") == 0)
   6.277 -        *test_suite = new TrustwordsTests(test_class_name, test_home);
   6.278 -    else if (strcmp(test_class_name, "RevokeRegenAttachTests") == 0)
   6.279 -        *test_suite = new RevokeRegenAttachTests(test_class_name, test_home);
   6.280 -    else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
   6.281 -        *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
   6.282 -    else if (strcmp(test_class_name, "PepSubjectReceivedTests") == 0)
   6.283 -        *test_suite = new PepSubjectReceivedTests(test_class_name, test_home);
   6.284 -    else if (strcmp(test_class_name, "KeyeditTests") == 0)
   6.285 -        *test_suite = new KeyeditTests(test_class_name, test_home);
   6.286 -    else if (strcmp(test_class_name, "MapAsn1Tests") == 0)
   6.287 -        *test_suite = new MapAsn1Tests(test_class_name, test_home);
   6.288 -    else if (strcmp(test_class_name, "PgpBinaryTests") == 0)
   6.289 -        *test_suite = new PgpBinaryTests(test_class_name, test_home);
   6.290 -    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyTrustedTests") == 0)
   6.291 -        *test_suite = new DecryptAttachPrivateKeyTrustedTests(test_class_name, test_home);
   6.292 -    else if (strcmp(test_class_name, "MessageNullFromTests") == 0)
   6.293 -        *test_suite = new MessageNullFromTests(test_class_name, test_home);
   6.294 -    else if (strcmp(test_class_name, "MimeTests") == 0)
   6.295 -        *test_suite = new MimeTests(test_class_name, test_home);
   6.296 -    else if (strcmp(test_class_name, "PgpListKeysTests") == 0)
   6.297 -        *test_suite = new PgpListKeysTests(test_class_name, test_home);
   6.298 -    else if (strcmp(test_class_name, "NewUpdateIdAndMyselfTests") == 0)
   6.299 -        *test_suite = new NewUpdateIdAndMyselfTests(test_class_name, test_home);
   6.300 -    else if (strcmp(test_class_name, "EncryptForIdentityTests") == 0)
   6.301 -        *test_suite = new EncryptForIdentityTests(test_class_name, test_home);
   6.302 -    else if (strcmp(test_class_name, "CrashdumpTests") == 0)
   6.303 -        *test_suite = new CrashdumpTests(test_class_name, test_home);
   6.304 -    else if (strcmp(test_class_name, "CaseAndDotAddressTests") == 0)
   6.305 -        *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
   6.306 -    else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)
   6.307 -        *test_suite = new LeastCommonDenomColorTests(test_class_name, test_home);
   6.308 -    else if (strcmp(test_class_name, "ExternalRevokeTests") == 0)
   6.309 -        *test_suite = new ExternalRevokeTests(test_class_name, test_home);
   6.310 -    else if (strcmp(test_class_name, "UserIDAliasTests") == 0)
   6.311 -        *test_suite = new UserIDAliasTests(test_class_name, test_home);
   6.312 +    else if (strcmp(test_class_name, "AppleMailTests") == 0)
   6.313 +        *test_suite = new AppleMailTests(test_class_name, test_home);
   6.314  }
   6.315  
   6.316  void SuiteMaker::suitemaker_buildlist(const char** test_class_names, int num_to_run, const char* test_home, std::vector<Test::Suite*>& test_suites) {
     7.1 --- a/test/src/engine_tests/BlacklistTests.cc	Mon Oct 15 21:35:08 2018 +0200
     7.2 +++ b/test/src/engine_tests/BlacklistTests.cc	Mon Oct 15 21:35:52 2018 +0200
     7.3 @@ -143,6 +143,25 @@
     7.4               << "Expected it to be empty or (possibly) " << bl_fpr_2 << endl;
     7.5      TEST_ASSERT_MSG((!(blacklisted_identity->fpr) || blacklisted_identity->fpr[0] == '\0'|| (strcmp(blacklisted_identity->fpr, bl_fpr_2) == 0)), "!(blacklisted_identity->fpr) || blacklisted_identity->fpr[0] == '\0'|| (strcmp(blacklisted_identity->fpr, bl_fpr_2) == 0)");
     7.6  
     7.7 +    pEp_identity *me = new_identity("alice@peptest.ch", NULL, "423", "Alice Miller");
     7.8 +    assert(me);
     7.9 +    PEP_STATUS status24 = myself(session, me);
    7.10 +    TEST_ASSERT_MSG((status24 == PEP_STATUS_OK), "myself: status24 == PEP_STATUS_OK");
    7.11 +
    7.12 +    message *msg23 = new_message(PEP_dir_outgoing);
    7.13 +    assert(msg23);
    7.14 +    msg23->from = me;
    7.15 +    msg23->to = new_identity_list(identity_dup(blacklisted_identity));
    7.16 +    assert(msg23->to && msg23->to->ident);
    7.17 +    PEP_rating rating23;
    7.18 +
    7.19 +    cout << "testing outgoing_message_rating() with blacklisted key in to\n";
    7.20 +    PEP_STATUS status23 = outgoing_message_rating(session, msg23, &rating23);
    7.21 +    TEST_ASSERT_MSG((status23 == PEP_STATUS_OK), "outgoing_message_rating: status must be PEP_STATUS_OK");
    7.22 +    TEST_ASSERT_MSG((rating23 == PEP_rating_unencrypted), "outgoing_message_rating: rating must be PEP_rating_unencrypted");
    7.23 +
    7.24 +    free_message(msg23);
    7.25 +
    7.26      const string keytext2 = slurp("blacklisted_pub2.asc");
    7.27      PEP_STATUS status14 = import_key(session, keytext2.c_str(), keytext2.length(), NULL);
    7.28