aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/crypto/qolmsession.cpp.back29
-rw-r--r--lib/crypto/qolmsession.h.back49
2 files changed, 0 insertions, 78 deletions
diff --git a/lib/crypto/qolmsession.cpp.back b/lib/crypto/qolmsession.cpp.back
deleted file mode 100644
index ee8b2a7f..00000000
--- a/lib/crypto/qolmsession.cpp.back
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#include "olm/qolmsession.h"
-
-using namespace Quotient;
-
-std::optional<OlmMessage> fromTypeAndCipthertext(size_t messageType, const QByteArray &ciphertext)
-{
- if (messageType == OLM_MESSAGE_TYPE_PRE_KEY) {
- return PreKeyMessage { ciphertext };
- } else if (messageType == OLM_MESSAGE_TYPE_MESSAGE) {
- return QOlmMessage { ciphertext };
- }
- return std::nullopt;
-}
-
-std::pair<OlmMessageType, QByteArray> toPair(const OlmMessage &message)
-{
- return std::visit([](auto &arg) {
- using T = std::decay_t<decltype(arg)>;
- if constexpr (std::is_same_v<T, QOlmMessage>) {
- return std::make_pair<OlmMessageType, QByteArray>(MessageType, QByteArray(arg.message));
- } else if constexpr (std::is_same_v<T, PreKeyMessage>) {
- return std::make_pair<OlmMessageType, QByteArray>(PreKeyType, QByteArray(arg.message));
- }
- }, message);
-}
diff --git a/lib/crypto/qolmsession.h.back b/lib/crypto/qolmsession.h.back
deleted file mode 100644
index cbba5cef..00000000
--- a/lib/crypto/qolmsession.h.back
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include "olm/e2ee.h"
-#include "olm/olm.h"
-#include "olm/errors.h"
-#include <variant>
-
-namespace Quotient {
-
-//! An encrypted Olm message.
-struct QOlmMessage {
- QByteArray message;
-};
-
-//! A encrypted Olm pre-key message.
-//!
-//! This message, unlike a normal Message, can be used to create new Olm sessions.
-struct PreKeyMessage
-{
- QByteArray message;
-};
-
-enum OlmMessageType
-{
- PreKeyType,
- MessageType,
-};
-
-using OlmMessage = std::variant<QOlmMessage, PreKeyMessage>;
-
-std::optional<OlmMessage> fromTypeAndCipthertext(size_t messageType, const QByteArray &ciphertext);
-
-std::pair<OlmMessageType, QByteArray> toPair(const OlmMessage &message);
-
-//class QOlmSession
-//{
-// /// Creates an inbound session for sending/receiving messages from a received 'prekey' message.
-// static std::variant<std::unique_ptr<QOlmSession>, OlmError> createInboundSession(const QOlmAccount &account,
-// PreKeyMessage &message);
-//
-////private:
-// //static std::variant<std::unique_ptr<QOlmSession>, OlmError> createSessionWith(std::function<std::variant<size_t(OlmSession *)>> func);
-//}
-
-}