Commit 9e475a6f authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Bump required GPGME version to 1.13.1

MR: !5
parent 57248775
Pipeline #41392 failed with stage
in 10 minutes and 19 seconds
......@@ -17,7 +17,7 @@ set(KF5_MIN_VERSION "5.76.0")
set(KMIME_VERSION "5.15.80")
set(LIBKLEO_VERSION "5.16.41")
set(QT_REQUIRED_VERSION "5.13.0")
set(GPGME_REQUIRED_VERSION "1.11.1")
set(GPGME_REQUIRED_VERSION "1.13.1")
if (WIN32)
set(KF5_WANT_VERSION "5.70.0")
......
......@@ -31,7 +31,6 @@
#include <gpgme++/global.h>
#include <gpgme++/importresult.h>
#include <gpgme++/context.h>
#include <gpgme++/gpgmepp_version.h>
#include <gpgme++/key.h>
#include <gpgme++/keylistresult.h>
......@@ -283,14 +282,9 @@ static QString make_report(const std::vector<ImportResult> &res, const QString &
if (const int n = SUM(numSecretKeysUnchanged))
lines.push_back(normalLine.subs(i18n("Secret keys unchanged:"))
.subs(n).toString());
#if GPGMEPP_VERSION > 0x10A00 // 1.10.0
if (const int n = SUM(numV3KeysSkipped))
lines.push_back(normalLine.subs(i18n("Deprecated PGP-2 keys skipped:"))
.subs(n).toString());
#endif
#undef sum
......
......@@ -38,7 +38,6 @@
#include <gpgme++/key.h>
#include <gpgme++/verificationresult.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/gpgmepp_version.h>
#include <gpgme++/context.h>
#include <gpg-error.h>
......@@ -55,10 +54,6 @@
#include <algorithm>
#include <sstream>
#if GPGMEPP_VERSION > 0x10B01 // > 1.11.1
# define GPGME_HAS_LEGACY_NOMDC
#endif
using namespace Kleo::Crypto;
using namespace Kleo;
using namespace GpgME;
......@@ -450,11 +445,9 @@ static QString formatDecryptionResultOverview(const DecryptionResult &result, co
if (err.isCanceled()) {
return i18n("<b>Decryption canceled.</b>");
}
#ifdef GPGME_HAS_LEGACY_NOMDC
else if (result.isLegacyCipherNoMDC()) {
return i18n("<b>Decryption failed: %1.</b>", i18n("No integrity protection (MDC)."));
}
#endif
else if (!errorString.isEmpty()) {
return i18n("<b>Decryption failed: %1.</b>", errorString.toHtmlEscaped());
} else if (err) {
......@@ -578,7 +571,6 @@ static QString formatDecryptionResultDetails(const DecryptionResult &res, const
return details + QLatin1String("<i>") + i18np("One unknown recipient.", "%1 unknown recipients.", res.numRecipients()) + QLatin1String("</i>");
}
#ifdef GPGME_HAS_LEGACY_NOMDC
if (res.isLegacyCipherNoMDC()) {
details += i18nc("Integrity protection was missing because an old cipher was used.",
"<b>Hint:</b> If this file was encrypted before the year 2003 it is "
......@@ -588,7 +580,6 @@ static QString formatDecryptionResultDetails(const DecryptionResult &res, const
"If you are confident that the file was not manipulated you should re-encrypt it after you have forced the decryption.") +
QStringLiteral("<br/><br/>");
}
#endif
if (!recipients.empty()) {
details += i18np("Recipient:", "Recipients:", res.numRecipients());
......@@ -1100,7 +1091,6 @@ void DecryptVerifyTask::doStart()
try {
QGpgME::DecryptVerifyJob *const job = d->m_backend->decryptVerifyJob();
#ifdef GPGME_HAS_LEGACY_NOMDC
if (d->m_ignoreMDCError) {
qCDebug(KLEOPATRA_LOG) << "Modifying job to ignore MDC errors.";
auto ctx = QGpgME::Job::context(job);
......@@ -1113,7 +1103,6 @@ void DecryptVerifyTask::doStart()
}
}
}
#endif
kleo_assert(job);
d->registerJob(job);
ensureIOOpen(d->m_input->ioDevice().get(), d->m_output->ioDevice().get());
......
......@@ -24,7 +24,6 @@
#include <Libkleo/Classify>
#include <gpgme++/key.h>
#include <gpgme++/gpgmepp_version.h>
#include <gpgme++/decryptionresult.h>
#include <KLocalizedString>
......@@ -38,10 +37,6 @@
#include <KGuiItem>
#include <KColorScheme>
#if GPGMEPP_VERSION > 0x10B01 // > 1.11.1
# define GPGME_HAS_LEGACY_NOMDC
#endif
using namespace Kleo;
using namespace Kleo::Crypto;
using namespace Kleo::Crypto::Gui;
......@@ -128,9 +123,7 @@ void ResultItemWidget::Private::addIgnoreMDCButton(QBoxLayout *lay)
}
const auto decResult = dvResult->decryptionResult();
#ifdef GPGME_HAS_LEGACY_NOMDC
if (decResult.isNull() || !decResult.error() || !decResult.isLegacyCipherNoMDC())
#endif
{
return;
}
......
......@@ -41,7 +41,6 @@
#include <QGpgME/CryptoConfig>
#include <gpgme++/global.h>
#include <gpgme++/gpgmepp_version.h>
#include <gpgme++/keygenerationresult.h>
#include <gpgme++/context.h>
......
......@@ -38,7 +38,6 @@
#include <Libkleo/KeyCache>
#include <Libkleo/Formatting>
#include <gpgme++/gpgmepp_version.h>
#include <gpgme++/data.h>
#include <gpgme++/context.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment