sync/sync.fsm
branchsync
changeset 4244 8d4faa88ddcf
parent 4240 5c4a81487c18
child 4251 cfc3630f93bd
     1.1 --- a/sync/sync.fsm	Mon Dec 09 11:56:22 2019 +0100
     1.2 +++ b/sync/sync.fsm	Mon Dec 09 16:36:46 2019 +0100
     1.3 @@ -318,19 +318,22 @@
     1.4  
     1.5              on GroupKeyResetRequiredAndDisable {
     1.6                  send InitGroupKeyReset;
     1.7 -                disable;
     1.8 +                go DisableOnInitGroupKeyReset;
     1.9              }
    1.10  
    1.11 -            on InitGroupKeyReset {
    1.12 -                do ResetGroupKeys;
    1.13 +            on InitGroupKeyReset
    1.14                  send GroupKeyReset;
    1.15 -            }
    1.16  
    1.17              on GroupKeyReset {
    1.18  
    1.19              }
    1.20          }
    1.21  
    1.22 +        state DisableOnInitGroupKeyReset {
    1.23 +            on InitGroupKeyReset
    1.24 +                do disable;
    1.25 +        }
    1.26 +
    1.27          // sole device handshaking with group
    1.28          state HandshakingToJoin {
    1.29              on Init
    1.30 @@ -600,10 +603,9 @@
    1.31  
    1.32          // key reset for group
    1.33          message InitGroupKeyReset 18 {
    1.34 -            field IdentityList ownIdentities;
    1.35          }
    1.36  
    1.37 -        message GroupKeyReset 19 {
    1.38 +        message GroupKeyReset 19, security=key_reset {
    1.39              field TID challenge;
    1.40              field IdentityList ownIdentities;
    1.41          }