From 2ee991e857ea5cceb37cbadc8862771d61661a87 Mon Sep 17 00:00:00 2001 From: alex-z Date: Tue, 4 Jul 2023 18:01:11 +0200 Subject: [PATCH] Fix broken base64 conversions after merge. Signed-off-by: alex-z --- src/libsync/clientsideencryption.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index 13e03e37b4bd..812ce88e598a 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -527,7 +527,7 @@ QByteArray encryptStringAsymmetric(const QSslKey key, const QByteArray &data) const auto publicKeyPem = key.toPem(); BIO_write(publicKeyBio, publicKeyPem.constData(), publicKeyPem.size()); const auto publicKey = ClientSideEncryption::PKey::readPublicKey(publicKeyBio); - return EncryptionHelper::encryptStringAsymmetric(publicKey, data.toBase64()); + return EncryptionHelper::encryptStringAsymmetric(publicKey, data); } QByteArray decryptStringAsymmetric(const QByteArray &privateKeyPem, const QByteArray &data) @@ -543,13 +543,13 @@ QByteArray decryptStringAsymmetric(const QByteArray &privateKeyPem, const QByteA const auto key = ClientSideEncryption::PKey::readPrivateKey(privateKeyBio); // Also base64 decode the result - const auto decryptResult = EncryptionHelper::decryptStringAsymmetric(key, QByteArray::fromBase64(data)); + const auto decryptResult = EncryptionHelper::decryptStringAsymmetric(key, data); if (decryptResult.isEmpty()) { qCDebug(lcCse()) << "ERROR. Could not decrypt data"; return {}; } - return QByteArray::fromBase64(decryptResult); + return decryptResult; } QByteArray encryptStringSymmetric(const QByteArray& key, const QByteArray& data) { @@ -741,9 +741,8 @@ QByteArray encryptStringAsymmetric(EVP_PKEY *publicKey, const QByteArray& data) exit(1); } - // Transform the encrypted data into base64. qCInfo(lcCse()) << out.toBase64(); - return out.toBase64(); + return out; } } @@ -858,7 +857,7 @@ bool ClientSideEncryption::checkPublicKeyValidity(const AccountPtr &account) con BIO_write(privateKeyBio, privateKeyPem.constData(), privateKeyPem.size()); auto key = PKey::readPrivateKey(privateKeyBio); - QByteArray decryptResult = QByteArray::fromBase64(EncryptionHelper::decryptStringAsymmetric( key, QByteArray::fromBase64(encryptedData))); + QByteArray decryptResult = QByteArray::fromBase64(EncryptionHelper::decryptStringAsymmetric(key, encryptedData)); if (data != decryptResult) { qCInfo(lcCse()) << "invalid private key";