Merge with sync sequoia_windows
authorThomas
Wed, 29 May 2019 11:41:22 +0200
branchsequoia_windows
changeset 3766dffc8ed6625a
parent 3761 c8b94d6bd3b4
parent 3765 6e0ded701a54
child 3784 b6a0f8ceede7
Merge with sync
     1.1 --- a/src/pEpEngine.c	Wed May 29 08:07:53 2019 +0200
     1.2 +++ b/src/pEpEngine.c	Wed May 29 11:41:22 2019 +0200
     1.3 @@ -2403,7 +2403,7 @@
     1.4      )
     1.5  {
     1.6      PEP_STATUS status = PEP_STATUS_OK;
     1.7 -    static pEp_identity *_identity;
     1.8 +    pEp_identity *_identity = NULL;
     1.9  
    1.10      assert(session);
    1.11      assert(address);
    1.12 @@ -2614,7 +2614,7 @@
    1.13      )
    1.14  {
    1.15      PEP_STATUS status = PEP_STATUS_OK;
    1.16 -    static pEp_identity *_identity;
    1.17 +    pEp_identity *_identity = NULL;
    1.18  
    1.19      assert(session);
    1.20      assert(address);
    1.21 @@ -5084,4 +5084,3 @@
    1.22  #endif
    1.23      log_service(session, "### service error log ###", entity, buffer, where);
    1.24  }
    1.25 -
     2.1 --- a/sync/gen_statemachine.ysl2	Wed May 29 08:07:53 2019 +0200
     2.2 +++ b/sync/gen_statemachine.ysl2	Wed May 29 11:41:22 2019 +0200
     2.3 @@ -335,13 +335,6 @@
     2.4                  if (!(session && data && size))
     2.5                      return PEP_ILLEGAL_VALUE;
     2.6  
     2.7 -                // FIXME: this will go wrong if MAC is used instead of Signature
     2.8 -                if (from && from->fpr && signature_fpr) {
     2.9 -                    // ignore own messages
    2.10 -                    if (strcmp(from->fpr, signature_fpr) == 0)
    2.11 -                        return PEP_STATUS_OK;
    2.12 -                }
    2.13 -
    2.14                  if (!session->inject_«yml:lcase(@name)»_event)
    2.15                     return PEP_«yml:ucase(@name)»_NO_INJECT_CALLBACK;
    2.16  
     3.1 --- a/test/src/engine_tests/URIAddressTests.cc	Wed May 29 08:07:53 2019 +0200
     3.2 +++ b/test/src/engine_tests/URIAddressTests.cc	Wed May 29 11:41:22 2019 +0200
     3.3 @@ -40,7 +40,9 @@
     3.4      status = export_key(session, me->fpr, 
     3.5                          &keydata, &keysize);
     3.6  
     3.7 -    cout << keydata << endl;
     3.8 +    TEST_ASSERT(keydata && keysize > 0);
     3.9 +    // no guarantee of NUL-termination atm.
    3.10 +//    cout << keydata << endl;
    3.11  
    3.12      free(keydata);
    3.13      free_identity(me);