analogous for grouped sync
authorVolker Birk <vb@pep-project.org>
Sun, 14 Apr 2019 15:34:10 +0200
branchsync
changeset 352184b54c7ef0b5
parent 3520 cff778fa5330
child 3522 c8e3e531d40a
analogous for grouped
sync/sync.fsm
     1.1 --- a/sync/sync.fsm	Sun Apr 14 15:15:07 2019 +0200
     1.2 +++ b/sync/sync.fsm	Sun Apr 14 15:34:10 2019 +0200
     1.3 @@ -337,13 +337,11 @@
     1.4          }
     1.5  
     1.6          state JoinGroup {
     1.7 -            on Init {
     1.8 -                // first send own keys
     1.9 +            on Init
    1.10                  send GroupKeys;
    1.11 -            }
    1.12  
    1.13              on GroupKeysAndClose {
    1.14 -                do saveGroupKeys; // then store new group keys
    1.15 +                do saveGroupKeys;
    1.16                  do receivedKeysAreGroupKeys;
    1.17                  go Grouped;
    1.18              }
    1.19 @@ -379,7 +377,7 @@
    1.20              }
    1.21  
    1.22              on CommitAccept if sameTransaction
    1.23 -                go HandshakingGroupedPhase1Own;
    1.24 +                go HandshakingGroupedPhase2;
    1.25  
    1.26              on GroupKeys
    1.27                  do saveGroupKeys;
    1.28 @@ -401,7 +399,7 @@
    1.29                  do saveGroupKeys;
    1.30          }
    1.31  
    1.32 -        state HandshakingGroupedPhase1Own {
    1.33 +        state HandshakingGroupedPhase2 {
    1.34              on Cancel {
    1.35                  send Rollback;
    1.36                  go Grouped;
    1.37 @@ -461,11 +459,13 @@
    1.38              field TID transaction;
    1.39          }
    1.40  
    1.41 +        // security=attach_own_keys implies security=trusted
    1.42          message GroupKeysAndClose 9, security=attach_own_keys {
    1.43              field TID transaction;
    1.44              field IdentityList ownIdentities;
    1.45          }
    1.46  
    1.47 +        // security=attach_own_keys implies security=trusted
    1.48          message GroupKeys 10, security=attach_own_keys {
    1.49              field IdentityList ownIdentities;
    1.50          }