From dcec6832e81b7b972cf7fd85dc7c2efd5464908e Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 13 Jun 2025 10:01:07 +0200 Subject: [PATCH 2/4] Fix typo in outputIsBase64Encoded -- * src/{qgpgmesignjob.cpp,qgpgmesignencryptjob.cpp,qgpgmeencryptjob.cpp}: Replace bsse with base in outputIsBase64Encoded --- src/qgpgmeencryptjob.cpp | 10 +++++----- src/qgpgmesignencryptjob.cpp | 10 +++++----- src/qgpgmesignjob.cpp | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/qgpgmeencryptjob.cpp b/src/qgpgmeencryptjob.cpp index 7e15eea..041edda 100644 --- a/src/qgpgmeencryptjob.cpp +++ b/src/qgpgmeencryptjob.cpp @@ -97,11 +97,11 @@ void QGpgMEEncryptJob::setOutputIsBase64Encoded(bool on) static QGpgMEEncryptJob::result_type encrypt(Context *ctx, QThread *thread, const std::vector &recipients, const std::weak_ptr &plainText_, const std::weak_ptr &cipherText_, const Context::EncryptionFlags eflags, - bool outputIsBsse64Encoded, + bool outputIsBase64Encoded, Data::Encoding inputEncoding, const QString &fileName) { const std::shared_ptr plainText = plainText_.lock(); @@ -125,11 +125,11 @@ static QGpgMEEncryptJob::result_type encrypt(Context *ctx, QThread *thread, if (!cipherText) { QGpgME::QByteArrayDataProvider out; Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const EncryptionResult res = ctx->encrypt(recipients, indata, outdata, eflags); Error ae; @@ -137,11 +137,11 @@ static QGpgMEEncryptJob::result_type encrypt(Context *ctx, QThread *thread, return std::make_tuple(res, out.data(), log, ae); } else { QGpgME::QIODeviceDataProvider out(cipherText); Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const EncryptionResult res = ctx->encrypt(recipients, indata, outdata, eflags); Error ae; @@ -149,18 +149,18 @@ static QGpgMEEncryptJob::result_type encrypt(Context *ctx, QThread *thread, return std::make_tuple(res, QByteArray(), log, ae); } } -static QGpgMEEncryptJob::result_type encrypt_qba(Context *ctx, const std::vector &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded, Data::Encoding inputEncoding, const QString &fileName) +static QGpgMEEncryptJob::result_type encrypt_qba(Context *ctx, const std::vector &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBase64Encoded, Data::Encoding inputEncoding, const QString &fileName) { const std::shared_ptr buffer(new QBuffer); buffer->setData(plainText); if (!buffer->open(QIODevice::ReadOnly)) { assert(!"This should never happen: QBuffer::open() failed"); } - return encrypt(ctx, nullptr, recipients, buffer, std::shared_ptr(), eflags, outputIsBsse64Encoded, inputEncoding, fileName); + return encrypt(ctx, nullptr, recipients, buffer, std::shared_ptr(), eflags, outputIsBase64Encoded, inputEncoding, fileName); } static QGpgMEEncryptJob::result_type encrypt_to_filename(Context *ctx, const std::vector &recipients, const QString &inputFilePath, diff --git a/src/qgpgmesignencryptjob.cpp b/src/qgpgmesignencryptjob.cpp index 769a078..65159f0 100644 --- a/src/qgpgmesignencryptjob.cpp +++ b/src/qgpgmesignencryptjob.cpp @@ -95,11 +95,11 @@ void QGpgMESignEncryptJob::setOutputIsBase64Encoded(bool on) mOutputIsBase64Encoded = on; } static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thread, const std::vector &signers, const std::vector &recipients, const std::weak_ptr &plainText_, - const std::weak_ptr &cipherText_, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded, const QString &fileName) + const std::weak_ptr &cipherText_, const Context::EncryptionFlags eflags, bool outputIsBase64Encoded, const QString &fileName) { const std::shared_ptr &plainText = plainText_.lock(); const std::shared_ptr &cipherText = cipherText_.lock(); const _detail::ToThreadMover ctMover(cipherText, thread); @@ -127,11 +127,11 @@ static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thr if (!cipherText) { QGpgME::QByteArrayDataProvider out; Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const std::pair res = ctx->signAndEncrypt(recipients, indata, outdata, eflags); Error ae; @@ -139,11 +139,11 @@ static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thr return std::make_tuple(res.first, res.second, out.data(), log, ae); } else { QGpgME::QIODeviceDataProvider out(cipherText); Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const std::pair res = ctx->signAndEncrypt(recipients, indata, outdata, eflags); Error ae; @@ -152,18 +152,18 @@ static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thr } } static QGpgMESignEncryptJob::result_type sign_encrypt_qba(Context *ctx, const std::vector &signers, - const std::vector &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded, const QString &fileName) + const std::vector &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBase64Encoded, const QString &fileName) { const std::shared_ptr buffer(new QBuffer); buffer->setData(plainText); if (!buffer->open(QIODevice::ReadOnly)) { assert(!"This should never happen: QBuffer::open() failed"); } - return sign_encrypt(ctx, nullptr, signers, recipients, buffer, std::shared_ptr(), eflags, outputIsBsse64Encoded, fileName); + return sign_encrypt(ctx, nullptr, signers, recipients, buffer, std::shared_ptr(), eflags, outputIsBase64Encoded, fileName); } static QGpgMESignEncryptJob::result_type sign_encrypt_to_filename(Context *ctx, const std::vector &signers, const std::vector &recipients, diff --git a/src/qgpgmesignjob.cpp b/src/qgpgmesignjob.cpp index f94044b..29ff35f 100644 --- a/src/qgpgmesignjob.cpp +++ b/src/qgpgmesignjob.cpp @@ -95,11 +95,11 @@ void QGpgMESignJob::setOutputIsBase64Encoded(bool on) static QGpgMESignJob::result_type sign(Context *ctx, QThread *thread, const std::vector &signers, const std::weak_ptr &plainText_, const std::weak_ptr &signature_, SignatureMode mode, - bool outputIsBsse64Encoded) + bool outputIsBase64Encoded) { const std::shared_ptr plainText = plainText_.lock(); const std::shared_ptr signature = signature_.lock(); @@ -123,11 +123,11 @@ static QGpgMESignJob::result_type sign(Context *ctx, QThread *thread, if (!signature) { QGpgME::QByteArrayDataProvider out; Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const SigningResult res = ctx->sign(indata, outdata, mode); Error ae; @@ -135,11 +135,11 @@ static QGpgMESignJob::result_type sign(Context *ctx, QThread *thread, return std::make_tuple(res, out.data(), log, ae); } else { QGpgME::QIODeviceDataProvider out(signature); Data outdata(&out); - if (outputIsBsse64Encoded) { + if (outputIsBase64Encoded) { outdata.setEncoding(Data::Base64Encoding); } const SigningResult res = ctx->sign(indata, outdata, mode); Error ae; @@ -151,18 +151,18 @@ static QGpgMESignJob::result_type sign(Context *ctx, QThread *thread, static QGpgMESignJob::result_type sign_qba(Context *ctx, const std::vector &signers, const QByteArray &plainText, SignatureMode mode, - bool outputIsBsse64Encoded) + bool outputIsBase64Encoded) { const std::shared_ptr buffer(new QBuffer); buffer->setData(plainText); if (!buffer->open(QIODevice::ReadOnly)) { assert(!"This should never happen: QBuffer::open() failed"); } - return sign(ctx, nullptr, signers, buffer, std::shared_ptr(), mode, outputIsBsse64Encoded); + return sign(ctx, nullptr, signers, buffer, std::shared_ptr(), mode, outputIsBase64Encoded); } static QGpgMESignJob::result_type sign_to_filename(Context *ctx, const std::vector &signers, const QString &inputFilePath, -- 2.51.0