diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-12-28 22:15:51 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-01-05 09:53:07 +0100 |
| commit | 78dae8b20b85686d1a642415195d2e10fbb2dc1f (patch) | |
| tree | 142169646335e00edf4d260944d98bdc0d4be3db /xmlsecurity | |
| parent | 568a5bba2a30ab588b52677106bf209d4c0df758 (diff) | |
Update gpgme to 1.16.0
* remove GPGME_CAN_EXPORT_MINIMAL_KEY, upstream now has support for
key export flags in c++ wrapper (gpgmepp >= 1.14)
* therefore, external/gpgmepp/add-minimal-keyexport.patch now fully
obsolete, tweaked xmlsecurity code to use upstream function
* bits of external/gpgmepp/find-libgpg-error-libassuan.patch are
upstream now (configure and makefile pieces, though we keep
configure.ac changes for the while - to not pick up system versions
too easily)
* external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1
was from upstream anyway, removed
Change-Id: I991c20c0eeff0f9135e97c991afcb905be55a959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127665
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/gpg/CertificateImpl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx index 523c2d6d959c..a0a08fc807a8 100644 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx @@ -215,10 +215,9 @@ void CertificateImpl::setCertificate(GpgME::Context* ctx, const GpgME::Key& key) ctx->setArmor(false); // caller will base64-encode anyway GpgME::Error err = ctx->exportPublicKeys( key.primaryFingerprint(), - data_out -#if GPGME_CAN_EXPORT_MINIMAL_KEY - , officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get() -#endif + data_out, + officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get() + ? GpgME::Context::ExportMinimal : 0 ); if (err) |