aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt18
-rw-r--r--autotests/testgroupsession.cpp6
-rw-r--r--autotests/testolmaccount.cpp4
-rw-r--r--autotests/testolmsession.cpp2
-rw-r--r--autotests/testolmutility.cpp4
-rw-r--r--lib/connection.cpp4
-rw-r--r--lib/connection.h2
-rw-r--r--lib/converters.cpp2
-rw-r--r--lib/database.cpp6
-rw-r--r--lib/database.h2
-rw-r--r--lib/e2ee/e2ee.h (renamed from lib/crypto/e2ee.h)0
-rw-r--r--lib/e2ee/qolmaccount.cpp (renamed from lib/crypto/qolmaccount.cpp)4
-rw-r--r--lib/e2ee/qolmaccount.h (renamed from lib/crypto/qolmaccount.h)8
-rw-r--r--lib/e2ee/qolmerrors.cpp (renamed from lib/crypto/qolmerrors.cpp)0
-rw-r--r--lib/e2ee/qolmerrors.h (renamed from lib/crypto/qolmerrors.h)0
-rw-r--r--lib/e2ee/qolminboundsession.cpp (renamed from lib/crypto/qolminboundsession.cpp)2
-rw-r--r--lib/e2ee/qolminboundsession.h (renamed from lib/crypto/qolminboundsession.h)4
-rw-r--r--lib/e2ee/qolmmessage.cpp (renamed from lib/crypto/qolmmessage.cpp)0
-rw-r--r--lib/e2ee/qolmmessage.h (renamed from lib/crypto/qolmmessage.h)0
-rw-r--r--lib/e2ee/qolmoutboundsession.cpp (renamed from lib/crypto/qolmoutboundsession.cpp)4
-rw-r--r--lib/e2ee/qolmoutboundsession.h (renamed from lib/crypto/qolmoutboundsession.h)4
-rw-r--r--lib/e2ee/qolmsession.cpp (renamed from lib/crypto/qolmsession.cpp)2
-rw-r--r--lib/e2ee/qolmsession.h (renamed from lib/crypto/qolmsession.h)8
-rw-r--r--lib/e2ee/qolmutility.cpp (renamed from lib/crypto/qolmutility.cpp)2
-rw-r--r--lib/e2ee/qolmutility.h (renamed from lib/crypto/qolmutility.h)2
-rw-r--r--lib/e2ee/qolmutils.cpp (renamed from lib/crypto/qolmutils.cpp)2
-rw-r--r--lib/e2ee/qolmutils.h (renamed from lib/crypto/qolmutils.h)2
-rw-r--r--lib/encryptionmanager.cpp12
-rw-r--r--lib/events/encryptedevent.h2
-rw-r--r--lib/events/encryptionevent.cpp2
-rw-r--r--lib/room.cpp8
31 files changed, 59 insertions, 59 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f886094..a84a70fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,15 +164,15 @@ list(APPEND lib_SRCS
)
if (${PROJECT_NAME}_ENABLE_E2EE)
list(APPEND lib_SRCS
- lib/crypto/qolmaccount.cpp
- lib/crypto/qolmsession.cpp
- lib/crypto/qolminboundsession.cpp
- lib/crypto/qolmoutboundsession.cpp
- lib/crypto/qolmutils.cpp
- lib/crypto/qolmutility.cpp
- lib/crypto/qolmerrors.cpp
- lib/crypto/qolmsession.cpp
- lib/crypto/qolmmessage.cpp
+ lib/e2ee/qolmaccount.cpp
+ lib/e2ee/qolmsession.cpp
+ lib/e2ee/qolminboundsession.cpp
+ lib/e2ee/qolmoutboundsession.cpp
+ lib/e2ee/qolmutils.cpp
+ lib/e2ee/qolmutility.cpp
+ lib/e2ee/qolmerrors.cpp
+ lib/e2ee/qolmsession.cpp
+ lib/e2ee/qolmmessage.cpp
lib/encryptionmanager.cpp
)
endif()
diff --git a/autotests/testgroupsession.cpp b/autotests/testgroupsession.cpp
index ea1bb4a9..afd5ef81 100644
--- a/autotests/testgroupsession.cpp
+++ b/autotests/testgroupsession.cpp
@@ -3,9 +3,9 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "testgroupsession.h"
-#include "crypto/qolminboundsession.h"
-#include "crypto/qolmoutboundsession.h"
-#include "crypto/qolmutils.h"
+#include "e2ee/qolminboundsession.h"
+#include "e2ee/qolmoutboundsession.h"
+#include "e2ee/qolmutils.h"
using namespace Quotient;
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 4fd129b5..22c457aa 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -4,8 +4,8 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "testolmaccount.h"
-#include <crypto/qolmaccount.h>
-#include <crypto/qolmutility.h>
+#include <e2ee/qolmaccount.h>
+#include <e2ee/qolmutility.h>
#include <connection.h>
#include <events/encryptedfile.h>
#include <networkaccessmanager.h>
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index 00d76d4e..41baf8e3 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "crypto/qolmsession.h"
+#include "e2ee/qolmsession.h"
#include "testolmsession.h"
using namespace Quotient;
diff --git a/autotests/testolmutility.cpp b/autotests/testolmutility.cpp
index 2eec7e00..bbf3a055 100644
--- a/autotests/testolmutility.cpp
+++ b/autotests/testolmutility.cpp
@@ -3,8 +3,8 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "testolmutility.h"
-#include "crypto/qolmaccount.h"
-#include "crypto/qolmutility.h"
+#include "e2ee/qolmaccount.h"
+#include "e2ee/qolmutility.h"
using namespace Quotient;
diff --git a/lib/connection.cpp b/lib/connection.cpp
index f344807e..c7591e43 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -38,8 +38,8 @@
#include "jobs/syncjob.h"
#ifdef Quotient_E2EE_ENABLED
-# include "crypto/qolmaccount.h"
-# include "crypto/qolmutils.h"
+# include "e2ee/qolmaccount.h"
+# include "e2ee/qolmutils.h"
#endif // Quotient_E2EE_ENABLED
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
diff --git a/lib/connection.h b/lib/connection.h
index d2347d1d..3a12ec39 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -22,7 +22,7 @@
#include <functional>
#ifdef Quotient_E2EE_ENABLED
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
#endif
Q_DECLARE_METATYPE(Quotient::GetLoginFlowsJob::LoginFlow)
diff --git a/lib/converters.cpp b/lib/converters.cpp
index a3ac44c5..4136940f 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -4,7 +4,7 @@
#include "converters.h"
#include <QVariant>
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
QJsonValue Quotient::JsonConverter<QVariant>::dump(const QVariant& v)
{
diff --git a/lib/database.cpp b/lib/database.cpp
index 153aab31..ec285d22 100644
--- a/lib/database.cpp
+++ b/lib/database.cpp
@@ -10,9 +10,9 @@
#include <QtCore/QDebug>
#include <QtCore/QDir>
-#include "crypto/e2ee.h"
-#include "crypto/qolmsession.h"
-#include "crypto/qolminboundsession.h"
+#include "e2ee/e2ee.h"
+#include "e2ee/qolmsession.h"
+#include "e2ee/qolminboundsession.h"
//TODO: delete room specific data when leaving room
diff --git a/lib/database.h b/lib/database.h
index ed356820..8f8cd6cd 100644
--- a/lib/database.h
+++ b/lib/database.h
@@ -7,7 +7,7 @@
#include <QtSql/QSqlQuery>
#include <QtCore/QVector>
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
namespace Quotient {
class Database : public QObject
diff --git a/lib/crypto/e2ee.h b/lib/e2ee/e2ee.h
index 41cd2878..41cd2878 100644
--- a/lib/crypto/e2ee.h
+++ b/lib/e2ee/e2ee.h
diff --git a/lib/crypto/qolmaccount.cpp b/lib/e2ee/qolmaccount.cpp
index 5c9f5db4..aaf51946 100644
--- a/lib/crypto/qolmaccount.cpp
+++ b/lib/e2ee/qolmaccount.cpp
@@ -5,8 +5,8 @@
#include "qolmaccount.h"
#include "connection.h"
#include "csapi/keys.h"
-#include "crypto/qolmutils.h"
-#include "crypto/qolmutility.h"
+#include "e2ee/qolmutils.h"
+#include "e2ee/qolmutility.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <QDebug>
diff --git a/lib/crypto/qolmaccount.h b/lib/e2ee/qolmaccount.h
index dd461e8b..00afc0e6 100644
--- a/lib/crypto/qolmaccount.h
+++ b/lib/e2ee/qolmaccount.h
@@ -6,10 +6,10 @@
#pragma once
#include "csapi/keys.h"
-#include "crypto/e2ee.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/qolmmessage.h"
-#include "crypto/qolmsession.h"
+#include "e2ee/e2ee.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/qolmmessage.h"
+#include "e2ee/qolmsession.h"
#include <QObject>
struct OlmAccount;
diff --git a/lib/crypto/qolmerrors.cpp b/lib/e2ee/qolmerrors.cpp
index 6db1803c..6db1803c 100644
--- a/lib/crypto/qolmerrors.cpp
+++ b/lib/e2ee/qolmerrors.cpp
diff --git a/lib/crypto/qolmerrors.h b/lib/e2ee/qolmerrors.h
index f8390d2a..f8390d2a 100644
--- a/lib/crypto/qolmerrors.h
+++ b/lib/e2ee/qolmerrors.h
diff --git a/lib/crypto/qolminboundsession.cpp b/lib/e2ee/qolminboundsession.cpp
index 31d699f1..9bf56b6c 100644
--- a/lib/crypto/qolminboundsession.cpp
+++ b/lib/e2ee/qolminboundsession.cpp
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "crypto/qolminboundsession.h"
+#include "e2ee/qolminboundsession.h"
#include <iostream>
#include <cstring>
using namespace Quotient;
diff --git a/lib/crypto/qolminboundsession.h b/lib/e2ee/qolminboundsession.h
index 362e42ba..7d52991c 100644
--- a/lib/crypto/qolminboundsession.h
+++ b/lib/e2ee/qolminboundsession.h
@@ -8,8 +8,8 @@
#include <variant>
#include <memory>
#include "olm/olm.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/e2ee.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/e2ee.h"
namespace Quotient {
diff --git a/lib/crypto/qolmmessage.cpp b/lib/e2ee/qolmmessage.cpp
index 15008b75..15008b75 100644
--- a/lib/crypto/qolmmessage.cpp
+++ b/lib/e2ee/qolmmessage.cpp
diff --git a/lib/crypto/qolmmessage.h b/lib/e2ee/qolmmessage.h
index 52aba78c..52aba78c 100644
--- a/lib/crypto/qolmmessage.h
+++ b/lib/e2ee/qolmmessage.h
diff --git a/lib/crypto/qolmoutboundsession.cpp b/lib/e2ee/qolmoutboundsession.cpp
index bc572ba5..88e6b2e1 100644
--- a/lib/crypto/qolmoutboundsession.cpp
+++ b/lib/e2ee/qolmoutboundsession.cpp
@@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "qolmoutboundsession.h"
-#include "crypto/qolmutils.h"
+#include "e2ee/qolmoutboundsession.h"
+#include "e2ee/qolmutils.h"
using namespace Quotient;
diff --git a/lib/crypto/qolmoutboundsession.h b/lib/e2ee/qolmoutboundsession.h
index 4e06561e..967f563f 100644
--- a/lib/crypto/qolmoutboundsession.h
+++ b/lib/e2ee/qolmoutboundsession.h
@@ -6,8 +6,8 @@
#pragma once
#include "olm/olm.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/e2ee.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/e2ee.h"
#include <memory>
namespace Quotient {
diff --git a/lib/crypto/qolmsession.cpp b/lib/e2ee/qolmsession.cpp
index a0386613..69d8b431 100644
--- a/lib/crypto/qolmsession.cpp
+++ b/lib/e2ee/qolmsession.cpp
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "qolmsession.h"
-#include "crypto/qolmutils.h"
+#include "e2ee/qolmutils.h"
#include "logging.h"
#include <cstring>
#include <QDebug>
diff --git a/lib/crypto/qolmsession.h b/lib/e2ee/qolmsession.h
index 711ca66b..1febfa0f 100644
--- a/lib/crypto/qolmsession.h
+++ b/lib/e2ee/qolmsession.h
@@ -6,10 +6,10 @@
#include <QDebug>
#include <olm/olm.h> // FIXME: OlmSession
-#include "crypto/e2ee.h"
-#include "crypto/qolmmessage.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/qolmaccount.h"
+#include "e2ee/e2ee.h"
+#include "e2ee/qolmmessage.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/qolmaccount.h"
namespace Quotient {
diff --git a/lib/crypto/qolmutility.cpp b/lib/e2ee/qolmutility.cpp
index bb50b4d0..d0684055 100644
--- a/lib/crypto/qolmutility.cpp
+++ b/lib/e2ee/qolmutility.cpp
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "crypto/qolmutility.h"
+#include "e2ee/qolmutility.h"
#include "olm/olm.h"
#include <QDebug>
diff --git a/lib/crypto/qolmutility.h b/lib/e2ee/qolmutility.h
index 5fd28dcc..b360d625 100644
--- a/lib/crypto/qolmutility.h
+++ b/lib/e2ee/qolmutility.h
@@ -6,7 +6,7 @@
#include <QObject>
#include <variant>
-#include "crypto/qolmerrors.h"
+#include "e2ee/qolmerrors.h"
struct OlmUtility;
diff --git a/lib/crypto/qolmutils.cpp b/lib/e2ee/qolmutils.cpp
index cd5ac83c..ce27710d 100644
--- a/lib/crypto/qolmutils.cpp
+++ b/lib/e2ee/qolmutils.cpp
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "crypto/qolmutils.h"
+#include "e2ee/qolmutils.h"
#include <QDebug>
#include <openssl/rand.h>
diff --git a/lib/crypto/qolmutils.h b/lib/e2ee/qolmutils.h
index 8b1c01ce..bbd71332 100644
--- a/lib/crypto/qolmutils.h
+++ b/lib/e2ee/qolmutils.h
@@ -6,7 +6,7 @@
#include <QByteArray>
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
namespace Quotient {
// Convert PicklingMode to key
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index e5fa978f..3d616965 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -6,7 +6,6 @@
#include "encryptionmanager.h"
#include "connection.h"
-#include "crypto/e2ee.h"
#include "events/encryptedfile.h"
#include "database.h"
@@ -16,11 +15,12 @@
#include <QtCore/QStringBuilder>
#include <QtCore/QCryptographicHash>
-#include "crypto/qolmaccount.h"
-#include "crypto/qolmsession.h"
-#include "crypto/qolmmessage.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/qolmutils.h"
+#include "e2ee/e2ee.h"
+#include "e2ee/qolmaccount.h"
+#include "e2ee/qolmsession.h"
+#include "e2ee/qolmmessage.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/qolmutils.h"
#include <functional>
#include <memory>
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 28398827..4cc3bf8e 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -3,7 +3,7 @@
#pragma once
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
#include "roomevent.h"
namespace Quotient {
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index d7bb953a..6272c668 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -4,7 +4,7 @@
#include "encryptionevent.h"
-#include "crypto/e2ee.h"
+#include "e2ee/e2ee.h"
#include <array>
diff --git a/lib/room.cpp b/lib/room.cpp
index 8181f16a..755f677a 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -12,7 +12,6 @@
#include "avatar.h"
#include "connection.h"
#include "converters.h"
-#include "crypto/e2ee.h"
#include "syncdata.h"
#include "user.h"
#include "eventstats.h"
@@ -65,9 +64,10 @@
#include <functional>
#ifdef Quotient_E2EE_ENABLED
-#include "crypto/qolmaccount.h"
-#include "crypto/qolmerrors.h"
-#include "crypto/qolminboundsession.h"
+#include "e2ee/e2ee.h"
+#include "e2ee/qolmaccount.h"
+#include "e2ee/qolmerrors.h"
+#include "e2ee/qolminboundsession.h"
#endif // Quotient_E2EE_ENABLED
#include "database.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:06:55 +0000