More cleanup, especially in EncryptedFile

For EncryptedFile:
- JSON converter bodies moved away to .cpp;
- instead of C-style casts, reinterpret_cast is used to convert from
  (const) char* to (const) unsigned char*;
- the size for the target plain text takes into account the case where
  the cipher block size can be larger than 1 (after reading
  https://www.openssl.org/docs/man1.1.1/man3/EVP_DecryptUpdate.html).
- file decryption is wrapped in #ifdef Quotient_E2EE_ENABLED, to avoid
  OpenSSL linking errors when compiling without E2EE.

1 files changed, 6 insertions, 34 deletions

diff --git a/lib/events/encryptedfile.h b/lib/events/encryptedfile.h
index 43bafc49..0558563f 100644
--- a/lib/events/encryptedfile.h
+++ b/lib/events/encryptedfile.h
@@ -49,42 +49,14 @@ public:
 };
 
 template <>
-struct JsonObjectConverter<EncryptedFile> {
-    static void dumpTo(QJsonObject& jo, const EncryptedFile& pod)
-    {
-        addParam<>(jo, QStringLiteral("url"), pod.url);
-        addParam<>(jo, QStringLiteral("key"), pod.key);
-        addParam<>(jo, QStringLiteral("iv"), pod.iv);
-        addParam<>(jo, QStringLiteral("hashes"), pod.hashes);
-        addParam<>(jo, QStringLiteral("v"), pod.v);
-    }
-    static void fillFrom(const QJsonObject& jo, EncryptedFile& pod)
-    {
-        fromJson(jo.value("url"_ls), pod.url);
-        fromJson(jo.value("key"_ls), pod.key);
-        fromJson(jo.value("iv"_ls), pod.iv);
-        fromJson(jo.value("hashes"_ls), pod.hashes);
-        fromJson(jo.value("v"_ls), pod.v);
-    }
+struct QUOTIENT_API JsonObjectConverter<EncryptedFile> {
+    static void dumpTo(QJsonObject& jo, const EncryptedFile& pod);
+    static void fillFrom(const QJsonObject& jo, EncryptedFile& pod);
 };
 
 template <>
-struct JsonObjectConverter<JWK> {
-    static void dumpTo(QJsonObject& jo, const JWK& pod)
-    {
-        addParam<>(jo, QStringLiteral("kty"), pod.kty);
-        addParam<>(jo, QStringLiteral("key_ops"), pod.keyOps);
-        addParam<>(jo, QStringLiteral("alg"), pod.alg);
-        addParam<>(jo, QStringLiteral("k"), pod.k);
-        addParam<>(jo, QStringLiteral("ext"), pod.ext);
-    }
-    static void fillFrom(const QJsonObject& jo, JWK& pod)
-    {
-        fromJson(jo.value("kty"_ls), pod.kty);
-        fromJson(jo.value("key_ops"_ls), pod.keyOps);
-        fromJson(jo.value("alg"_ls), pod.alg);
-        fromJson(jo.value("k"_ls), pod.k);
-        fromJson(jo.value("ext"_ls), pod.ext);
-    }
+struct QUOTIENT_API JsonObjectConverter<JWK> {
+    static void dumpTo(QJsonObject& jo, const JWK& pod);
+    static void fillFrom(const QJsonObject& jo, JWK& pod);
 };
 } // namespace Quotient