merge: sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Fri, 17 Jan 2020 10:07:44 +0100
branchsync
changeset 4345d277e48a4734
parent 4344 50b88dbb1d05
parent 4343 06dbc8518f5b
child 4346 38fb52d3c608
child 4350 fe4f0b28aa48
merge:
     1.1 --- a/sync/cond_act_sync.yml2	Fri Jan 17 10:07:18 2020 +0100
     1.2 +++ b/sync/cond_act_sync.yml2	Fri Jan 17 10:07:44 2020 +0100
     1.3 @@ -602,3 +602,8 @@
     1.4  ||
     1.5      disable_sync(session);
     1.6  ||
     1.7 +
     1.8 +action resetOwnGroupedKeys
     1.9 +||
    1.10 +
    1.11 +||
     2.1 --- a/sync/sync.fsm	Fri Jan 17 10:07:18 2020 +0100
     2.2 +++ b/sync/sync.fsm	Fri Jan 17 10:07:44 2020 +0100
     2.3 @@ -353,9 +353,6 @@
     2.4                      do trustThisKey;
     2.5              }
     2.6  
     2.7 -            on GroupKeyResetRequired
     2.8 -                send GroupKeyReset;
     2.9 -
    2.10              // this is for a leaving group member
    2.11              on GroupKeyResetRequiredAndDisable {
    2.12                  send InitUnledGroupKeyReset;
    2.13 @@ -368,20 +365,13 @@
    2.14                  send ElectGroupKeyResetLeader;
    2.15                  go WaitForGroupKeyReset;
    2.16              }
    2.17 -
    2.18 -            on GroupKeyReset {
    2.19 -                if fromGroupMember { // double check
    2.20 -                    do saveGroupKeys;
    2.21 -                    do receivedKeysAreDefaultKeys;
    2.22 -                }
    2.23 -            }
    2.24          }
    2.25  
    2.26          state WaitForGroupKeyReset {
    2.27              on ElectGroupKeyResetLeader {
    2.28                  if sameResponse {
    2.29                      // the first one is from us, we're leading this
    2.30 -                    send GroupKeyReset;
    2.31 +                    do resetOwnGroupedKeys;
    2.32                      go Grouped;
    2.33                  }
    2.34                  else {
    2.35 @@ -389,15 +379,6 @@
    2.36                      go Grouped;
    2.37                  }
    2.38              }
    2.39 -
    2.40 -            on GroupKeyReset {
    2.41 -                // safeguard; break this in case there's another reset
    2.42 -                if fromGroupMember { // double check
    2.43 -                    do saveGroupKeys;
    2.44 -                    do receivedKeysAreDefaultKeys;
    2.45 -                }
    2.46 -                go Grouped;
    2.47 -            }
    2.48          }
    2.49  
    2.50          state DisableOnInitUnledGroupKeyReset {
    2.51 @@ -730,13 +711,6 @@
    2.52          message ElectGroupKeyResetLeader 20 {
    2.53              field TID response;
    2.54          }
    2.55 -
    2.56 -        message GroupKeyReset 21, security=attach_own_keys_for_group {
    2.57 -            // set this flag for led group key reset; delivered group keys will
    2.58 -            // be accepted by all group members; if not set group keys will be
    2.59 -            // elected
    2.60 -            field IdentityList ownIdentities;
    2.61 -        }
    2.62      }
    2.63  }
    2.64