Browse Source

sync in 3rd device

ENGINE-596
Volker Birk 3 years ago
parent
commit
d72bd3b632
1 changed files with 26 additions and 15 deletions
  1. +26
    -15
      sync/sync.fsm

+ 26
- 15
sync/sync.fsm View File

@ -387,7 +387,7 @@ protocol Sync 1 {
do saveGroupKeys;
do receivedKeysAreDefaultKeys;
do prepareOwnKeys;
send GroupKeys;
send GroupKeysAndClose;
do showDeviceAdded;
go Grouped;
}
@ -418,8 +418,6 @@ protocol Sync 1 {
// Accept is Phase1Commit
on Accept {
do trustThisKey;
send GroupTrustThisKey;
send CommitAcceptForGroup;
go HandshakingGroupedPhase1;
}
@ -437,6 +435,11 @@ protocol Sync 1 {
}
state HandshakingGroupedPhase1 {
on Init {
send GroupTrustThisKey;
send CommitAcceptForGroup;
}
on Rollback if sameNegotiationAndPartner
go Grouped;
@ -450,14 +453,16 @@ protocol Sync 1 {
go Grouped;
}
on GroupTrustThisKey {
on GroupTrustThisKey
do trustThisKey;
if sameNegotiation
go Grouped;
}
on GroupKeys
do saveGroupKeys;
on GroupKeysAndClose {
do saveGroupKeys;
go Grouped;
}
}
state HandshakingGroupedPhase2 {
@ -480,14 +485,16 @@ protocol Sync 1 {
go Grouped;
}
on GroupTrustThisKey {
on GroupTrustThisKey
do trustThisKey;
if sameNegotiation
go Grouped;
}
on GroupKeys
do saveGroupKeys;
on GroupKeysAndClose {
do saveGroupKeys;
go Grouped;
}
}
external Accept 129;
@ -548,23 +555,27 @@ protocol Sync 1 {
field IdentityList ownIdentities;
}
message OwnKeysOfferer 13, security=attach_own_keys {
message GroupKeysAndClose 13, security=attach_own_keys {
field IdentityList ownIdentities;
}
message OwnKeysOfferer 14, security=attach_own_keys {
field IdentityList ownIdentities;
}
message OwnKeysRequester 14, security=attach_own_keys {
message OwnKeysRequester 15, security=attach_own_keys {
field IdentityList ownIdentities;
}
// grouped handshake
message NegotiationRequestGrouped 15, security=untrusted {
message NegotiationRequestGrouped 16, security=untrusted {
field TID challenge;
auto Version version;
field TID negotiation;
field bool is_group;
}
message GroupHandshake 16 {
message GroupHandshake 17 {
field TID negotiation;
field Hash key;
}


Loading…
Cancel
Save