diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-12-04 15:19:51 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-12-04 18:29:45 +0200 |
| commit | 2328252358fd2eaed810a02c4f791919ebe7be21 (patch) | |
| tree | d4ff2b2a0628b0d4668676f5b8dff03eb2ff9fc8 | |
| parent | 23580312c7b26f64076c84132156d6cf8b6d3bbe (diff) | |
Fix compiler warnings on crypto side
Was getting warnings on protected QMailCryptoGPGME::decrypt() hiding
the base class virtual method for the same name. Just renamed
the method to avoid that.
QCryptographicHash::addData() was warning about deprecated method, but
we don't even need to use the variant with length. The data is already
a QByteArray.
Change-Id: I6793536c1fede91820127d4a6edd03cffec1c636
Reviewed-by: Damien Caliste <dcaliste@free.fr>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: <matti.viljanen@kapsi.fi>
| -rw-r--r-- | src/plugins/crypto/common/qgpgme.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/crypto/common/qgpgme.h | 2 | ||||
| -rw-r--r-- | src/plugins/crypto/gpgme/gpgmeplugin.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/crypto/common/qgpgme.cpp b/src/plugins/crypto/common/qgpgme.cpp index 735a1323..a1fb18ed 100644 --- a/src/plugins/crypto/common/qgpgme.cpp +++ b/src/plugins/crypto/common/qgpgme.cpp @@ -299,7 +299,7 @@ QMailCrypto::SignatureResult QMailCryptoGPGME::getSignature(const QByteArray &me // For testing purpose, just creating a md5 of data // and use this as signature data. QCryptographicHash md5(QCryptographicHash::Md5); - md5.addData(mess, strlen(mess)); + md5.addData(mess); result = md5.result().toHex(); micalg = "pgp-md5"; @@ -448,8 +448,7 @@ static QMailCrypto::CryptResult toCryptResult(gpgme_error_t err) } } -QMailCrypto::CryptResult QMailCryptoGPGME::decrypt(const QByteArray &encData, - QByteArray &decData) const +QMailCrypto::CryptResult QMailCryptoGPGME::decryptData(const QByteArray &encData, QByteArray &decData) const { GPGmeContext ctx(m_protocol); if (!ctx) { diff --git a/src/plugins/crypto/common/qgpgme.h b/src/plugins/crypto/common/qgpgme.h index b2c3709b..69b94415 100644 --- a/src/plugins/crypto/common/qgpgme.h +++ b/src/plugins/crypto/common/qgpgme.h @@ -68,7 +68,7 @@ protected: const QByteArray &messageData, QList<QMailCrypto::KeyResult> &keyResults) const; - QMailCrypto::CryptResult decrypt(const QByteArray &encData, QByteArray &decData) const; + QMailCrypto::CryptResult decryptData(const QByteArray &encData, QByteArray &decData) const; private: QMailCrypto::SignatureResult getSignature(const QByteArray &message, diff --git a/src/plugins/crypto/gpgme/gpgmeplugin.cpp b/src/plugins/crypto/gpgme/gpgmeplugin.cpp index 0b8f9b34..7f7a037e 100644 --- a/src/plugins/crypto/gpgme/gpgmeplugin.cpp +++ b/src/plugins/crypto/gpgme/gpgmeplugin.cpp @@ -133,7 +133,7 @@ QMailCrypto::DecryptionResult QMailCryptoGPG::decrypt(QMailMessagePartContainer QByteArray decData; QMailCrypto::DecryptionResult result; result.engine = QStringLiteral("libgpgme.so"); - result.status = QMailCryptoGPGME::decrypt(body.body().data(QMailMessageBody::Decoded), decData); + result.status = decryptData(body.body().data(QMailMessageBody::Decoded), decData); if (result.status == QMailCrypto::Decrypted) { const QMailMessage mail = QMailMessage::fromRfc2822(decData); |