aboutsummaryrefslogtreecommitdiff
path: root/lib/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/qolmaccount.cpp6
-rw-r--r--lib/crypto/qolmaccount.h2
-rw-r--r--lib/crypto/qolmoutboundsession.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/crypto/qolmaccount.cpp b/lib/crypto/qolmaccount.cpp
index 8b964c9f..9368de4f 100644
--- a/lib/crypto/qolmaccount.cpp
+++ b/lib/crypto/qolmaccount.cpp
@@ -243,10 +243,10 @@ DeviceKeys QOlmAccount::deviceKeys() const
UploadKeysJob *QOlmAccount::createUploadKeyRequest(const OneTimeKeys &oneTimeKeys)
{
- auto deviceKeys = deviceKeys();
+ auto keys = deviceKeys();
if (oneTimeKeys.curve25519().isEmpty()) {
- return new UploadKeysJob(deviceKeys);
+ return new UploadKeysJob(keys);
}
// Sign & append the one time keys.
@@ -256,7 +256,7 @@ UploadKeysJob *QOlmAccount::createUploadKeyRequest(const OneTimeKeys &oneTimeKey
oneTimeKeysSigned[keyId] = QVariant::fromValue(key);
}
- return new UploadKeysJob(deviceKeys, oneTimeKeysSigned);
+ return new UploadKeysJob(keys, oneTimeKeysSigned);
}
std::variant<std::unique_ptr<QOlmSession>, QOlmError> QOlmAccount::createInboundSession(const QOlmMessage &preKeyMessage)
diff --git a/lib/crypto/qolmaccount.h b/lib/crypto/qolmaccount.h
index c93a8354..f3ca82f0 100644
--- a/lib/crypto/qolmaccount.h
+++ b/lib/crypto/qolmaccount.h
@@ -73,7 +73,7 @@ public:
UploadKeysJob *createUploadKeyRequest(const OneTimeKeys &oneTimeKeys);
- DeviceKeys getDeviceKeys() const;
+ DeviceKeys deviceKeys() const;
//! Remove the one time key used to create the supplied session.
[[nodiscard]] std::optional<QOlmError> removeOneTimeKeys(const std::unique_ptr<QOlmSession> &session) const;
diff --git a/lib/crypto/qolmoutboundsession.h b/lib/crypto/qolmoutboundsession.h
index 201a178a..4e06561e 100644
--- a/lib/crypto/qolmoutboundsession.h
+++ b/lib/crypto/qolmoutboundsession.h
@@ -26,7 +26,7 @@ public:
std::variant<QByteArray, QOlmError> pickle(const PicklingMode &mode);
//! Deserialises from encrypted Base64 that was previously obtained by
//! pickling a `QOlmOutboundGroupSession`.
- static std::variant<std::unique_ptr<QOlmOutboundGroupSession>, QOlmError> unpickle(const QByteArray &pickled, const PicklingMode &mode);
+ static std::variant<std::unique_ptr<QOlmOutboundGroupSession>, QOlmError> unpickle(QByteArray &pickled, const PicklingMode &mode);
//! Encrypts a plaintext message using the session.
std::variant<QByteArray, QOlmError> encrypt(const QString &plaintext);