... sync
authorVolker Birk <vb@pep-project.org>
Mon, 09 Dec 2019 16:36:46 +0100
branchsync
changeset 42448d4faa88ddcf
parent 4243 37161269898d
child 4247 6bb362f1734e
child 4248 66bea48a09d5
...
sync/cond_act_sync.yml2
sync/sync.fsm
     1.1 --- a/sync/cond_act_sync.yml2	Mon Dec 09 11:56:22 2019 +0100
     1.2 +++ b/sync/cond_act_sync.yml2	Mon Dec 09 16:36:46 2019 +0100
     1.3 @@ -576,5 +576,3 @@
     1.4  ||
     1.5      disable_sync(session);
     1.6  ||
     1.7 -
     1.8 -action ResetGroupKeys;
     2.1 --- a/sync/sync.fsm	Mon Dec 09 11:56:22 2019 +0100
     2.2 +++ b/sync/sync.fsm	Mon Dec 09 16:36:46 2019 +0100
     2.3 @@ -318,19 +318,22 @@
     2.4  
     2.5              on GroupKeyResetRequiredAndDisable {
     2.6                  send InitGroupKeyReset;
     2.7 -                disable;
     2.8 +                go DisableOnInitGroupKeyReset;
     2.9              }
    2.10  
    2.11 -            on InitGroupKeyReset {
    2.12 -                do ResetGroupKeys;
    2.13 +            on InitGroupKeyReset
    2.14                  send GroupKeyReset;
    2.15 -            }
    2.16  
    2.17              on GroupKeyReset {
    2.18  
    2.19              }
    2.20          }
    2.21  
    2.22 +        state DisableOnInitGroupKeyReset {
    2.23 +            on InitGroupKeyReset
    2.24 +                do disable;
    2.25 +        }
    2.26 +
    2.27          // sole device handshaking with group
    2.28          state HandshakingToJoin {
    2.29              on Init
    2.30 @@ -600,10 +603,9 @@
    2.31  
    2.32          // key reset for group
    2.33          message InitGroupKeyReset 18 {
    2.34 -            field IdentityList ownIdentities;
    2.35          }
    2.36  
    2.37 -        message GroupKeyReset 19 {
    2.38 +        message GroupKeyReset 19, security=key_reset {
    2.39              field TID challenge;
    2.40              field IdentityList ownIdentities;
    2.41          }