Merge with sync sequoia_windows
authorThomas
Fri, 07 Jun 2019 07:41:36 +0200
branchsequoia_windows
changeset 38190c1bcfa6f9f3
parent 3808 cc7a572c3e96
parent 3818 0b34a967ab39
child 3827 3030ae87f2f9
Merge with sync
sync/sync.fsm
     1.1 --- a/sync/cond_act_sync.yml2	Wed Jun 05 08:33:33 2019 +0200
     1.2 +++ b/sync/cond_act_sync.yml2	Fri Jun 07 07:41:36 2019 +0200
     1.3 @@ -416,7 +416,7 @@
     1.4      free_identity_list(il);
     1.5  ||
     1.6  
     1.7 -action ownKeysAreGroupKeys
     1.8 +action ownKeysAreDefaultKeys
     1.9  ||
    1.10      PEP_STATUS status = PEP_STATUS_OK;
    1.11  
    1.12 @@ -430,7 +430,7 @@
    1.13      }
    1.14  ||
    1.15  
    1.16 -action receivedKeysAreGroupKeys
    1.17 +action receivedKeysAreDefaultKeys
    1.18  ||
    1.19      PEP_STATUS status = PEP_STATUS_OK;
    1.20      // set flag for all keys
     2.1 --- a/sync/gen_dot.ysl2	Wed Jun 05 08:33:33 2019 +0200
     2.2 +++ b/sync/gen_dot.ysl2	Fri Jun 07 07:41:36 2019 +0200
     2.3 @@ -8,34 +8,17 @@
     2.4      ||
     2.5      digraph finite_state_machine {
     2.6          rankdir=LR;
     2.7 +        node [shape = point];
     2.8 +        InitState;
     2.9          node [shape = doublecircle];
    2.10 -        `apply "state[@end='1']" mode=end`;
    2.11 -        node [shape = circle];
    2.12 +        End;
    2.13 +        node [shape = circle, style=filled, fillcolor = lightgrey];
    2.14  
    2.15 -        `` apply "state" mode=do
    2.16 +        `` apply "descendant::transition";
    2.17      }
    2.18      ||
    2.19  
    2.20 -    template "state", mode=end > «@name» 
    2.21 -    template "state", mode=do apply "event", 0 with "state", "@name";
    2.22 -
    2.23 -    template "event" {
    2.24 -        param "state";
    2.25 -        choose {
    2.26 -            when "count(transition) > 0"
    2.27 -                apply "transition|condition/transition", 0
    2.28 -                    with "state", "$state", with "event", "@name";
    2.29 -            otherwise
    2.30 -                if "@name != 'Init'"
    2.31 -                    | «$state» -> «$state» [ label="«@name»" ];
    2.32 -        }
    2.33 -    }
    2.34 -
    2.35 -    template "transition" {
    2.36 -        param "state";
    2.37 -        param "event";
    2.38 -
    2.39 -        | «$state» -> «@target» [ label ="«$event»" ];
    2.40 -    }
    2.41 +    template "transition"
    2.42 +        | «ancestor::state/@name» -> «@target» [ label="«ancestor::event/@name»" ];
    2.43  }
    2.44  
     3.1 --- a/sync/sync.fsm	Wed Jun 05 08:33:33 2019 +0200
     3.2 +++ b/sync/sync.fsm	Fri Jun 07 07:41:36 2019 +0200
     3.3 @@ -235,7 +235,7 @@
     3.4  
     3.5              on OwnKeysSecond {
     3.6                  do saveGroupKeys;
     3.7 -                do receivedKeysAreGroupKeys;
     3.8 +                do receivedKeysAreDefaultKeys;
     3.9                  do showGroupCreated;
    3.10                  go Grouped;
    3.11              }
    3.12 @@ -250,7 +250,7 @@
    3.13              on OwnKeysFirst {
    3.14                  do saveGroupKeys;
    3.15  
    3.16 -                do ownKeysAreGroupKeys;
    3.17 +                do ownKeysAreDefaultKeys;
    3.18                  do showGroupCreated;
    3.19                  go Grouped;
    3.20              }
    3.21 @@ -308,6 +308,9 @@
    3.22                  go End;
    3.23              }
    3.24  
    3.25 +            on CommitAccept if sameNegotiationAndPartner
    3.26 +                go HandshakingJoinPhase2;
    3.27 +
    3.28              on CommitReject if sameNegotiationAndPartner {
    3.29                  do disable;
    3.30                  go End;
    3.31 @@ -361,7 +364,7 @@
    3.32  
    3.33              on GroupKeys {
    3.34                  do saveGroupKeys;
    3.35 -                do receivedKeysAreGroupKeys;
    3.36 +                do receivedKeysAreDefaultKeys;
    3.37                  do showDeviceAdded;
    3.38                  go Grouped;
    3.39              }
     4.1 --- a/test/src/SuiteMaker.cc	Wed Jun 05 08:33:33 2019 +0200
     4.2 +++ b/test/src/SuiteMaker.cc	Fri Jun 07 07:41:36 2019 +0200
     4.3 @@ -24,7 +24,6 @@
     4.4  #include "NoOwnIdentWritesOnDecryptTests.h"
     4.5  #include "LiteralFilenameTests.h"
     4.6  #include "I18nTests.h"
     4.7 -#include "Message2_1Tests.h"
     4.8  #include "IdentityListTests.h"
     4.9  #include "PgpBinaryTests.h"
    4.10  #include "SubkeyRatingEvalTests.h"
    4.11 @@ -89,7 +88,6 @@
    4.12      "NoOwnIdentWritesOnDecryptTests",
    4.13      "LiteralFilenameTests",
    4.14      "I18nTests",
    4.15 -    "Message2_1Tests",
    4.16      "IdentityListTests",
    4.17      "PgpBinaryTests",
    4.18      "SubkeyRatingEvalTests",
    4.19 @@ -142,7 +140,7 @@
    4.20  };
    4.21  
    4.22  // This file is generated, so magic constants are ok.
    4.23 -int SuiteMaker::num_suites = 62;
    4.24 +int SuiteMaker::num_suites = 61;
    4.25  
    4.26  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    4.27      if (strcmp(test_class_name, "URIAddressTests") == 0)
    4.28 @@ -169,8 +167,6 @@
    4.29          *test_suite = new LiteralFilenameTests(test_class_name, test_home);
    4.30      else if (strcmp(test_class_name, "I18nTests") == 0)
    4.31          *test_suite = new I18nTests(test_class_name, test_home);
    4.32 -    else if (strcmp(test_class_name, "Message2_1Tests") == 0)
    4.33 -        *test_suite = new Message2_1Tests(test_class_name, test_home);
    4.34      else if (strcmp(test_class_name, "IdentityListTests") == 0)
    4.35          *test_suite = new IdentityListTests(test_class_name, test_home);
    4.36      else if (strcmp(test_class_name, "PgpBinaryTests") == 0)