From 72e14cb1bdff68dfe0fb61fff0defd6c50dff43c Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sun, 25 Sep 2022 21:37:49 +0200
Subject: QOlmUtility::ed25519Verify: just return bool

It's too easy to incorrectly test the previous return type.

(cherry picked from commit 5904a61c59f0eef00aef07ef998658fd791ff139)
---
 lib/e2ee/qolmaccount.cpp |  3 +--
 lib/e2ee/qolmutility.cpp | 21 +++++----------------
 lib/e2ee/qolmutility.h   |  4 ++--
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/e2ee/qolmaccount.cpp b/lib/e2ee/qolmaccount.cpp
index 7392a9f5..345ab16b 100644
--- a/lib/e2ee/qolmaccount.cpp
+++ b/lib/e2ee/qolmaccount.cpp
@@ -269,8 +269,7 @@ bool Quotient::ed25519VerifySignature(const QString& signingKey,
     QByteArray signingKeyBuf = signingKey.toUtf8();
     QOlmUtility utility;
     auto signatureBuf = signature.toUtf8();
-    return utility.ed25519Verify(signingKeyBuf, canonicalJson, signatureBuf)
-        .value_or(false);
+    return utility.ed25519Verify(signingKeyBuf, canonicalJson, signatureBuf);
 }
 
 QString QOlmAccount::accountId() const { return m_userId % '/' % m_deviceId; }
diff --git a/lib/e2ee/qolmutility.cpp b/lib/e2ee/qolmutility.cpp
index 08c2b699..46f7f4f3 100644
--- a/lib/e2ee/qolmutility.cpp
+++ b/lib/e2ee/qolmutility.cpp
@@ -44,21 +44,10 @@ QString QOlmUtility::sha256Utf8Msg(const QString &message) const
     return sha256Bytes(message.toUtf8());
 }
 
-QOlmExpected<bool> QOlmUtility::ed25519Verify(const QByteArray& key,
-                                              const QByteArray& message,
-                                              const QByteArray& signature)
+bool QOlmUtility::ed25519Verify(const QByteArray& key, const QByteArray& message,
+                                QByteArray signature)
 {
-    QByteArray signatureBuf(signature.length(), '\0');
-    std::copy(signature.begin(), signature.end(), signatureBuf.begin());
-
-    if (olm_ed25519_verify(m_utility, key.data(), key.size(), message.data(),
-                           message.size(), signatureBuf.data(),
-                           signatureBuf.size())
-        == 0)
-        return true;
-
-    auto error = lastErrorCode();
-    if (error == OLM_BAD_MESSAGE_MAC)
-        return false;
-    return error;
+    return olm_ed25519_verify(m_utility, key.data(), key.size(), message.data(),
+                              message.size(), signature.data(), signature.size())
+           == 0;
 }
diff --git a/lib/e2ee/qolmutility.h b/lib/e2ee/qolmutility.h
index 89277385..508767bf 100644
--- a/lib/e2ee/qolmutility.h
+++ b/lib/e2ee/qolmutility.h
@@ -29,8 +29,8 @@ public:
     //! \param key QByteArray The public part of the ed25519 key that signed the message.
     //! \param message QByteArray The message that was signed.
     //! \param signature QByteArray The signature of the message.
-    QOlmExpected<bool> ed25519Verify(const QByteArray &key,
-            const QByteArray &message, const QByteArray &signature);
+    bool ed25519Verify(const QByteArray &key,
+            const QByteArray &message, QByteArray signature);
 
     OlmErrorCode lastErrorCode() const;
     const char* lastError() const;
-- 
cgit v1.2.3