diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2022-06-12 19:09:07 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2022-06-12 19:09:07 +0200 |
| commit | 62b3b461ec59b9b3ecd47d92b036d403359d229d (patch) | |
| tree | 89c8e93628e19647a8b8d20d50f2096e84d6fc89 /src/encryption/DeviceVerificationFlow.h | |
| parent | Properly handle glare when verifying (diff) | |
| download | nheko-62b3b461ec59b9b3ecd47d92b036d403359d229d.tar.xz | |
Fix comparison for glare algorithm
Diffstat (limited to '')
| -rw-r--r-- | src/encryption/DeviceVerificationFlow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/encryption/DeviceVerificationFlow.h b/src/encryption/DeviceVerificationFlow.h index e980d2ec..1955fab3 100644 --- a/src/encryption/DeviceVerificationFlow.h +++ b/src/encryption/DeviceVerificationFlow.h @@ -37,7 +37,7 @@ using sas_ptr = std::unique_ptr<mtx::crypto::SAS>; * && | n | | | * no canonical_json | a | (m.key.verification.start) | | waitingForKeys * | l |<--------------------------------| Not sending to prevent the glare resolve| && no commitment - * | | | | && no canonical_json + * | | | (1) | && no canonical_json * | | m.key.verification.start | | * waitForOtherAccept | |-------------------------------->| (IF NOT ALREADY ASKED, | * && | | | ASK FOR VERIFICATION REQUEST) | promptStartVerify, if not accepted @@ -57,6 +57,9 @@ using sas_ptr = std::unique_ptr<mtx::crypto::SAS>; * | | | | * success/fail | | m.key.verification.done | | success/fail * | |<------------------------------->| | + * + * (1) Sometimes the other side does send this start. In this case we run the glare algorithm and send an accept only if + * We are the bigger mxid and deviceid (since we discard our start message). <- GLARE RESOLUTION */ // clang-format on class DeviceVerificationFlow : public QObject |