aboutsummaryrefslogtreecommitdiff
path: root/lib/e2ee/e2ee.h
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-06-01 10:08:00 +0200
committerGitHub <noreply@github.com>2022-06-01 10:08:00 +0200
commit6c735f9f55b936e9de1497c2f5896f0a018d4227 (patch)
treefccc042d6af708ddf0d540ea1166e8ae68365ecb /lib/e2ee/e2ee.h
parent49b0d191ab8917c61b28da3cfeaf1d28c143d5c8 (diff)
parentcd442611b19ec4a438d0847bf09b7bca99b494d3 (diff)
downloadlibquotient-6c735f9f55b936e9de1497c2f5896f0a018d4227.tar.gz
libquotient-6c735f9f55b936e9de1497c2f5896f0a018d4227.zip
#554: Fix update-api jobs
Diffstat (limited to 'lib/e2ee/e2ee.h')
-rw-r--r--lib/e2ee/e2ee.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/e2ee/e2ee.h b/lib/e2ee/e2ee.h
index 8e433d60..f97eb27a 100644
--- a/lib/e2ee/e2ee.h
+++ b/lib/e2ee/e2ee.h
@@ -70,15 +70,12 @@ struct IdentityKeys
};
//! Struct representing the one-time keys.
-struct QUOTIENT_API OneTimeKeys
+struct QUOTIENT_API UnsignedOneTimeKeys
{
QHash<QString, QHash<QString, QString>> keys;
//! Get the HashMap containing the curve25519 one-time keys.
- QHash<QString, QString> curve25519() const;
-
- //! Get a reference to the hashmap corresponding to given key type.
-// std::optional<QHash<QString, QString>> get(QString keyType) const;
+ QHash<QString, QString> curve25519() const { return keys[Curve25519Key]; }
};
//! Struct representing the signed one-time keys.
@@ -93,7 +90,6 @@ public:
QHash<QString, QHash<QString, QString>> signatures;
};
-
template <>
struct JsonObjectConverter<SignedOneTimeKey> {
static void fillFrom(const QJsonObject& jo, SignedOneTimeKey& result)
@@ -109,6 +105,8 @@ struct JsonObjectConverter<SignedOneTimeKey> {
}
};
+using OneTimeKeys = QHash<QString, std::variant<QString, SignedOneTimeKey>>;
+
template <typename T>
class asKeyValueRange
{