Merge #682(tobias): Fix session verification

quotient-im · Jul 18, 2023 · 035daed · 035daed
2 parents 0e10076 + 485b9a3
commit 035daed
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/Quotient/keyverificationsession.cpp b/Quotient/keyverificationsession.cpp
@@ -108,6 +108,16 @@ void KeyVerificationSession::handleEvent(const KeyVerificationEvent& baseEvent)
             [this](const KeyVerificationAcceptEvent& event) {
                 if (state() != WAITINGFORACCEPT)
                     return false;
+                const auto& theirMac = event.messageAuthenticationCode();
+                for (const auto& mac : SupportedMacs) {
+                    if (mac == theirMac) {
+                        m_commonMacCodes.push_back(theirMac);
+                    }
+                }
+                if (m_commonMacCodes.isEmpty()) {
+                    cancelVerification(UNKNOWN_METHOD);
+                    return false;
+                }
                 m_commitment = event.commitment();
                 sendKey();
                 setState(WAITINGFORKEY);