开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:gpgme.spec Changed

@@ -1,10 +1,10 @@
 Name:           gpgme
-Version:        1.16.0
-Release:        1
+Version:        1.17.0
+Release:        3
 Summary:        GnuPG Made Easy
 License:        GPLv2+ and LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
-Source0:        ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
+Source0:        https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2
 
 # upstream patches
 # Don't add extra libs/cflags in gpgme-config/cmake equivalent
@@ -13,9 +13,8 @@
 Patch1:         gpgme-1.3.2-largefile.patch
 # Let's fix stupid AX_PYTHON_DEVEL
 Patch2:         0001-fix-stupid-ax_python_devel.patch
-Patch3:         backport-core-Support-closefrom-also-for-glibc.patch
 # support python3.10
-Patch4:         gpgme-Add-support-for-building-with-Python3.10.patch
+Patch3:         gpgme-Add-support-for-building-with-Python3.10.patch
 
 BuildRequires:  autoconf automake gcc gcc-c++ gawk gnupg2 >= 2.2.24
 BuildRequires:  libgpg-error-devel >= 1.36 libassuan-devel >= 2.4.2
@@ -85,23 +84,32 @@
 %autosetup -n %{name}-%{version} -p1
 
 %build
+# Generate the same python dir as in the %%install
+export SETUPTOOLS_USE_DISTUTILS=stdlib
 %configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python
 %make_build
 
 %install
+# python-setuptools >= v60.0.0 changes the SETUPTOOLS_USE_DISTUTILS default value to local,
+# it does't use Python's standard library distutils default.
+# As a result, failed to build gpgme.
+# Now, set SETUPTOOLS_USE_DISTUTILS value to stdlib
+export SETUPTOOLS_USE_DISTUTILS=stdlib
 %make_install
 
 chrpath -d  $(find %{buildroot} -name gpgme-json)
 
 # Delete unpackaged files
 rm -fv %{buildroot}%{_infodir}/dir
-rm -fv %{buildroot}%{_libdir}/{lib*.la,pkgconfig/gpgme*.pc}
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 chrpath -d %{buildroot}%{_bindir}/%{name}-tool
 chrpath -d %{buildroot}%{_libdir}/lib%{name}pp.so*
 chrpath -d %{buildroot}%{_libdir}/libq%{name}.so*
 
 %check
+# Generate the same python dir as in the %%install
+export SETUPTOOLS_USE_DISTUTILS=stdlib
 make check
 
 %ldconfig_scriptlets
@@ -140,13 +148,37 @@
 %{_includedir}/{%{name}.h,%{name}++/,q%{name}/,QGpgME/}
 %{_libdir}/{lib%{name}.so,lib%{name}pp.so,cmake/Gpgmepp/,libq%{name}.so,cmake/QGpgme/}
 %{_datadir}/aclocal/%{name}.m4
-
+%{_libdir}/pkgconfig/%{name}*.pc
 %files help
 %defattr(-,root,root)
 %{_infodir}/%{name}.info*
 
 
 %changelog
+* Sat May 13 2023 yixiangzhike <yixiangzhike007@163.com> - 1.17.0-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Fix the failure of testcase when building with python-setuptools>=66.0.0
+
+* Mon Apr 10 2023 lilong <lilong@kylinos.cn> - 1.17.0-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Add gpgme.pc file
+
+* Wed Aug 3 2022 yixiangzhike <yixiangzhike007@163.com> - 1.17.0-1
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:update to 1.17.0
+
+* Tue Jul 26 2022 yixiangzhike <yixiangzhike007@163.com> - 1.16.0-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix the gpgme build failure issue
+
 * Mon Jan 24 2022 yixiangzhike <yixiangzhike007@163.com> - 1.16.0-1
 - Type:bugfix
 - CVE:NA

_service:tar_scm:backport-core-Support-closefrom-also-for-glibc.patch Deleted

@@ -1,32 +0,0 @@
-From 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e Mon Sep 17 00:00:00 2001
-From: Jiri Kucera <sanczes@gmail.com>
-Date: Sun, 25 Jul 2021 11:35:54 +0200
-Subject: PATCH core: Support closefrom also for glibc.
-
-* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom.
---
-
-Since 2.34, glibc introduces closefrom (the implementation
-follows *BSD standard).
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- src/posix-io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/posix-io.c b/src/posix-io.c
-index e712ef2..2a3a81f 100644
---- a/src/posix-io.c
-+++ b/src/posix-io.c
-@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv, unsigned int flags,
-               if (fd_listi.fd > fd)
-                 fd = fd_listi.fd;
-             fd++;
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__)
-             closefrom (fd);
-             max_fds = fd;
- #else /*!__sun */
--- 
-1.8.3.1
-

_service Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmesecretkeyexportjob.cpp Deleted

@@ -1,147 +0,0 @@
-/*
-    qgpgmesecretexportjob.cpp
-
-    This file is part of qgpgme, the Qt API binding for gpgme
-    Copyright (c) 2004 Klarävdalens Datakonsult AB
-    Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
-    Software engineering by Intevation GmbH
-
-    QGpgME is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    QGpgME is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
-    combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
-    your version of the file, but you are not obligated to do so.  If
-    you do not wish to do so, delete this exception statement from
-    your version.
-*/
-
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
-#include "qgpgmesecretkeyexportjob.h"
-
-#include <QDebug>
-#include "qgpgme_debug.h"
-
-#include "context.h"
-#include "data.h"
-
-#include <QStringList>
-
-#include <gpg-error.h>
-
-#include <string.h>
-#include <assert.h>
-
-QGpgME::QGpgMESecretKeyExportJob::QGpgMESecretKeyExportJob(bool armour, const QString &charset)
-    : ExportJob(nullptr),
-      mProcess(nullptr),
-      mError(0),
-      mArmour(armour),
-      mCharset(charset)
-{
-
-}
-
-QGpgME::QGpgMESecretKeyExportJob::~QGpgMESecretKeyExportJob()
-{
-
-}
-
-GpgME::Error QGpgME::QGpgMESecretKeyExportJob::start(const QStringList &patterns)
-{
-    assert(mKeyData.isEmpty());
-
-    if (patterns.size() != 1 || patterns.front().isEmpty()) {
-        deleteLater();
-        return mError = GpgME::Error::fromCode(GPG_ERR_INV_VALUE, GPG_ERR_SOURCE_GPGSM);
-    }
-
-    // create and start gpgsm process:
-    mProcess = new QProcess(this);
-    mProcess->setObjectName(QStringLiteral("gpgsm --export-secret-key-p12"));
-
-    // FIXME: obtain the path to gpgsm from gpgme, so we use the same instance.
-    mProcess->setProgram("gpgsm");
-    QStringList arguments;
-    arguments << QStringLiteral("--export-secret-key-p12");
-    if (mArmour) {
-        arguments << QStringLiteral("--armor");
-    }
-    if (!mCharset.isEmpty()) {
-        arguments << QStringLiteral("--p12-charset") << mCharset;
-    }
-    arguments << QLatin1String(patterns.front().toUtf8());
-
-    mProcess->setArguments(arguments);
-    connect(mProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
-            SLOT(slotProcessExited(int,QProcess::ExitStatus)));
-    connect(mProcess, &QProcess::readyReadStandardOutput,
-            this, &QGpgMESecretKeyExportJob::slotStdout);
-    connect(mProcess, &QProcess::readyReadStandardError,
-            this, &QGpgMESecretKeyExportJob::slotStderr);
-
-    mProcess->start();
-    if (!mProcess->waitForStarted()) {
-        mError = GpgME::Error::fromCode(GPG_ERR_ENOENT, GPG_ERR_SOURCE_GPGSM);   // what else?
-        deleteLater();
-        return mError;
-    } else {
-        return GpgME::Error();
-    }
-}
-
-void QGpgME::QGpgMESecretKeyExportJob::slotCancel()
-{
-    if (mProcess) {
-        mProcess->kill();
-    }
-    mProcess = nullptr;
-    mError = GpgME::Error::fromCode(GPG_ERR_CANCELED, GPG_ERR_SOURCE_GPGSM);
-}
-
-void QGpgME::QGpgMESecretKeyExportJob::slotStdout()
-{
-    QString line = QString::fromLocal8Bit(mProcess->readLine());
-    if (!line.isEmpty()) {
-        return;
-    }
-    const unsigned int oldlen = mKeyData.size();
-    mKeyData.resize(oldlen + line.length());
-    memcpy(mKeyData.data() + oldlen, line.toLatin1(), line.length());
-}
-
-void QGpgME::QGpgMESecretKeyExportJob::slotStderr()
-{
-    // implement? or not?
-}
-
-void QGpgME::QGpgMESecretKeyExportJob::slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus)
-{
-    Q_EMIT done();
-    if (!mError &&
-            (exitStatus != QProcess::NormalExit || exitCode != 0)) {
-        mError = GpgME::Error::fromCode(GPG_ERR_GENERAL, GPG_ERR_SOURCE_GPGSM);
-    }
-    Q_EMIT result(mError, mKeyData);
-    deleteLater();
-}
-#include "qgpgmesecretkeyexportjob.moc"

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmesecretkeyexportjob.h Deleted

@@ -1,82 +0,0 @@
-/*
-    qgpgmesecretkeyexportjob.h
-
-    This file is part of qgpgme, the Qt API binding for gpgme
-    Copyright (c) 2004 Klarälvdalens Datakonsult AB
-    Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
-    Software engineering by Intevation GmbH
-
-    QGpgME is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    QGpgME is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
-    combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
-    your version of the file, but you are not obligated to do so.  If
-    you do not wish to do so, delete this exception statement from
-    your version.
-*/
-
-#ifndef __QGPGME_QGPGMESECRETKEYEXPORTJOB_H__
-#define __QGPGME_QGPGMESECRETKEYEXPORTJOB_H__
-
-#include "exportjob.h"
-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-#include "gpgme++/context.h"
-#endif
-#include <QProcess>
-
-namespace GpgME
-{
-class Data;
-}
-
-namespace QGpgME
-{
-
-class QGpgMESecretKeyExportJob : public ExportJob
-{
-    Q_OBJECT
-public:
-    QGpgMESecretKeyExportJob(bool armour, const QString &charset);
-    ~QGpgMESecretKeyExportJob();
-
-    /* from ExportJob */
-    GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
-    /* from Job */
-    void slotCancel() Q_DECL_OVERRIDE;
-
-    void slotStdout();
-    void slotStderr();
-    void slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus);
-
-private:
-    QProcess *mProcess;
-    QByteArray mKeyData;
-    GpgME::Error mError;
-    bool mArmour;
-    QString mCharset;
-};
-
-}
-
-#endif // __QGPGME_QGPGMESECRETKEYEXPORTJOB_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/ChangeLog -> _service:tar_scm:gpgme-1.17.0.tar.bz2/ChangeLog Changed

@@ -1,3 +1,665 @@
+2022-02-07  Werner Koch  <wk@gnupg.org>
+
+	Release 1.17.0.
+	+ commit 72bb46b34f5191f672a5356e2f152e6ad9440554
+
+
+	qt: Fix build for older Qt versions.
+	+ commit 451a42f0d21c5a402d455c78d63eeaaa139e56cc
+	* lang/qt/src/util.cpp: Include <functional>.
+
+2022-02-03  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	qt: Add job to import keys given by key ids.
+	+ commit ca1c30b6fa29a7a1f18ecda14375b47893a0c1a3
+	* lang/qt/src/receivekeysjob.h, lang/qt/src/qgpgmereceivekeysjob.h,
+	lang/qt/src/qgpgmereceivekeysjob.cpp: New.
+	* lang/qt/src/protocol.h (class Protocol): Add pure virtual member
+	function receiveKeysJob.
+	* lang/qt/src/protocol_p.h (Protocol::receiveKeysJob): Implement it.
+	* lang/qt/src/job.cpp, lang/qt/src/Makefile.am: Update accordingly.
+
+	* lang/qt/tests/run-receivekeysjob.cpp: New.
+	* lang/qt/tests/Makefile.am: Add new test runner.
+
+	qt: Add helper for converting QStringList to vector of strings.
+	+ commit ec8d1ee13fce21a1f52b084212827914dfcd0db6
+	* lang/qt/src/util.h, lang/qt/src/util.cpp: New.
+	* lang/qt/src/Makefile.am (qgpgme_sources, private_qgpgme_headers):
+	Add new files.
+
+	cpp: Allow import of keys given by key ids.
+	+ commit bbaeeb5b9d5cca99c332cb88c7ae5f14e8745427
+	* lang/cpp/src/context.h (class Context): Add overloads of member
+	functions importKeys and startKeyImport
+	* lang/cpp/src/context.cpp (class Context): ... and implement them.
+
+	cpp: Add internal adapter for passing a vector of strings to gpgme.
+	+ commit 3d7810e8d940229435feb8f9811607ee831abf4b
+	* lang/cpp/src/util.h (class StringsToCStrings): New.
+	* lang/cpp/src/util.cpp: New.
+	* lang/cpp/src/Makefile.am: Add new file.
+
+	core: New function gpgme_op_receive_keys.
+	+ commit 3c2cff74b535422532e1256ee8177fa9c03eaf18
+	* src/gpgme.h.in (gpgme_op_receive_keys_start, gpgme_op_receive_keys):
+	New.
+	* src/gpgme.def, src/libgpgme.vers: Add them.
+	* src/engine-backend.h (struct engine_ops): Add arg keyids to field
+	'import'.
+	* src/engine.h, src/engine.c (_gpgme_engine_op_import): Add arg keyids.
+	* src/engine.c (_gpgme_engine_op_import): Forward new arg keyids.
+	* src/import.c: (_gpgme_op_import_start, _gpgme_op_import_keys_start):
+	Pass NULL to new arg of _gpgme_op_import_start.
+	(_gpgme_op_receive_keys_start, gpgme_op_receive_keys_start,
+	gpgme_op_receive_keys): New.
+	* src/engine-gpg.c (gpg_import): Add arg keyids. Extend check for
+	valid arguments. Build command line if keyids are given.
+	* src/engine-gpgsm.c (gpgsm_import): Add arg keyids. Return error if
+	keyids is not NULL.
+
+	tests/run-receive-keys.c: New.
+	tests/Makefile.am (noinst_PROGRAMS): Add new test runner.
+
+2022-01-17  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	qt: Remove superfluous include.
+	+ commit ec71eb1d7d9f1156cc48d1c9959b07981ecd16e5
+	* lang/qt/src/importjob.h: Remove include of QByteArray.
+
+	qt: Fix build without installed GpgME++ headers.
+	+ commit 9c03bde06be97403a8c392a3befc6c203bcdce6d
+	* lang/qt/src/importjob.h, lang/qt/src/wkdlookupresult.h: Include
+	headers of GpgME++ without "gpgme++/" prefix when building QGpgme.
+	* lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmewkdlookupjob.cpp,
+	lang/qt/src/wkdlookupresult.cpp, lang/qt/tests/t-import.cpp: Include
+	headers of GpgME++ without "gpgme++/" prefix.
+
+2022-01-13  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	tests: Fix generation of keys without expiration.
+	+ commit e16729edcbdf2c35e3729b6d54c21b9b27250326
+	* tests/run-genkey.c (parse_expire_string): Support default expiration
+	and no expiration. Set flag for no expiration.
+	(main): Allow update of flags when generating new key.
+
+	tests: Remove unsupported option --status from usage help.
+	+ commit e4625885a851112a15636727388f11146be17f15
+	* tests/run-swdb.c (show_usage): Remove option --status.
+
+	qt: Add job to add existing subkeys to other keys.
+	+ commit 4d913a8aa5dad1327bed5987dada89e9d7c5d292
+	* lang/qt/src/addexistingsubkeyjob.h,
+	lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp,
+	lang/qt/src/qgpgmeaddexistingsubkeyjob.h: New.
+	* lang/qt/src/protocol.h (class Protocol): Add pure virtual member
+	function addExistingSubkeyJob.
+	* lang/qt/src/protocol_p.h (Protocol::addExistingSubkeyJob): Implement.
+	* lang/qt/src/job.cpp, lang/qt/src/Makefile.am: Update accordingly.
+
+	* lang/qt/tests/Makefile.am (the_tests, moc_files, noinst_PROGRAMS):
+	Add new test.
+	(t_addexistingsubkey_SOURCES): New.
+	* lang/qt/tests/t-addexistingsubkey.cpp: New.
+	* lang/qt/tests/t-support.h (VERIFY_OR_RETURN_VALUE,
+	COMPARE_OR_RETURN_VALUE, VERIFY_OR_OBJECT, COMPARE_OR_OBJECT,
+	VERIFY_OR_FALSE, COMPARE_OR_FALSE): New.
+	* lang/qt/tests/t-support.h, lang/qt/tests/t-support.cpp
+	(class QQGpgMETest): New member function importSecretKeys.
+
+	qt,tests: Add helper to hook up the test passphrase provider.
+	+ commit d308910cdfb31accae7cf790a956eb2f3cc6ae71
+	* lang/qt/tests/t-support.h, lang/qt/tests/t-support.cpp
+	(class QGpgMETest): Add member function hookUpPassphraseProvider.
+	Add member mPassphraseProvider.
+	* lang/qt/tests/t-changeexpiryjob.cpp,
+	lang/qt/tests/t-encrypt.cpp,
+	lang/qt/tests/t-remarks.cpp,
+	lang/qt/tests/t-tofuinfo.cpp,
+	lang/qt/tests/t-trustsignatures.cpp,
+	lang/qt/tests/t-various.cpp: Use new helper.
+
+	qt,tests: Add asyncDone signal to base class of all tests.
+	+ commit a54402fc2d1c1364843d3c88b5b07dbb7fc007d1
+	* lang/qt/tests/t-support.h (class QGpgMETest): Add signal asyncDone.
+	* lang/qt/tests/t-changeexpiryjob.cpp,
+	lang/qt/tests/t-encrypt.cpp,
+	lang/qt/tests/t-import.cpp,
+	lang/qt/tests/t-keylist.cpp,
+	lang/qt/tests/t-keylocate.cpp,
+	lang/qt/tests/t-ownertrust.cpp,
+	lang/qt/tests/t-remarks.cpp,
+	lang/qt/tests/t-tofuinfo.cpp,
+	lang/qt/tests/t-trustsignatures.cpp,
+	lang/qt/tests/t-various.cpp,
+	lang/qt/tests/t-wkdlookup.cpp,
+	lang/qt/tests/t-wkspublish.cpp: Remove signal asyncDone from the test
+	classes.
+
+2022-01-12  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	cpp: Add interactor to add existing subkeys to other keys.
+	+ commit a4dcb17486bb42890ffe6453eeb2c6f301dc1fae
+	* lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp,
+	lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h: New.
+	* lang/cpp/src/Makefile.am: Add new files.
+
+2022-01-10  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	core: Return an error for secret key export operations.
+	+ commit a527bd7cf58563d07c89bec458c8967ab1b3e60f
+	src/export.c (export_status_handler): Handle "export_keys.secret".
+
+2022-01-04  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	qt: Add factory function for secret subkey export job.
+	+ commit 04723a6e96be77dbc43bf71c54e268424a1823ba
+	* lang/qt/src/protocol.h (class Protocol): Add member function
+	secretSubkeyExportJob.
+	* lang/qt/src/protocol_p.h (Protocol::secretSubkeyExportJob): Implement.
+
+	* lang/qt/tests/run-exportjob.cpp (showUsageAndExitWithCode): Print
+	new option.
+	(createExportJob): Create secret subkey export job if requested.
+	(main): New option --secret-subkey.
+
+	cpp: Allow export of secret subkeys.
+	+ commit e5c7fc3e022841be8f68fad8b9b64dd601b89ba7
+	* lang/cpp/src/context.h (enum Context::ExportMode): Add value
+	ExportSecretSubkey.
+	(class Context): Add member functions exportSecretSubkeys and
+	startSecretSubkeyExport.
+	* lang/cpp/src/context.cpp (Context::exportPublicKeys,
+	Context::startPublicKeyExport): Return error if ExportSecretSubkey
+	mode flag is set.
+	(Context::exportSecretSubkeys, Context::startSecretSubkeyExport):
+	Implement.
+
+	qt: Remove obsolete QGpgMESecretKeyExportJob.
+	+ commit 88ad37ea96e4645a9e23aac9eae0d8da747559b8
+	* lang/qt/src/Makefile.am: Remove all occurrences of
+	qgpgmesecretkeyexportjob.*.
+	* lang/qt/src/qgpgmesecretkeyexportjob.cpp,
+	lang/qt/src/qgpgmesecretkeyexportjob.h: Remove.
+
+	qt: Use QGpgMEExportJob also for export of secret keys.
+	+ commit 4e80563fabfdf1d1c136d65252e5353fdd1e9092
+	* lang/qt/src/protocol.h (Protocol::secretKeyExportJob): Document
+	charset argument as ignored.
+	* lang/qt/src/protocol_p.h (Protocol::secretKeyExportJob): Use
+	QGpgMEExportJob instead of QGpgMESecretKeyExportJob.
+	* lang/qt/src/qgpgmeexportjob.h (class QGpgMEExportJob): Add c'tor
+	taking an export mode. Add member m_exportMode. Rename member m_flags to
+	m_additionalExportModeFlags.
+	(QGpgMEExportJob::~QGpgMEExportJob): Mark as override.
+	* lang/qt/src/qgpgmeexportjob.cpp (QGpgMEExportJob::QGpgMEExportJob):
+	Delegate to new c'tor. Implement new c'tor.
+	(QGpgMEExportJob::~QGpgMEExportJob): Use default.
+	(export_qba): Rename argument flags to mode.
+	(QGpgMEExportJob::start): Pass combination of export mode and additional

_service:tar_scm:gpgme-1.16.0.tar.bz2/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/Makefile.am Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/Makefile.in Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/NEWS -> _service:tar_scm:gpgme-1.17.0.tar.bz2/NEWS Changed

@@ -1,3 +1,73 @@
+Noteworthy changes in version 1.17.0 (2022-02-07)
+-------------------------------------------------
+
+ * New context flag "key-origin".  #5733
+
+ * New context flag "import-filter".  #5739
+
+ * New export mode to export secret subkeys.  #5757
+
+ * Detect errors during the export of secret keys.  #5766
+
+ * New function gpgme_op_receive_keys to import keys from a keyserver
+   without first running a key listing.  #5808
+
+ * Detect bad passphrase error in certificate import.  T5713
+
+ * Allow setting --key-origin when importing keys.  T5733
+
+ * Support components "keyboxd", "gpg-agent", "scdaemon", "dirmngr",
+   "pinentry", and "socketdir" in gpgme_get_dirinfo.  T5727,T5613
+
+ * Under Unix use poll(2) instead of select(2), when available.
+   T2385
+
+ * Do not use --flat_namespace when linking for macOS.  T5610
+
+ * Fix results returned by gpgme_data_* functions.  T5481
+
+ * Support closefrom also for glibc.  rM4b64774b6d
+
+ * cpp,qt: Add support for export of secret keys and secret subkeys.
+   #5757
+
+ * cpp,qt: Support for adding existing subkeys to other keys.  #5770
+
+ * qt: Extend ChangeExpiryJob to change expiration of primary key
+   and of subkeys at the same time. #4717
+
+ * qt: Expect UTF-8 on stderr on Windows.  rM8fe1546282
+
+ * qt: Allow retrieving the default value of a config entry.  T5515
+
+ * Interface changes relative to the 1.16.0 release:
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ gpgme_op_receive_keys                      NEW.
+ gpgme_op_receive_keys_start                NEW.
+ qt: Protocol::secretSubkeyExportJob        NEW.
+ cpp: Context::exportSecretSubkeys          NEW.
+ cpp: Context::startSecretSubkeyExport      NEW.
+ qt: Protocol::secretKeyExportJob      CHANGED: Param 'charset' is ignored.
+ cpp: Context::exportKeys                   NEW.
+ cpp: Context::startKeyExport               NEW.
+ cpp: Context::exportSecretKeys             NEW.
+ cpp: Context::startSecretKeyExport         NEW.
+ cpp: GpgAddExistingSubkeyEditInteractor    NEW.
+ GPGME_EXPORT_MODE_SECRET_SUBKEY            NEW.
+ gpgme_set_ctx_flag                    EXTENDED: New flag 'key-origin'.
+ gpgme_set_ctx_flag                    EXTENDED: New flag 'import-filter'.
+ qt: ChangeExpiryJob::Option                NEW.
+ qt: ChangeExpiryJob::Options               NEW.
+ qt: ChangeExpiryJob::setOptions            NEW.
+ qt: ChangeExpiryJob::options               NEW.
+ qt: AddExistingSubkeyJob                   NEW.
+ qt: Protocol::addExistingSubkeyJob         NEW.
+
+ c=C37/A26/R0 cpp=C20/A14/R0 qt=C14/A7/R0
+
+ Release-info: https://dev.gnupg.org/T5819
+
+
 Noteworthy changes in version 1.16.0 (2021-06-24)
 -------------------------------------------------

_service:tar_scm:gpgme-1.16.0.tar.bz2/VERSION -> _service:tar_scm:gpgme-1.17.0.tar.bz2/VERSION Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/conf/config.h.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/conf/config.h.in Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/configure -> _service:tar_scm:gpgme-1.17.0.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpgme 1.16.0.
+# Generated by GNU Autoconf 2.69 for gpgme 1.17.0.
 #
 # Report bugs to <https://bugs.gnupg.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='gpgme'
 PACKAGE_TARNAME='gpgme'
-PACKAGE_VERSION='1.16.0'
-PACKAGE_STRING='gpgme 1.16.0'
+PACKAGE_VERSION='1.17.0'
+PACKAGE_STRING='gpgme 1.17.0'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -1469,7 +1469,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gpgme 1.16.0 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.17.0 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1540,7 +1540,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gpgme 1.16.0:";;
+     short | recursive ) echo "Configuration of gpgme 1.17.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1690,7 +1690,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gpgme configure 1.16.0
+gpgme configure 1.17.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2520,7 +2520,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gpgme $as_me 1.16.0, which was
+It was created by gpgme $as_me 1.17.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2806,6 +2806,7 @@
 as_fn_append ac_header_list " argp.h"
 as_fn_append ac_header_list " stdint.h"
 as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " poll.h"
 as_fn_append ac_header_list " sys/time.h"
 as_fn_append ac_header_list " sys/types.h"
 as_fn_append ac_header_list " sys/stat.h"
@@ -2884,19 +2885,19 @@
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed:		AGE=0)
 #
-LIBGPGME_LT_CURRENT=36
-LIBGPGME_LT_AGE=25
+LIBGPGME_LT_CURRENT=37
+LIBGPGME_LT_AGE=26
 LIBGPGME_LT_REVISION=0
 
 # If there is an ABI break in gpgmepp or qgpgme also bump the
 # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in
 
-LIBGPGMEPP_LT_CURRENT=19
-LIBGPGMEPP_LT_AGE=13
+LIBGPGMEPP_LT_CURRENT=20
+LIBGPGMEPP_LT_AGE=14
 LIBGPGMEPP_LT_REVISION=0
 
-LIBQGPGME_LT_CURRENT=13
-LIBQGPGME_LT_AGE=6
+LIBQGPGME_LT_CURRENT=14
+LIBQGPGME_LT_AGE=7
 LIBQGPGME_LT_REVISION=0
 ################################################
 
@@ -2922,7 +2923,7 @@
 
 
 VERSION_MAJOR=1
-VERSION_MINOR=16
+VERSION_MINOR=17
 VERSION_MICRO=0
 
 ac_aux_dir=
@@ -3439,7 +3440,7 @@
 
 # Define the identity of the package.
  PACKAGE='gpgme'
- VERSION='1.16.0'
+ VERSION='1.17.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6499,7 +6500,7 @@
 
 
 
-VERSION_NUMBER=0x011000
+VERSION_NUMBER=0x011100
 
 
 # We need to compile and run a program on the build machine.  A
@@ -9584,16 +9585,11 @@
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
+    darwin*)
+      case ${MACOSX_DEPLOYMENT_TARGET},$host in
+	10.012*,*|,*powerpc*)
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
+	*)
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
@@ -24566,7 +24562,7 @@
 #
 # Provide information about the build.
 #
-BUILD_REVISION="1021c864"
+BUILD_REVISION="72bb46b3"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24575,7 +24571,7 @@
 
 
 BUILD_VERSION=`echo "$PACKAGE_VERSION" | sed 's/$0-9.*$.*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}4129"
+BUILD_VERSION="${BUILD_VERSION}29371"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -24702,6 +24698,8 @@
 
 
 
+
+
 # Type checks.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
@@ -24745,6 +24743,48 @@
     ;;
 esac
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flexible array members" >&5
+$as_echo_n "checking for flexible array members... " >&6; }
+if ${ac_cv_c_flexmember+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+	    #include <stdio.h>
+	    #include <stddef.h>
+	    struct s { int n; double d; };
+int
+main ()
+{
+int m = getchar ();
+	    struct s *p = malloc (offsetof (struct s, d)
+				  + m * sizeof (double));
+	    p->d0 = 0.0;
+	    return p->d != (double *) NULL;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_flexmember=yes
+else
+  ac_cv_c_flexmember=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_flexmember" >&5

_service:tar_scm:gpgme-1.16.0.tar.bz2/configure.ac -> _service:tar_scm:gpgme-1.17.0.tar.bz2/configure.ac Changed

@@ -19,7 +19,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 # (Process this file with autoconf to produce a configure script.)
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
 min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
@@ -31,7 +31,7 @@
 # for the LT versions.
 m4_define(mym4_package,gpgme)
 m4_define(mym4_major, 1)
-m4_define(mym4_minor, 16)
+m4_define(mym4_minor, 17)
 m4_define(mym4_micro, 0)
 
 # Below is m4 magic to extract and compute the git revision number,
@@ -53,19 +53,19 @@
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed:		AGE=0)
 #
-LIBGPGME_LT_CURRENT=36
-LIBGPGME_LT_AGE=25
+LIBGPGME_LT_CURRENT=37
+LIBGPGME_LT_AGE=26
 LIBGPGME_LT_REVISION=0
 
 # If there is an ABI break in gpgmepp or qgpgme also bump the
 # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in
 
-LIBGPGMEPP_LT_CURRENT=19
-LIBGPGMEPP_LT_AGE=13
+LIBGPGMEPP_LT_CURRENT=20
+LIBGPGMEPP_LT_AGE=14
 LIBGPGMEPP_LT_REVISION=0
 
-LIBQGPGME_LT_CURRENT=13
-LIBQGPGME_LT_AGE=6
+LIBQGPGME_LT_CURRENT=14
+LIBQGPGME_LT_AGE=7
 LIBQGPGME_LT_REVISION=0
 ################################################
 
@@ -96,8 +96,8 @@
 
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
-AC_CONFIG_SRCDIR(src/gpgme.h.in)
-AC_CONFIG_HEADER(conf/config.h)
+AC_CONFIG_SRCDIR(src/gpgme.h.in)
+AC_CONFIG_HEADERS(conf/config.h)
 AM_INIT_AUTOMAKE(serial-tests dist-bzip2 no-dist-gzip)
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
@@ -538,11 +538,12 @@
 
 # Checks for header files.
 AC_CHECK_HEADERS_ONCE(locale.h sys/select.h sys/uio.h argp.h stdint.h
-                       unistd.h sys/time.h sys/types.h sys/stat.h)
+                       unistd.h poll.h sys/time.h sys/types.h sys/stat.h)
 
 
 # Type checks.
 AC_C_INLINE
+AC_C_FLEXIBLE_ARRAY_MEMBER
 AC_CHECK_SIZEOF(unsigned int)
 AC_SYS_LARGEFILE
 AC_TYPE_OFF_T

_service:tar_scm:gpgme-1.16.0.tar.bz2/doc/defsincdate -> _service:tar_scm:gpgme-1.17.0.tar.bz2/doc/defsincdate Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/doc/gpgme.info -> _service:tar_scm:gpgme-1.17.0.tar.bz2/doc/gpgme.info Changed

@@ -19,8 +19,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.15.2-beta35, last updated 13 December 2019, of ‘The
-‘GnuPG Made Easy’ Reference Manual’, for Version 1.15.2-beta35.
+   This is Edition 1.17.0, last updated 3 February 2022, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.17.0.
 
    Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH.
 
@@ -37,129 +37,129 @@
 
 &#x1f;
 Indirect:
-gpgme.info-1: 1688
-gpgme.info-2: 303542
+gpgme.info-1: 1673
+gpgme.info-2: 303842
 &#x1f;
 Tag Table:
 (Indirect)
-Node: Top&#x7f;1688
-Node: Introduction&#x7f;9067
-Node: Getting Started&#x7f;9857
-Node: Features&#x7f;11318
-Node: Overview&#x7f;12630
-Node: Preparation&#x7f;13739
-Node: Header&#x7f;14736
-Node: Building the Source&#x7f;15483
-Node: Largefile Support (LFS)&#x7f;17627
-Node: Using Automake&#x7f;23043
-Node: Using Libtool&#x7f;25596
-Node: Library Version Check&#x7f;25958
-Node: Signal Handling&#x7f;32018
-Node: Multi-Threading&#x7f;33288
-Ref: Multi-Threading-Footnote-1&#x7f;34704
-Node: Protocols and Engines&#x7f;35127
-Node: Engine Version Check&#x7f;37878
-Node: Engine Information&#x7f;40401
-Node: Engine Configuration&#x7f;44261
-Node: OpenPGP&#x7f;45565
-Node: Cryptographic Message Syntax&#x7f;45905
-Node: Assuan&#x7f;46218
-Node: Algorithms&#x7f;46592
-Ref: Algorithms-Footnote-1&#x7f;47071
-Node: Public Key Algorithms&#x7f;47199
-Node: Hash Algorithms&#x7f;49801
-Node: Error Handling&#x7f;51015
-Node: Error Values&#x7f;52889
-Node: Error Sources&#x7f;58092
-Node: Error Codes&#x7f;60532
-Node: Error Strings&#x7f;65325
-Node: Exchanging Data&#x7f;67132
-Node: Creating Data Buffers&#x7f;69017
-Node: Memory Based Data Buffers&#x7f;69533
-Node: File Based Data Buffers&#x7f;72966
-Node: Callback Based Data Buffers&#x7f;76079
-Node: Destroying Data Buffers&#x7f;80270
-Node: Manipulating Data Buffers&#x7f;81777
-Node: Data Buffer I/O Operations&#x7f;82269
-Node: Data Buffer Meta-Data&#x7f;84642
-Node: Data Buffer Convenience&#x7f;89961
-Node: Contexts&#x7f;92181
-Node: Creating Contexts&#x7f;93300
-Node: Destroying Contexts&#x7f;94147
-Node: Result Management&#x7f;94486
-Node: Context Attributes&#x7f;96067
-Node: Protocol Selection&#x7f;97234
-Node: Crypto Engine&#x7f;98280
-Node: Setting the Sender&#x7f;100169
-Node: ASCII Armor&#x7f;101682
-Node: Text Mode&#x7f;102311
-Node: Offline Mode&#x7f;103245
-Node: Pinentry Mode&#x7f;104743
-Node: Included Certificates&#x7f;106637
-Node: Key Listing Mode&#x7f;108083
-Node: Passphrase Callback&#x7f;113207
-Node: Progress Meter Callback&#x7f;116769
-Node: Status Message Callback&#x7f;118754
-Node: Context Flags&#x7f;120519
-Node: Locale&#x7f;127446
-Node: Additional Logs&#x7f;129038
-Node: Key Management&#x7f;131236
-Node: Key objects&#x7f;132460
-Node: Listing Keys&#x7f;147464
-Node: Information About Keys&#x7f;156117
-Node: Manipulating Keys&#x7f;157425
-Node: Generating Keys&#x7f;160323
-Node: Signing Keys&#x7f;178643
-Node: Exporting Keys&#x7f;184402
-Node: Importing Keys&#x7f;191682
-Ref: Importing Keys-Footnote-1&#x7f;199085
-Node: Deleting Keys&#x7f;199213
-Node: Changing Passphrases&#x7f;201493
-Node: Changing TOFU Data&#x7f;202820
-Node: Advanced Key Editing&#x7f;204928
-Node: Crypto Operations&#x7f;207661
-Node: Decrypt&#x7f;208918
-Node: Verify&#x7f;216198
-Node: Decrypt and Verify&#x7f;229291
-Node: Sign&#x7f;232146
-Node: Selecting Signers&#x7f;232710
-Node: Creating a Signature&#x7f;234116
-Node: Signature Notation Data&#x7f;238886
-Node: Encrypt&#x7f;241171
-Node: Encrypting a Plaintext&#x7f;241527
-Node: Miscellaneous&#x7f;255939
-Node: Running other Programs&#x7f;256351
-Node: Using the Assuan protocol&#x7f;258514
-Node: Checking for updates&#x7f;261312
-Node: Run Control&#x7f;266129
-Node: Waiting For Completion&#x7f;266873
-Node: Using External Event Loops&#x7f;268998
-Node: I/O Callback Interface&#x7f;270970
-Node: Registering I/O Callbacks&#x7f;275898
-Node: I/O Callback Example&#x7f;277937
-Node: I/O Callback Example GTK+&#x7f;284562
-Node: I/O Callback Example GDK&#x7f;286351
-Node: I/O Callback Example Qt&#x7f;287993
-Node: Cancellation&#x7f;290281
-Node: UI Server Protocol&#x7f;292589
-Ref: UI Server Protocol-Footnote-1&#x7f;294024
-Node: UI Server Encrypt&#x7f;294143
-Node: UI Server Sign&#x7f;299501
-Node: UI Server Decrypt&#x7f;303542
-Node: UI Server Verify&#x7f;305197
-Node: UI Server Set Input Files&#x7f;308769
-Node: UI Server Sign/Encrypt Files&#x7f;309839
-Node: UI Server Verify/Decrypt Files&#x7f;311647
-Node: UI Server Import/Export Keys&#x7f;313523
-Node: UI Server Checksum Files&#x7f;314585
-Node: Miscellaneous UI Server Commands&#x7f;316803
-Ref: command SENDER&#x7f;318734
-Node: Debugging&#x7f;320436
-Node: Deprecated Functions&#x7f;322185
-Node: Library Copying&#x7f;345194
-Node: Copying&#x7f;373414
-Node: Concept Index&#x7f;411164
-Node: Function and Data Index&#x7f;425876
+Node: Top&#x7f;1673
+Node: Introduction&#x7f;9037
+Node: Getting Started&#x7f;9827
+Node: Features&#x7f;11288
+Node: Overview&#x7f;12600
+Node: Preparation&#x7f;13709
+Node: Header&#x7f;14706
+Node: Building the Source&#x7f;15453
+Node: Largefile Support (LFS)&#x7f;17597
+Node: Using Automake&#x7f;23013
+Node: Using Libtool&#x7f;25566
+Node: Library Version Check&#x7f;25928
+Node: Signal Handling&#x7f;31988
+Node: Multi-Threading&#x7f;33258
+Ref: Multi-Threading-Footnote-1&#x7f;34674
+Node: Protocols and Engines&#x7f;35097
+Node: Engine Version Check&#x7f;37848
+Node: Engine Information&#x7f;40731
+Node: Engine Configuration&#x7f;44591
+Node: OpenPGP&#x7f;45895
+Node: Cryptographic Message Syntax&#x7f;46235
+Node: Assuan&#x7f;46548
+Node: Algorithms&#x7f;46922
+Ref: Algorithms-Footnote-1&#x7f;47401
+Node: Public Key Algorithms&#x7f;47529
+Node: Hash Algorithms&#x7f;50131
+Node: Error Handling&#x7f;51345
+Node: Error Values&#x7f;53219
+Node: Error Sources&#x7f;58422
+Node: Error Codes&#x7f;60862
+Node: Error Strings&#x7f;65655
+Node: Exchanging Data&#x7f;67462
+Node: Creating Data Buffers&#x7f;69347
+Node: Memory Based Data Buffers&#x7f;69863
+Node: File Based Data Buffers&#x7f;73296
+Node: Callback Based Data Buffers&#x7f;76409
+Node: Destroying Data Buffers&#x7f;80600
+Node: Manipulating Data Buffers&#x7f;82107
+Node: Data Buffer I/O Operations&#x7f;82599
+Node: Data Buffer Meta-Data&#x7f;84972
+Node: Data Buffer Convenience&#x7f;90291
+Node: Contexts&#x7f;92511
+Node: Creating Contexts&#x7f;93630
+Node: Destroying Contexts&#x7f;94477
+Node: Result Management&#x7f;94816
+Node: Context Attributes&#x7f;96397
+Node: Protocol Selection&#x7f;97564
+Node: Crypto Engine&#x7f;98610
+Node: Setting the Sender&#x7f;100499
+Node: ASCII Armor&#x7f;102012
+Node: Text Mode&#x7f;102641
+Node: Offline Mode&#x7f;103575
+Node: Pinentry Mode&#x7f;105073
+Node: Included Certificates&#x7f;106967
+Node: Key Listing Mode&#x7f;108413
+Node: Passphrase Callback&#x7f;113537
+Node: Progress Meter Callback&#x7f;117099
+Node: Status Message Callback&#x7f;119084
+Node: Context Flags&#x7f;120849
+Node: Locale&#x7f;128340

_service:tar_scm:gpgme-1.16.0.tar.bz2/doc/gpgme.info-1 -> _service:tar_scm:gpgme-1.17.0.tar.bz2/doc/gpgme.info-1 Changed

@@ -19,8 +19,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.15.2-beta35, last updated 13 December 2019, of ‘The
-‘GnuPG Made Easy’ Reference Manual’, for Version 1.15.2-beta35.
+   This is Edition 1.17.0, last updated 3 February 2022, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.17.0.
 
    Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH.
 
@@ -41,9 +41,8 @@
 Main Menu
 *********
 
-This is Edition 1.15.2-beta35, last updated 13 December 2019, of ‘The
-‘GnuPG Made Easy’ Reference Manual’, for Version 1.15.2-beta35 of the
-GPGME library.
+This is Edition 1.17.0, last updated 3 February 2022, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.17.0 of the GPGME library.
 
 * Menu:
 
@@ -905,6 +904,21 @@
      ‘g13-name’
           Return the name of the file container encryption engine.
 
+     ‘keyboxd-name’
+          Return the name of the key database daemon.
+
+     ‘agent-name’
+          Return the name of gpg-agent.
+
+     ‘scdaemon-name’
+          Return the name of the smart card daemon.
+
+     ‘dirmngr-name’
+          Return the name of dirmngr.
+
+     ‘pinentry-name’
+          Return the name of the pinentry program.
+
      ‘gpg-wks-client-name’
           Return the name of the Web Key Service tool.
 
@@ -2990,6 +3004,18 @@
           expiration.  Valid values are documented in the GnuPG manual
           and the gpg man page under the option ‘--default-cert-expire’.
 
+     ‘"key-origin"’
+          SINCE: 1.16.1 The string given in VALUE is passed to the GnuPG
+          engine to set the origin of imported keys.  Valid values are
+          documented in the GnuPG manual and the gpg man page under the
+          option ‘--key-origin’.
+
+     ‘"import-filter"’
+          SINCE: 1.16.1 The string given in VALUE is passed to the GnuPG
+          engine to use as filter when importing keys.  Valid values are
+          documented in the GnuPG manual and the gpg man page under the
+          option ‘--import-filter’.
+
      This function returns ‘0’ on success.
 
  -- Function: const char * gpgme_get_ctx_flag (gpgme_ctx_t CTX,
@@ -3421,7 +3447,7 @@
 
      The tofu info structure has the following members:
 
-     ‘gpgme_key_sig_t next’
+     ‘gpgme_tofu_info_t next’
           This is a pointer to the next tofu info structure in the
           linked list, or ‘NULL’ if this is the last element.
 
@@ -4459,6 +4485,16 @@
      This may not be combined with ‘GPGME_EXPORT_MODE_EXTERN’.  For
      X.509 the export format is PKCS#8.
 
+‘GPGME_EXPORT_MODE_SECRET_SUBKEY’
+     SINCE: 1.17.0
+
+     If this bit is set, then a secret subkey is exported.  The subkey
+     to export must be specified with fingerprint pattern with an
+     appended exclamation mark.  This is currently only allowed for
+     OpenPGP keys.  This flag may not be combined with
+     ‘GPGME_EXPORT_MODE_EXTERN’.  This flag is not supported by the
+     export functions that take an array of keys.
+
 ‘GPGME_EXPORT_MODE_RAW’
      SINCE: 1.6.0
 
@@ -4473,10 +4509,6 @@
      key the export format will be changed to PKCS#12 which also
      includes the certificate.  This flag may not be used with OpenPGP.
 
-‘GPGME_EXPORT_MODE_NOUID’
-     SINCE: 1.12.0 - experimental Do not export user ids.  Works only
-     with certain gpg version.
-
  -- Function: gpgme_error_t gpgme_op_export (gpgme_ctx_t CTX,
           const char *PATTERN, gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
@@ -4600,9 +4632,9 @@
      retrieved with ‘gpgme_op_import_result’.
 
      The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
-     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA
-     if CTX or KEYDATA is not a valid pointer, and ‘GPG_ERR_NO_DATA’ if
-     KEYDATA is an empty data buffer.
+     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if CTX or
+     KEYDATA is not a valid pointer, and ‘GPG_ERR_NO_DATA’ if KEYDATA is
+     an empty data buffer.
 
  -- Function: gpgme_error_t gpgme_op_import_start (gpgme_ctx_t CTX,
           gpgme_data_t KEYDATA)
@@ -4642,8 +4674,8 @@
      The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
      import was completed successfully, ‘GPG_ERR_INV_VALUE’ if CTX is
      not a valid pointer, ‘GPG_ERR_CONFLICT’ if the key listing mode
-     does not match, and ‘GPG_ERR_NO_DATA’ if no keys are considered for
-     export.
+     does not match, and ‘GPG_ERR_NO_DATA’ if no keys were considered
+     for import.
 
  -- Function: gpgme_error_t gpgme_op_import_keys_start (gpgme_ctx_t CTX,
           gpgme_key_t *KEYS)
@@ -4654,10 +4686,40 @@
      ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
      The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
-     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA
-     if CTX or KEYDATA is not a valid pointer, ‘GPG_ERR_CONFLICT’ if the
-     key listing mode does not match, and ‘GPG_ERR_NO_DATA’ if no keys
-     are considered for export.
+     import was started successfully, ‘GPG_ERR_INV_VALUE’ if CTX is not
+     a valid pointer, ‘GPG_ERR_CONFLICT’ if the key listing mode does
+     not match, and ‘GPG_ERR_NO_DATA’ if no keys were considered for
+     import.
+
+ -- Function: gpgme_error_t gpgme_op_receive_keys (gpgme_ctx_t CTX,
+          const char *KEYIDS)
+     SINCE: 1.17.0
+
+     The function ‘gpgme_op_receive_keys’ adds the keys described by the
+     ‘NULL’ terminated array KEYIDS to the key ring of the crypto engine
+     used by CTX.  It is used to retrieve and import keys from an
+     external source.  This function currently works only for OpenPGP.
+
+     After the operation completed successfully, the result can be
+     retrieved with ‘gpgme_op_import_result’.
+
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if CTX is
+     not a valid pointer, and ‘GPG_ERR_NO_DATA’ if no keys were
+     considered for import.
+
+ -- Function: gpgme_error_t gpgme_op_receive_keys_start
+          (gpgme_ctx_t CTX, const char *KEYIDS)
+     SINCE: 1.17.0
+
+     The function ‘gpgme_op_receive_keys_start’ initiates a
+     ‘gpgme_op_receive_keys’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
+
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import was started successfully, ‘GPG_ERR_INV_VALUE’ if CTX is not
+     a valid pointer, and ‘GPG_ERR_NO_DATA’ if no keys were considered
+     for import.
 
  -- Data type: gpgme_import_status_t
      This is a pointer to a structure used to store a part of the result
@@ -4670,7 +4732,9 @@
           list, or ‘NULL’ if this is the last element.
 
      ‘char *fpr’
-          This is the fingerprint of the key that was considered.
+          This is the fingerprint of the key that was considered, or
+          ‘NULL’ if the fingerprint of the key is not known, e.g.
+          because the key to import was encrypted and decryption failed.
 
      ‘gpgme_error_t result’
           If the import was not successful, this is the error value that
@@ -7248,54 +7312,3 @@
          C: ENCRYPT
          S: OK
 
-&#x1f;
-File: gpgme.info,  Node: UI Server Sign,  Next: UI Server Decrypt,  Prev: UI Server Encrypt,  Up: UI Server Protocol
-
-A.2 UI Server: Sign a Message
-=============================
-
-The server needs to implement opaque signing as well as detached
-signing.  Due to the nature of OpenPGP messages it is always required to
-send the entire message to the server; sending just the hash is not
-possible.  The following two commands are required to set the input and
-output file descriptors:
-
- -- Command: INPUT FD=N
-     Set the file descriptor for the message to be signed to N.  The
-     message send to the server is binary encoded.  For details on the

_service:tar_scm:gpgme-1.16.0.tar.bz2/doc/gpgme.info-2 -> _service:tar_scm:gpgme-1.17.0.tar.bz2/doc/gpgme.info-2 Changed

@@ -19,8 +19,8 @@
 
    This file documents the GPGME library.
 
-   This is Edition 1.15.2-beta35, last updated 13 December 2019, of ‘The
-‘GnuPG Made Easy’ Reference Manual’, for Version 1.15.2-beta35.
+   This is Edition 1.17.0, last updated 3 February 2022, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.17.0.
 
    Copyright © 2002–2008, 2010, 2012–2018 g10 Code GmbH.
 
@@ -36,6 +36,57 @@
 Public License for more details.
 
 &#x1f;
+File: gpgme.info,  Node: UI Server Sign,  Next: UI Server Decrypt,  Prev: UI Server Encrypt,  Up: UI Server Protocol
+
+A.2 UI Server: Sign a Message
+=============================
+
+The server needs to implement opaque signing as well as detached
+signing.  Due to the nature of OpenPGP messages it is always required to
+send the entire message to the server; sending just the hash is not
+possible.  The following two commands are required to set the input and
+output file descriptors:
+
+ -- Command: INPUT FD=N
+     Set the file descriptor for the message to be signed to N.  The
+     message send to the server is binary encoded.  For details on the
+     file descriptor, see the description of ‘INPUT’ in the ‘ENCRYPT’
+     section.
+
+ -- Command: OUTPUT FD=N --binary
+     Set the file descriptor to be used for the output.  The output is
+     either the complete signed message or in case of a detached
+     signature just that detached signature.  If the option ‘--binary’
+     is given the output shall be in binary format; if not given, the
+     output for OpenPGP needs to be ASCII armored and for CMS Base-64
+     encoded.  For details on the file descriptor, see the ‘INPUT’
+     command.
+
+To allow the server the selection of a non-default signing key the
+client may optionally use the ‘SENDER’ command, see *note command
+SENDER::.
+
+The signing operation is then initiated by:
+
+ -- Command: SIGN --protocol=NAME --detached
+     Sign the data set with the ‘INPUT’ command and write it to the sink
+     set by OUTPUT. NAME is the signing protocol used for the message.
+     For a description of the allowed protocols see the ‘ENCRYPT’
+     command.  With option ‘--detached’ given, a detached signature is
+     created; this is actually the usual way the command is used.
+
+The client expects the server to send at least this status information
+before the final OK response:
+
+ -- Status line: MICALG STRING
+     The STRING represents the hash algorithm used to create the
+     signature.  It is used with RFC-1847 style signature messages and
+     defined by PGP/MIME (RFC-3156) and S/MIME (RFC-3851).  The GPGME
+     library has a supporting function ‘gpgme_hash_algo_name’ to return
+     the algorithm name as a string.  This string needs to be lowercased
+     and for OpenPGP prefixed with "‘pgp-’".
+
+&#x1f;
 File: gpgme.info,  Node: UI Server Decrypt,  Next: UI Server Verify,  Prev: UI Server Sign,  Up: UI Server Protocol
 
 A.3 UI Server: Decrypt a Message
@@ -2603,7 +2654,7 @@
 * gpgme_encrypt_result_t:                Encrypting a Plaintext.
                                                               (line 241)
 * gpgme_engine_check_version:            Engine Version Check.
-                                                              (line  67)
+                                                              (line  82)
 * gpgme_engine_info_t:                   Engine Information.  (line   6)
 * gpgme_error:                           Error Values.        (line  65)
 * gpgme_error_from_errno:                Error Values.        (line  89)
@@ -2642,7 +2693,7 @@
                                                               (line  25)
 * gpgme_genkey_result_t:                 Generating Keys.     (line 381)
 * gpgme_get_armor:                       ASCII Armor.         (line  13)
-* gpgme_get_ctx_flag:                    Context Flags.       (line 141)
+* gpgme_get_ctx_flag:                    Context Flags.       (line 153)
 * gpgme_get_dirinfo:                     Engine Version Check.
                                                               (line   6)
 * gpgme_get_engine_info:                 Engine Information.  (line  46)
@@ -2674,8 +2725,8 @@
 * gpgme_get_textmode:                    Text Mode.           (line  20)
 * gpgme_hash_algo_name:                  Hash Algorithms.     (line  30)
 * gpgme_hash_algo_t:                     Hash Algorithms.     (line  10)
-* gpgme_import_result_t:                 Importing Keys.      (line 118)
-* gpgme_import_status_t:                 Importing Keys.      (line  80)
+* gpgme_import_result_t:                 Importing Keys.      (line 150)
+* gpgme_import_status_t:                 Importing Keys.      (line 110)
 * gpgme_interact_cb_t:                   Advanced Key Editing.
                                                               (line  11)
 * gpgme_invalid_key_t:                   Crypto Operations.   (line  10)
@@ -2747,12 +2798,12 @@
                                                               (line 274)
 * gpgme_op_encrypt_start:                Encrypting a Plaintext.
                                                               (line 113)
-* gpgme_op_export:                       Exporting Keys.      (line  59)
-* gpgme_op_export_ext:                   Exporting Keys.      (line  92)
-* gpgme_op_export_ext_start:             Exporting Keys.      (line 114)
-* gpgme_op_export_keys:                  Exporting Keys.      (line 126)
-* gpgme_op_export_keys_start:            Exporting Keys.      (line 153)
-* gpgme_op_export_start:                 Exporting Keys.      (line  80)
+* gpgme_op_export:                       Exporting Keys.      (line  65)
+* gpgme_op_export_ext:                   Exporting Keys.      (line  98)
+* gpgme_op_export_ext_start:             Exporting Keys.      (line 120)
+* gpgme_op_export_keys:                  Exporting Keys.      (line 132)
+* gpgme_op_export_keys_start:            Exporting Keys.      (line 159)
+* gpgme_op_export_start:                 Exporting Keys.      (line  86)
 * gpgme_op_genkey:                       Generating Keys.     (line 304)
 * gpgme_op_genkey_result:                Generating Keys.     (line 418)
 * gpgme_op_genkey_start:                 Generating Keys.     (line 369)
@@ -2763,7 +2814,7 @@
                                                               (line  18)
 * gpgme_op_import_keys:                  Importing Keys.      (line  35)
 * gpgme_op_import_keys_start:            Importing Keys.      (line  65)
-* gpgme_op_import_result:                Importing Keys.      (line 174)
+* gpgme_op_import_result:                Importing Keys.      (line 206)
 * gpgme_op_import_start:                 Importing Keys.      (line  24)
 * gpgme_op_interact:                     Advanced Key Editing.
                                                               (line  23)
@@ -2785,6 +2836,8 @@
                                                               (line  68)
 * gpgme_op_query_swdb_result:            Checking for updates.
                                                               (line  80)
+* gpgme_op_receive_keys:                 Importing Keys.      (line  80)
+* gpgme_op_receive_keys_start:           Importing Keys.      (line  97)
 * gpgme_op_revsig:                       Signing Keys.        (line  89)
 * gpgme_op_revsig_start:                 Signing Keys.        (line 124)
 * gpgme_op_revuid:                       Generating Keys.     (line 224)

_service:tar_scm:gpgme-1.16.0.tar.bz2/doc/gpgme.texi -> _service:tar_scm:gpgme-1.17.0.tar.bz2/doc/gpgme.texi Changed

@@ -990,6 +990,21 @@
 @item g13-name
 Return the name of the file container encryption engine.
 
+@item keyboxd-name
+Return the name of the key database daemon.
+
+@item agent-name
+Return the name of gpg-agent.
+
+@item scdaemon-name
+Return the name of the smart card daemon.
+
+@item dirmngr-name
+Return the name of dirmngr.
+
+@item pinentry-name
+Return the name of the pinentry program.
+
 @item gpg-wks-client-name
 Return the name of the Web Key Service tool.
 
@@ -3186,6 +3201,17 @@
 are documented in the GnuPG manual and the gpg man page under
 the option @option{--default-cert-expire}.
 
+@item "key-origin"
+@since{1.16.1}
+The string given in @var{value} is passed to the GnuPG engine to set
+the origin of imported keys.  Valid values are documented in the GnuPG
+manual and the gpg man page under the option @option{--key-origin}.
+
+@item "import-filter"
+@since{1.16.1}
+The string given in @var{value} is passed to the GnuPG engine to use as
+filter when importing keys.  Valid values are documented in the GnuPG
+manual and the gpg man page under the option @option{--import-filter}.
 
 @end table
 
@@ -3636,7 +3662,7 @@
 The tofu info structure has the following members:
 
 @table @code
-@item gpgme_key_sig_t next
+@item gpgme_tofu_info_t next
 This is a pointer to the next tofu info structure in the linked
 list, or @code{NULL} if this is the last element.
 
@@ -4867,7 +4893,6 @@
 accepts just a single key; to force the export of a specific subkey
 a fingerprint pattern with an appended exclamation mark may be used.
 
-
 @item GPGME_EXPORT_MODE_SECRET
 @since{1.6.0}
 
@@ -4875,6 +4900,16 @@
 may not be combined with @code{GPGME_EXPORT_MODE_EXTERN}.  For X.509
 the export format is PKCS#8.
 
+@item GPGME_EXPORT_MODE_SECRET_SUBKEY
+@since{1.17.0}
+
+If this bit is set, then a secret subkey is exported.  The subkey to
+export must be specified with fingerprint pattern with an appended
+exclamation mark.  This is currently only allowed for OpenPGP keys.
+This flag may not be combined with @code{GPGME_EXPORT_MODE_EXTERN}.
+This flag is not supported by the export functions that take an array
+of keys.
+
 @item GPGME_EXPORT_MODE_RAW
 @since{1.6.0}
 
@@ -4889,10 +4924,6 @@
 key the export format will be changed to PKCS#12 which also includes
 the certificate.  This flag may not be used with OpenPGP.
 
-@item GPGME_EXPORT_MODE_NOUID
-@since{1.12.0 - experimental}
-Do not export user ids.  Works only with certain gpg version.
-
 @end table
 
 
@@ -5016,7 +5047,7 @@
 
 The function returns the error code @code{GPG_ERR_NO_ERROR} if the
 import was completed successfully, @code{GPG_ERR_INV_VALUE} if
-@var{keydata} if @var{ctx} or @var{keydata} is not a valid pointer,
+@var{ctx} or @var{keydata} is not a valid pointer,
 and @code{GPG_ERR_NO_DATA} if @var{keydata} is an empty data buffer.
 @end deftypefun
 
@@ -5059,8 +5090,8 @@
 The function returns the error code @code{GPG_ERR_NO_ERROR} if the
 import was completed successfully, @code{GPG_ERR_INV_VALUE} if
 @var{ctx} is not a valid pointer, @code{GPG_ERR_CONFLICT} if the key
-listing mode does not match, and @code{GPG_ERR_NO_DATA} if no keys are
-considered for export.
+listing mode does not match, and @code{GPG_ERR_NO_DATA} if no keys were
+considered for import.
 @end deftypefun
 
 @deftypefun gpgme_error_t gpgme_op_import_keys_start (@w{gpgme_ctx_t @var{ctx}}, @w{gpgme_key_t *@var{keys}})
@@ -5071,10 +5102,40 @@
 @code{gpgme_wait} on the context.  @xref{Waiting For Completion}.
 
 The function returns the error code @code{GPG_ERR_NO_ERROR} if the
+import was started successfully, @code{GPG_ERR_INV_VALUE} if
+@var{ctx} is not a valid pointer, @code{GPG_ERR_CONFLICT} if the key
+listing mode does not match, and @code{GPG_ERR_NO_DATA} if no keys were
+considered for import.
+@end deftypefun
+
+@deftypefun gpgme_error_t gpgme_op_receive_keys (@w{gpgme_ctx_t @var{ctx}}, @w{const char *@var{keyids}})
+@since{1.17.0}
+
+The function @code{gpgme_op_receive_keys} adds the keys described by
+the @code{NULL} terminated array @var{keyids} to the key ring of the
+crypto engine used by @var{ctx}.  It is used to retrieve and import keys
+from an external source.  This function currently works only for OpenPGP.
+
+After the operation completed successfully, the result can be
+retrieved with @code{gpgme_op_import_result}.
+
+The function returns the error code @code{GPG_ERR_NO_ERROR} if the
 import was completed successfully, @code{GPG_ERR_INV_VALUE} if
-@var{keydata} if @var{ctx} or @var{keydata} is not a valid pointer,
-@code{GPG_ERR_CONFLICT} if the key listing mode does not match, and
-@code{GPG_ERR_NO_DATA} if no keys are considered for export.
+@var{ctx} is not a valid pointer, and @code{GPG_ERR_NO_DATA} if no keys
+were considered for import.
+@end deftypefun
+
+@deftypefun gpgme_error_t gpgme_op_receive_keys_start (@w{gpgme_ctx_t @var{ctx}}, @w{const char *@var{keyids}})
+@since{1.17.0}
+
+The function @code{gpgme_op_receive_keys_start} initiates a
+@code{gpgme_op_receive_keys} operation.  It can be completed by calling
+@code{gpgme_wait} on the context.  @xref{Waiting For Completion}.
+
+The function returns the error code @code{GPG_ERR_NO_ERROR} if the
+import was started successfully, @code{GPG_ERR_INV_VALUE} if
+@var{ctx} is not a valid pointer, and @code{GPG_ERR_NO_DATA} if no keys
+were considered for import.
 @end deftypefun
 
 @deftp {Data type} {gpgme_import_status_t}
@@ -5089,7 +5150,9 @@
 @code{NULL} if this is the last element.
 
 @item char *fpr
-This is the fingerprint of the key that was considered.
+This is the fingerprint of the key that was considered, or @code{NULL}
+if the fingerprint of the key is not known, e.g. because the key to
+import was encrypted and decryption failed.
 
 @item gpgme_error_t result
 If the import was not successful, this is the error value that caused

_service:tar_scm:gpgme-1.16.0.tar.bz2/gpgme.spec -> _service:tar_scm:gpgme-1.17.0.tar.bz2/gpgme.spec Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cl/gpgme.asd -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cl/gpgme.asd Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/Makefile.am Changed

@@ -33,10 +33,12 @@
     engineinfo.cpp gpgsetexpirytimeeditinteractor.cpp \
     gpgsetownertrusteditinteractor.cpp gpgsignkeyeditinteractor.cpp \
     gpgadduserideditinteractor.cpp gpggencardkeyinteractor.cpp \
+    gpgaddexistingsubkeyeditinteractor.cpp \
     defaultassuantransaction.cpp \
     scdgetinfoassuantransaction.cpp gpgagentgetinfoassuantransaction.cpp \
     statusconsumerassuantransaction.cpp \
-    vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp
+    vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp \
+    util.cpp
 
 gpgmepp_headers = \
     configuration.h context.h data.h decryptionresult.h \
@@ -46,6 +48,7 @@
     gpgmefw.h gpgsetexpirytimeeditinteractor.h \
     gpgsetownertrusteditinteractor.h gpgsignkeyeditinteractor.h \
     gpggencardkeyinteractor.h \
+    gpgaddexistingsubkeyeditinteractor.h \
     importresult.h keygenerationresult.h key.h keylistresult.h \
     notation.h result.h scdgetinfoassuantransaction.h signingresult.h \
     statusconsumerassuantransaction.h \

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/Makefile.in Changed

@@ -173,10 +173,11 @@
 	gpgsetexpirytimeeditinteractor.lo \
 	gpgsetownertrusteditinteractor.lo gpgsignkeyeditinteractor.lo \
 	gpgadduserideditinteractor.lo gpggencardkeyinteractor.lo \
+	gpgaddexistingsubkeyeditinteractor.lo \
 	defaultassuantransaction.lo scdgetinfoassuantransaction.lo \
 	gpgagentgetinfoassuantransaction.lo \
 	statusconsumerassuantransaction.lo vfsmountresult.lo \
-	configuration.lo tofuinfo.lo swdbresult.lo
+	configuration.lo tofuinfo.lo swdbresult.lo util.lo
 am__objects_2 =
 am_libgpgmepp_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 	context_vanilla.lo $(am__objects_2) $(am__objects_2)
@@ -212,6 +213,7 @@
 	./$(DEPDIR)/editinteractor.Plo \
 	./$(DEPDIR)/encryptionresult.Plo ./$(DEPDIR)/engineinfo.Plo \
 	./$(DEPDIR)/eventloopinteractor.Plo ./$(DEPDIR)/exception.Plo \
+	./$(DEPDIR)/gpgaddexistingsubkeyeditinteractor.Plo \
 	./$(DEPDIR)/gpgadduserideditinteractor.Plo \
 	./$(DEPDIR)/gpgagentgetinfoassuantransaction.Plo \
 	./$(DEPDIR)/gpggencardkeyinteractor.Plo \
@@ -225,7 +227,8 @@
 	./$(DEPDIR)/signingresult.Plo \
 	./$(DEPDIR)/statusconsumerassuantransaction.Plo \
 	./$(DEPDIR)/swdbresult.Plo ./$(DEPDIR)/tofuinfo.Plo \
-	./$(DEPDIR)/trustitem.Plo ./$(DEPDIR)/verificationresult.Plo \
+	./$(DEPDIR)/trustitem.Plo ./$(DEPDIR)/util.Plo \
+	./$(DEPDIR)/verificationresult.Plo \
 	./$(DEPDIR)/vfsmountresult.Plo
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -509,10 +512,12 @@
     engineinfo.cpp gpgsetexpirytimeeditinteractor.cpp \
     gpgsetownertrusteditinteractor.cpp gpgsignkeyeditinteractor.cpp \
     gpgadduserideditinteractor.cpp gpggencardkeyinteractor.cpp \
+    gpgaddexistingsubkeyeditinteractor.cpp \
     defaultassuantransaction.cpp \
     scdgetinfoassuantransaction.cpp gpgagentgetinfoassuantransaction.cpp \
     statusconsumerassuantransaction.cpp \
-    vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp
+    vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp \
+    util.cpp
 
 gpgmepp_headers = \
     configuration.h context.h data.h decryptionresult.h \
@@ -522,6 +527,7 @@
     gpgmefw.h gpgsetexpirytimeeditinteractor.h \
     gpgsetownertrusteditinteractor.h gpgsignkeyeditinteractor.h \
     gpggencardkeyinteractor.h \
+    gpgaddexistingsubkeyeditinteractor.h \
     importresult.h keygenerationresult.h key.h keylistresult.h \
     notation.h result.h scdgetinfoassuantransaction.h signingresult.h \
     statusconsumerassuantransaction.h \
@@ -654,6 +660,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/engineinfo.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventloopinteractor.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgaddexistingsubkeyeditinteractor.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgadduserideditinteractor.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpgagentgetinfoassuantransaction.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpggencardkeyinteractor.Plo@am__quote@ # am--include-marker
@@ -670,6 +677,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swdbresult.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tofuinfo.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trustitem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verificationresult.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfsmountresult.Plo@am__quote@ # am--include-marker
 
@@ -913,6 +921,7 @@
 	-rm -f ./$(DEPDIR)/engineinfo.Plo
 	-rm -f ./$(DEPDIR)/eventloopinteractor.Plo
 	-rm -f ./$(DEPDIR)/exception.Plo
+	-rm -f ./$(DEPDIR)/gpgaddexistingsubkeyeditinteractor.Plo
 	-rm -f ./$(DEPDIR)/gpgadduserideditinteractor.Plo
 	-rm -f ./$(DEPDIR)/gpgagentgetinfoassuantransaction.Plo
 	-rm -f ./$(DEPDIR)/gpggencardkeyinteractor.Plo
@@ -929,6 +938,7 @@
 	-rm -f ./$(DEPDIR)/swdbresult.Plo
 	-rm -f ./$(DEPDIR)/tofuinfo.Plo
 	-rm -f ./$(DEPDIR)/trustitem.Plo
+	-rm -f ./$(DEPDIR)/util.Plo
 	-rm -f ./$(DEPDIR)/verificationresult.Plo
 	-rm -f ./$(DEPDIR)/vfsmountresult.Plo
 	-rm -f Makefile
@@ -990,6 +1000,7 @@
 	-rm -f ./$(DEPDIR)/engineinfo.Plo
 	-rm -f ./$(DEPDIR)/eventloopinteractor.Plo
 	-rm -f ./$(DEPDIR)/exception.Plo
+	-rm -f ./$(DEPDIR)/gpgaddexistingsubkeyeditinteractor.Plo
 	-rm -f ./$(DEPDIR)/gpgadduserideditinteractor.Plo
 	-rm -f ./$(DEPDIR)/gpgagentgetinfoassuantransaction.Plo
 	-rm -f ./$(DEPDIR)/gpggencardkeyinteractor.Plo
@@ -1006,6 +1017,7 @@
 	-rm -f ./$(DEPDIR)/swdbresult.Plo
 	-rm -f ./$(DEPDIR)/tofuinfo.Plo
 	-rm -f ./$(DEPDIR)/trustitem.Plo
+	-rm -f ./$(DEPDIR)/util.Plo
 	-rm -f ./$(DEPDIR)/verificationresult.Plo
 	-rm -f ./$(DEPDIR)/vfsmountresult.Plo
 	-rm -f Makefile

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/context.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/context.cpp Changed

@@ -50,6 +50,7 @@
 
 #include <gpgme.h>
 
+#include <functional>
 #include <istream>
 #include <numeric>
 #ifndef NDEBUG
@@ -462,9 +463,33 @@
     return Error(d->lasterr = gpgme_set_locale(d->ctx, cat, val));
 }
 
+static GpgME::EngineInfo get_engine_info(gpgme_engine_info_t engineInfos, gpgme_protocol_t protocol)
+{
+    if (!engineInfos) {
+        return EngineInfo{};
+    }
+
+    for (gpgme_engine_info_t i = engineInfos ; i ; i = i->next) {
+        if (i->protocol == protocol) {
+            return EngineInfo{i};
+        }
+    }
+
+    return EngineInfo{};
+}
+
+static GpgME::EngineInfo get_static_engine_info(gpgme_protocol_t protocol)
+{
+    gpgme_engine_info_t ei = nullptr;
+    if (gpgme_get_engine_info(&ei)) {
+        return EngineInfo{};
+    }
+    return get_engine_info(ei, protocol);
+}
+
 EngineInfo Context::engineInfo() const
 {
-    return EngineInfo(gpgme_ctx_get_engine_info(d->ctx));
+    return get_engine_info(gpgme_ctx_get_engine_info(d->ctx), gpgme_get_protocol(d->ctx));
 }
 
 Error Context::setEngineFileName(const char *filename)
@@ -504,12 +529,6 @@
 Error Context::startKeyListing(const char *patterns, bool secretOnly)
 {
     d->lastop = Private::KeyList;
-#ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN
-    if (!patterns || !patterns0 || !patterns1) {
-        // max. one pattern -> use the non-ext version
-        return startKeyListing(patterns ? patterns0 : nullptr, secretOnly);
-    }
-#endif
     return Error(d->lasterr = gpgme_op_keylist_ext_start(d->ctx, patterns, int(secretOnly), 0));
 }
 
@@ -564,48 +583,67 @@
     }
 }
 
-Error Context::exportPublicKeys(const char *pattern, Data &keyData, unsigned int flags)
+Error Context::exportKeys(const char *pattern, Data &keyData, unsigned int mode)
 {
     d->lastop = Private::Export;
     Data::Private *const dp = keyData.impl();
-    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, flags, dp ? dp->data : nullptr));
+    return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, mode, dp ? dp->data : nullptr));
 }
 
-Error Context::exportPublicKeys(const char *patterns, Data &keyData, unsigned int flags)
+Error Context::exportKeys(const char *patterns, Data &keyData, unsigned int mode)
 {
     d->lastop = Private::Export;
-#ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN
-    if (!patterns || !patterns0 || !patterns1) {
-        // max. one pattern -> use the non-ext version
-        return exportPublicKeys(patterns ? patterns0 : nullptr, keyData, flags);
-    }
-#endif
     Data::Private *const dp = keyData.impl();
-    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, flags, dp ? dp->data : nullptr));
+    return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, mode, dp ? dp->data : nullptr));
 }
 
-Error Context::startPublicKeyExport(const char *pattern, Data &keyData, unsigned int flags)
+Error Context::startKeyExport(const char *pattern, Data &keyData, unsigned int mode)
 {
     d->lastop = Private::Export;
     Data::Private *const dp = keyData.impl();
-    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, flags, dp ? dp->data : nullptr));
+    return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, mode, dp ? dp->data : nullptr));
 }
 
-Error Context::startPublicKeyExport(const char *patterns, Data &keyData, unsigned int flags)
+Error Context::startKeyExport(const char *patterns, Data &keyData, unsigned int mode)
 {
     d->lastop = Private::Export;
-#ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN
-    if (!patterns || !patterns0 || !patterns1) {
-        // max. one pattern -> use the non-ext version
-        return startPublicKeyExport(patterns ? patterns0 : nullptr, keyData, flags);
-    }
-#endif
     Data::Private *const dp = keyData.impl();
-    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, flags, dp ? dp->data : nullptr));
+    return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, mode, dp ? dp->data : nullptr));
+}
+
+Error Context::exportPublicKeys(const char *pattern, Data &keyData, unsigned int mode)
+{
+    if (mode & (ExportSecret | ExportSecretSubkey)) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return exportKeys(pattern, keyData, mode);
+}
+
+Error Context::exportPublicKeys(const char *patterns, Data &keyData, unsigned int mode)
+{
+    if (mode & (ExportSecret | ExportSecretSubkey)) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return exportKeys(patterns, keyData, mode);
+}
+
+Error Context::startPublicKeyExport(const char *pattern, Data &keyData, unsigned int mode)
+{
+    if (mode & (ExportSecret | ExportSecretSubkey)) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return startKeyExport(pattern, keyData, mode);
 }
 
+Error Context::startPublicKeyExport(const char *patterns, Data &keyData, unsigned int mode)
+{
+    if (mode & (ExportSecret | ExportSecretSubkey)) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return startKeyExport(patterns, keyData, mode);
+}
 
-/* Same as above but without flags  */
+/* Same as above but without mode  */
 Error Context::exportPublicKeys(const char *pattern, Data &keyData)
 {
     return exportPublicKeys(pattern, keyData, 0);
@@ -626,6 +664,58 @@
     return startPublicKeyExport(patterns, keyData, 0);
 }
 
+Error Context::exportSecretKeys(const char *pattern, Data &keyData, unsigned int mode)
+{
+    if (mode & ExportSecretSubkey) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return exportKeys(pattern, keyData, mode|ExportSecret);
+}
+
+Error Context::exportSecretKeys(const char *patterns, Data &keyData, unsigned int mode)
+{
+    if (mode & ExportSecretSubkey) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return exportKeys(patterns, keyData, mode|ExportSecret);
+}
+
+Error Context::startSecretKeyExport(const char *pattern, Data &keyData, unsigned int mode)
+{
+    if (mode & ExportSecretSubkey) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return startKeyExport(pattern, keyData, mode|ExportSecret);
+}
+
+Error Context::startSecretKeyExport(const char *patterns, Data &keyData, unsigned int mode)
+{
+    if (mode & ExportSecretSubkey) {
+        return Error::fromCode(GPG_ERR_INV_FLAG);
+    }
+    return startKeyExport(patterns, keyData, mode|ExportSecret);
+}
+
+Error Context::exportSecretSubkeys(const char *pattern, Data &keyData, unsigned int mode)
+{
+    return exportKeys(pattern, keyData, mode|ExportSecretSubkey);
+}
+
+Error Context::exportSecretSubkeys(const char *patterns, Data &keyData, unsigned int mode)
+{
+    return exportKeys(patterns, keyData, mode|ExportSecretSubkey);
+}
+
+Error Context::startSecretSubkeyExport(const char *pattern, Data &keyData, unsigned int mode)
+{
+    return startKeyExport(pattern, keyData, mode|ExportSecretSubkey);
+}
+
+Error Context::startSecretSubkeyExport(const char *patterns, Data &keyData, unsigned int mode)
+{
+    return startKeyExport(patterns, keyData, mode|ExportSecretSubkey);
+}

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/context.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/context.h Changed

@@ -31,6 +31,7 @@
 #include "verificationresult.h" // for Signature::Notation
 
 #include <memory>
+#include <string>
 #include <vector>
 #include <utility>
 #include <iosfwd>
@@ -189,18 +190,35 @@
         ExportSecret = 16,
         ExportRaw = 32,
         ExportPKCS12 = 64,
-        ExportNoUID = 128,
+        ExportNoUID = 128, // obsolete; has no effect
         ExportSSH = 256,
+        ExportSecretSubkey = 512,
     };
 
     GpgME::Error exportPublicKeys(const char *pattern, Data &keyData);
-    GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, unsigned int flags);
+    GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, unsigned int mode);
     GpgME::Error exportPublicKeys(const char *pattern, Data &keyData);
-    GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, unsigned int export_mode);
+    GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, unsigned int mode);
     GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData);
-    GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, unsigned int flags);
+    GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, unsigned int mode);
     GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData);
-    GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, unsigned int export_mode);
+    GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, unsigned int mode);
+
+    GpgME::Error exportSecretKeys(const char *pattern, Data &keyData, unsigned int mode = ExportSecret);
+    GpgME::Error exportSecretKeys(const char *pattern, Data &keyData, unsigned int mode = ExportSecret);
+    GpgME::Error startSecretKeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportSecret);
+    GpgME::Error startSecretKeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportSecret);
+
+    GpgME::Error exportSecretSubkeys(const char *pattern, Data &keyData, unsigned int mode = ExportSecretSubkey);
+    GpgME::Error exportSecretSubkeys(const char *pattern, Data &keyData, unsigned int mode = ExportSecretSubkey);
+    GpgME::Error startSecretSubkeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportSecretSubkey);
+    GpgME::Error startSecretSubkeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportSecretSubkey);
+
+    // generic export functions; prefer using the specific public/secret key export functions
+    GpgME::Error exportKeys(const char *pattern, Data &keyData, unsigned int mode = ExportDefault);
+    GpgME::Error exportKeys(const char *pattern, Data &keyData, unsigned int mode = ExportDefault);
+    GpgME::Error startKeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportDefault);
+    GpgME::Error startKeyExport(const char *pattern, Data &keyData, unsigned int mode = ExportDefault);
 
     //
     // Key Import
@@ -208,8 +226,10 @@
 
     ImportResult importKeys(const Data &data);
     ImportResult importKeys(const std::vector<Key> &keys);
+    ImportResult importKeys(const std::vector<std::string> &keyIds);
     GpgME::Error startKeyImport(const Data &data);
     GpgME::Error startKeyImport(const std::vector<Key> &keys);
+    GpgME::Error startKeyImport(const std::vector<std::string> &keyIds);
     ImportResult importResult() const;
 
     //

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/global.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/global.h Changed

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.cpp Added

@@ -0,0 +1,209 @@
+/*
+  gpgaddexistingsubkeyeditinteractor.cpp - Edit Interactor to add an existing subkey to an OpenPGP key
+  Copyright (c) 2022 g10 Code GmbH
+  Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+  This file is part of GPGME++.
+
+  GPGME++ is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  GPGME++ is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with GPGME++; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "gpgaddexistingsubkeyeditinteractor.h"
+
+#include "error.h"
+
+#include <gpgme.h>
+
+// avoid conflict (msvc)
+#ifdef ERROR
+# undef ERROR
+#endif
+
+using namespace GpgME;
+
+class GpgAddExistingSubkeyEditInteractor::Private
+{
+    enum {
+        START = EditInteractor::StartState,
+        COMMAND,
+        ADD_EXISTING_KEY,
+        KEYGRIP,
+        FLAGS,
+        VALID,
+        KEY_CREATED,
+        QUIT,
+        SAVE,
+
+        ERROR = EditInteractor::ErrorState
+    };
+
+    GpgAddExistingSubkeyEditInteractor *const q = nullptr;
+
+public:
+    Private(GpgAddExistingSubkeyEditInteractor *q, const std::string &keygrip)
+        : q{q}
+        , keygrip{keygrip}
+    {
+    }
+
+    const char *action(Error &err) const;
+    unsigned int nextState(unsigned int statusCode, const char *args, Error &err) const;
+
+    std::string keygrip;
+    std::string expiry;
+};
+
+const char *GpgAddExistingSubkeyEditInteractor::Private::action(Error &err) const
+{
+    switch (q->state()) {
+    case COMMAND:
+        return "addkey";
+    case ADD_EXISTING_KEY:
+        return "keygrip";
+    case KEYGRIP:
+        return keygrip.c_str();
+    case FLAGS:
+        return "Q"; // do not toggle any usage flags
+    case VALID:
+        return expiry.empty() ? "0" : expiry.c_str();
+    case QUIT:
+        return "quit";
+    case SAVE:
+        return "Y";
+    case START:
+    case KEY_CREATED:
+    case ERROR:
+        return nullptr;
+    default:
+        err = Error::fromCode(GPG_ERR_GENERAL);
+        return nullptr;
+    }
+}
+
+unsigned int GpgAddExistingSubkeyEditInteractor::Private::nextState(unsigned int status, const char *args, Error &err) const
+{
+    using std::strcmp;
+
+    static const Error GENERAL_ERROR  = Error::fromCode(GPG_ERR_GENERAL);
+    static const Error NO_KEY_ERROR = Error::fromCode(GPG_ERR_NO_KEY);
+    static const Error INV_TIME_ERROR = Error::fromCode(GPG_ERR_INV_TIME);
+
+    if (q->needsNoResponse(status)) {
+        return q->state();
+    }
+
+    switch (q->state()) {
+    case START:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keyedit.prompt") == 0) {
+            return COMMAND;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case COMMAND:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keygen.algo") == 0) {
+            return ADD_EXISTING_KEY;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case ADD_EXISTING_KEY:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keygen.keygrip") == 0) {
+            return KEYGRIP;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case KEYGRIP:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keygen.flags") == 0) {
+            return FLAGS;
+        } else if (status == GPGME_STATUS_GET_LINE &&
+                   strcmp(args, "keygen.keygrip")) {
+            err = NO_KEY_ERROR;
+            return ERROR;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case FLAGS:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keygen.valid") == 0) {
+            return VALID;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case VALID:
+        if (status == GPGME_STATUS_KEY_CREATED) {
+            return KEY_CREATED;
+        }
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keyedit.prompt") == 0) {
+            return QUIT;
+        } else if (status == GPGME_STATUS_GET_LINE &&
+                   strcmp(args, "keygen.valid")) {
+            err = INV_TIME_ERROR;
+            return ERROR;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case KEY_CREATED:
+        return QUIT;
+    case QUIT:
+        if (status == GPGME_STATUS_GET_BOOL &&
+                strcmp(args, "keyedit.save.okay") == 0) {
+            return SAVE;
+        }
+        err = GENERAL_ERROR;
+        return ERROR;
+    case ERROR:
+        if (status == GPGME_STATUS_GET_LINE &&
+                strcmp(args, "keyedit.prompt") == 0) {
+            return QUIT;
+        }
+        err = q->lastError();
+        return ERROR;
+    default:
+        err = GENERAL_ERROR;
+        return ERROR;
+    }
+}
+
+GpgAddExistingSubkeyEditInteractor::GpgAddExistingSubkeyEditInteractor(const std::string &keygrip)
+    : EditInteractor{}
+    , d{new Private{this, keygrip}}
+{
+}
+
+GpgAddExistingSubkeyEditInteractor::~GpgAddExistingSubkeyEditInteractor() = default;
+
+void GpgAddExistingSubkeyEditInteractor::setExpiry(const std::string &timeString)
+{
+    d->expiry = timeString;
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h Added

@@ -0,0 +1,59 @@
+/*
+  gpgaddexistingsubkeyeditinteractor.h - Edit Interactor to add an existing subkey to an OpenPGP key
+  Copyright (c) 2022 g10 Code GmbH
+  Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+  This file is part of GPGME++.
+
+  GPGME++ is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  GPGME++ is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with GPGME++; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifndef __GPGMEPP_GPGADDEXISTINGSUBKEYEDITINTERACTOR_H__
+#define __GPGMEPP_GPGADDEXISTINGSUBKEYEDITINTERACTOR_H__
+
+#include "editinteractor.h"
+
+#include <memory>
+
+namespace GpgME
+{
+
+class GPGMEPP_EXPORT GpgAddExistingSubkeyEditInteractor : public EditInteractor
+{
+public:
+    /** Edit interactor to add the existing subkey with keygrip \a keygrip
+     *  to the key a key edit operation is working on.
+     **/
+    explicit GpgAddExistingSubkeyEditInteractor(const std::string &keygrip);
+    ~GpgAddExistingSubkeyEditInteractor() override;
+
+    /** Sets the validity period of the added subkey. Use "0" for no expiration
+     *  or a simplified ISO date string ("yyyymmddThhmmss") for setting an
+     *  expiration date. */
+    void setExpiry(const std::string &timeString);
+
+private:
+    const char *action(Error &err) const override;
+    unsigned int nextState(unsigned int statusCode, const char *args, Error &err) const override;
+
+private:
+    class Private;
+    const std::unique_ptr<Private> d;
+};
+
+} // namespace GpgME
+
+#endif // __GPGMEPP_GPGADDEXISTINGSUBKEYEDITINTERACTOR_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/importresult.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/importresult.cpp Changed

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/util.cpp Added

@@ -0,0 +1,47 @@
+/*
+  util.cpp - some internal helpers
+  Copyright (c) 2022 g10 Code GmbH
+  Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+  This file is part of GPGME++.
+
+  GPGME++ is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  GPGME++ is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with GPGME++; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "util.h"
+
+#include <functional>
+
+StringsToCStrings::StringsToCStrings(const std::vector<std::string>& v)
+    : m_strings{v}
+{
+}
+
+const char **StringsToCStrings::c_strs() const
+{
+    if (m_cstrings.empty()) {
+        m_cstrings.reserve(m_strings.size() + 1);
+        std::transform(std::begin(m_strings), std::end(m_strings),
+                       std::back_inserter(m_cstrings),
+                       std::mem_fn(&std::string::c_str));
+        m_cstrings.push_back(nullptr);
+    }
+    return m_cstrings.data();
+}

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/src/util.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/src/util.h Changed

@@ -1,8 +1,10 @@
 /*
-  util.h - some inline helper functions
+  util.h - some internal helpers
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
   2016 Bundesamt für Sicherheit in der Informationstechnik
   Software engineering by Intevation GmbH
+  Copyright (c) 2022 g10 Code GmbH
+  Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
 
   This file is part of GPGME++.
 
@@ -175,4 +177,25 @@
     return static_cast<gpgme_sig_notation_flags_t>(result);
 }
 
+/**
+ * Adapter for passing a vector of strings as NULL-terminated array of
+ * const char* to the C-interface of gpgme.
+ */
+class StringsToCStrings
+{
+public:
+    explicit StringsToCStrings(const std::vector<std::string> &v);
+    ~StringsToCStrings() = default;
+
+    StringsToCStrings(const StringsToCStrings &) = delete;
+    StringsToCStrings &operator=(const StringsToCStrings &) = delete;
+    StringsToCStrings(StringsToCStrings &&) = delete;
+    StringsToCStrings &operator=(StringsToCStrings &&) = delete;
+
+    const char **c_strs() const;
+private:
+    const std::vector<std::string> m_strings;
+    mutable std::vector<const char *> m_cstrings;
+};
+
 #endif // __GPGMEPP_UTIL_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/tests/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/tests/Makefile.am Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/cpp/tests/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/tests/Makefile.in Changed

@@ -107,7 +107,7 @@
 build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = run-getkey$(EXEEXT) run-keylist$(EXEEXT) \
-	run-verify$(EXEEXT)
+	run-verify$(EXEEXT) $(am__EXEEXT_1)
 subdir = lang/cpp/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
@@ -128,6 +128,7 @@
 CONFIG_HEADER = $(top_builddir)/conf/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@HAVE_W32_SYSTEM_FALSE@am__EXEEXT_1 = run-wkdlookup$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_run_getkey_OBJECTS = run-getkey.$(OBJEXT)
 run_getkey_OBJECTS = $(am_run_getkey_OBJECTS)
@@ -148,6 +149,13 @@
 run_verify_LDADD = $(LDADD)
 run_verify_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
 	../../../src/libgpgme.la
+am__run_wkdlookup_SOURCES_DIST = run-wkdlookup.cpp
+@HAVE_W32_SYSTEM_FALSE@am_run_wkdlookup_OBJECTS =  \
+@HAVE_W32_SYSTEM_FALSE@	run-wkdlookup.$(OBJEXT)
+run_wkdlookup_OBJECTS = $(am_run_wkdlookup_OBJECTS)
+run_wkdlookup_LDADD = $(LDADD)
+run_wkdlookup_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../../../src/libgpgme.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -164,7 +172,8 @@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/run-getkey.Po \
-	./$(DEPDIR)/run-keylist.Po ./$(DEPDIR)/run-verify.Po
+	./$(DEPDIR)/run-keylist.Po ./$(DEPDIR)/run-verify.Po \
+	./$(DEPDIR)/run-wkdlookup.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -185,9 +194,9 @@
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 SOURCES = $(run_getkey_SOURCES) $(run_keylist_SOURCES) \
-	$(run_verify_SOURCES)
+	$(run_verify_SOURCES) $(run_wkdlookup_SOURCES)
 DIST_SOURCES = $(run_getkey_SOURCES) $(run_keylist_SOURCES) \
-	$(run_verify_SOURCES)
+	$(run_verify_SOURCES) $(am__run_wkdlookup_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -427,6 +436,9 @@
 run_getkey_SOURCES = run-getkey.cpp
 run_keylist_SOURCES = run-keylist.cpp
 run_verify_SOURCES = run-verify.cpp
+@HAVE_W32_SYSTEM_FALSE@run_wkdlookup_SOURCES = run-wkdlookup.cpp
+@HAVE_W32_SYSTEM_FALSE@programs_unix = run-wkdlookup
+@HAVE_W32_SYSTEM_TRUE@programs_unix = 
 all: all-am
 
 .SUFFIXES:
@@ -482,6 +494,10 @@
 	@rm -f run-verify$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(run_verify_OBJECTS) $(run_verify_LDADD) $(LIBS)
 
+run-wkdlookup$(EXEEXT): $(run_wkdlookup_OBJECTS) $(run_wkdlookup_DEPENDENCIES) $(EXTRA_run_wkdlookup_DEPENDENCIES) 
+	@rm -f run-wkdlookup$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(run_wkdlookup_OBJECTS) $(run_wkdlookup_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -491,6 +507,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-getkey.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keylist.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-verify.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-wkdlookup.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -653,6 +670,7 @@
 		-rm -f ./$(DEPDIR)/run-getkey.Po
 	-rm -f ./$(DEPDIR)/run-keylist.Po
 	-rm -f ./$(DEPDIR)/run-verify.Po
+	-rm -f ./$(DEPDIR)/run-wkdlookup.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -701,6 +719,7 @@
 		-rm -f ./$(DEPDIR)/run-getkey.Po
 	-rm -f ./$(DEPDIR)/run-keylist.Po
 	-rm -f ./$(DEPDIR)/run-verify.Po
+	-rm -f ./$(DEPDIR)/run-wkdlookup.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/cpp/tests/run-wkdlookup.cpp Added

@@ -0,0 +1,156 @@
+/*
+    run-wkdlookup.cpp
+
+    This file is part of GpgMEpp's test suite.
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    GPGME++ is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    GPGME++ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with GPGME++; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "context.h"
+#include "data.h"
+#include "defaultassuantransaction.h"
+#include "key.h"
+
+#include <memory>
+#include <sstream>
+#include <iostream>
+#include <thread>
+
+using namespace GpgME;
+
+static int
+show_usage (int ex)
+{
+  fputs ("usage: run-wkdlookup <email address>\n\n"
+         , stderr);
+  exit (ex);
+}
+
+int
+main (int argc, char **argv)
+{
+    int last_argc = -1;
+
+    if (argc) {
+        argc--; argv++;
+    }
+
+    while (argc && last_argc != argc ) {
+        last_argc = argc;
+        if (!strcmp (*argv, "--")) {
+            argc--; argv++;
+            break;
+        } else if (!strcmp (*argv, "--help")) {
+            show_usage (0);
+        } else if (!strncmp (*argv, "--", 2)) {
+            show_usage (1);
+        }
+    }
+
+    if (argc != 1) {
+        show_usage (1);
+    }
+
+    const std::string email{*argv};
+
+    GpgME::initializeLibrary();
+    Error err;
+    auto ctx = std::unique_ptr<Context>{Context::createForEngine(AssuanEngine, &err)};
+    if (!ctx) {
+        std::cerr << "Failed to get context (Error: " << err.asString() << ")\n";
+        return -1;
+    }
+
+    const std::string dirmngrSocket = GpgME::dirInfo("dirmngr-socket");
+    if ((err = ctx->setEngineFileName(dirmngrSocket.c_str()))) {
+        std::cerr << "Failed to set engine file name (Error: " << err.asString() << ")\n";
+        return -1;
+    }
+    if ((err = ctx->setEngineHomeDirectory(""))) {
+        std::cerr << "Failed to set engine home directory (Error: " << err.asString() << ")\n";
+        return -1;
+    }
+
+    // try do connect to dirmngr
+    err = ctx->assuanTransact("GETINFO version");
+    if (err && err.code() != GPG_ERR_ASS_CONNECT_FAILED) {
+        std::cerr << "Failed to start assuan transaction (Error: " << err.asString() << ")\n";
+        return -1;
+    }
+    if (err.code() == GPG_ERR_ASS_CONNECT_FAILED) {
+        std::cerr << "Starting dirmngr ...\n";
+        auto spawnCtx = std::unique_ptr<Context>{Context::createForEngine(SpawnEngine, &err)};
+        if (!spawnCtx) {
+            std::cerr << "Failed to get context for spawn engine (Error: " << err.asString() << ")\n";
+            return -1;
+        }
+
+        const auto dirmngrProgram = GpgME::dirInfo("dirmngr-name");
+        const auto homedir = GpgME::dirInfo("homedir");
+        const char *argv = {
+            dirmngrProgram,
+            "--homedir",
+            homedir,
+            "--daemon",
+            NULL
+        };
+        auto ignoreIO = Data{Data::null};
+        err = spawnCtx->spawnAsync(dirmngrProgram, argv,
+                                   ignoreIO, ignoreIO, ignoreIO,
+                                   Context::SpawnDetached);
+        if (err) {
+            std::cerr << "Failed to start dirmngr (Error: " << err.asString() << ")\n";
+            return -1;
+        }
+
+        // wait for socket to become available
+        int cnt = 0;
+        do {
+            ++cnt;
+            std::cerr << "Waiting for dirmngr to start ...\n";
+            std::this_thread::sleep_for(std::chrono::milliseconds{250 * cnt});
+            err = ctx->assuanTransact("GETINFO version");
+        } while (err.code() == GPG_ERR_ASS_CONNECT_FAILED && cnt < 5);
+    }
+
+    const auto cmd = std::string{"WKD_GET "} + email;
+    err = ctx->assuanTransact(cmd.c_str());
+    if (err && err.code() != GPG_ERR_NO_NAME && err.code() != GPG_ERR_NO_DATA) {
+        std::cerr << "Error: WKD_GET returned " << err.asString() << "\n";
+        return -1;
+    }
+
+    const auto transaction = std::unique_ptr<DefaultAssuanTransaction>(dynamic_cast<DefaultAssuanTransaction*>(ctx->takeLastAssuanTransaction().release()));
+    const auto source = transaction->firstStatusLine("SOURCE");
+    const auto rawData = transaction->data();
+    if (rawData.size() == 0) {
+        std::cout << "No key found for " << email << "\n";
+    } else {
+        const auto data = GpgME::Data{rawData.c_str(), rawData.size()};
+        const auto keys = data.toKeys(GpgME::OpenPGP);
+        for (const auto &key : keys) {
+            std::cout << "Found key for " << email << " at " << source << ":\n" << key << "\n";
+        }
+    }
+
+    return 0;
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/AddExistingSubkeyJob Added

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/Makefile.am Changed

@@ -27,25 +27,29 @@
     dataprovider.cpp \
     debug.cpp \
     job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \
+    qgpgmeaddexistingsubkeyjob.cpp \
     qgpgmebackend.cpp qgpgmechangeexpiryjob.cpp qgpgmechangeownertrustjob.cpp \
     qgpgmechangepasswdjob.cpp qgpgmedecryptjob.cpp \
     qgpgmedecryptverifyjob.cpp qgpgmedeletejob.cpp qgpgmedownloadjob.cpp \
     qgpgmeencryptjob.cpp qgpgmeexportjob.cpp qgpgmeimportfromkeyserverjob.cpp \
     qgpgmeimportjob.cpp qgpgmekeygenerationjob.cpp qgpgmekeylistjob.cpp \
     qgpgmelistallkeysjob.cpp qgpgmenewcryptoconfig.cpp \
+    qgpgmereceivekeysjob.cpp \
     qgpgmerefreshkeysjob.cpp \
-    qgpgmesecretkeyexportjob.cpp qgpgmesignencryptjob.cpp \
+    qgpgmesignencryptjob.cpp \
     qgpgmesignjob.cpp qgpgmesignkeyjob.cpp qgpgmeverifydetachedjob.cpp \
-    qgpgmeverifyopaquejob.cpp threadedjobmixin.cpp \
+    qgpgmeverifyopaquejob.cpp qgpgmewkdlookupjob.cpp threadedjobmixin.cpp \
     qgpgmekeyformailboxjob.cpp qgpgme_debug.cpp \
     qgpgmetofupolicyjob.cpp qgpgmequickjob.cpp \
     defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \
-    qgpgmegpgcardjob.cpp \
-    dn.cpp cryptoconfig.cpp
+    qgpgmegpgcardjob.cpp changeexpiryjob.cpp importjob.cpp \
+    dn.cpp cryptoconfig.cpp wkdlookupresult.cpp \
+    util.cpp
 
 # If you add one here make sure that you also add one in camelcase
 qgpgme_headers= \
     abstractimportjob.h \
+    addexistingsubkeyjob.h \
     adduseridjob.h \
     changeexpiryjob.h \
     changeownertrustjob.h \
@@ -65,6 +69,7 @@
     qgpgme_export.h \
     qgpgmenewcryptoconfig.h \
     quickjob.h \
+    receivekeysjob.h \
     specialjob.h \
     signjob.h \
     signkeyjob.h \
@@ -81,11 +86,14 @@
     verifydetachedjob.h \
     defaultkeygenerationjob.h \
     tofupolicyjob.h \
+    wkdlookupjob.h \
+    wkdlookupresult.h \
     wkspublishjob.h \
     gpgcardjob.h \
     dn.h
 
 camelcase_headers= \
+    AddExistingSubkeyJob \
     AddUserIDJob \
     AbstractImportJob \
     ChangeExpiryJob \
@@ -105,6 +113,7 @@
     Protocol \
     QGpgMENewCryptoConfig \
     QuickJob \
+    ReceiveKeysJob \
     SpecialJob \
     SignJob \
     SignKeyJob \
@@ -121,6 +130,8 @@
     VerifyDetachedJob \
     KeyForMailboxJob \
     DefaultKeyGenerationJob \
+    WKDLookupJob \
+    WKDLookupResult \
     WKSPublishJob \
     TofuPolicyJob \
     GpgCardJob
@@ -128,6 +139,8 @@
 private_qgpgme_headers = \
     qgpgme_export.h \
     protocol_p.h \
+    job_p.h \
+    qgpgmeaddexistingsubkeyjob.h \
     qgpgmeadduseridjob.h \
     qgpgmebackend.h \
     qgpgmechangeexpiryjob.h \
@@ -144,22 +157,25 @@
     qgpgmekeygenerationjob.h \
     qgpgmekeylistjob.h \
     qgpgmelistallkeysjob.h \
+    qgpgmereceivekeysjob.h \
     qgpgmerefreshkeysjob.h \
-    qgpgmesecretkeyexportjob.h \
     qgpgmesignencryptjob.h \
     qgpgmesignjob.h \
     qgpgmesignkeyjob.h \
     qgpgmeverifydetachedjob.h \
     qgpgmeverifyopaquejob.h \
+    qgpgmewkdlookupjob.h \
     qgpgmekeyformailboxjob.h \
     qgpgmewkspublishjob.h \
     qgpgmetofupolicyjob.h \
     qgpgmegpgcardjob.h \
     qgpgmequickjob.h \
-    threadedjobmixin.h
+    threadedjobmixin.h \
+    util.h
 
 qgpgme_moc_sources = \
     abstractimportjob.moc \
+    addexistingsubkeyjob.moc \
     adduseridjob.moc \
     changeexpiryjob.moc \
     changeownertrustjob.moc \
@@ -178,6 +194,7 @@
     keylistjob.moc \
     listallkeysjob.moc \
     multideletejob.moc \
+    qgpgmeaddexistingsubkeyjob.moc \
     qgpgmeadduseridjob.moc \
     qgpgmechangeexpiryjob.moc \
     qgpgmechangeownertrustjob.moc \
@@ -193,16 +210,18 @@
     qgpgmekeygenerationjob.moc \
     qgpgmekeylistjob.moc \
     qgpgmelistallkeysjob.moc \
+    qgpgmereceivekeysjob.moc \
     qgpgmerefreshkeysjob.moc \
-    qgpgmesecretkeyexportjob.moc \
     qgpgmesignencryptjob.moc \
     qgpgmesignjob.moc \
     qgpgmesignkeyjob.moc \
     qgpgmeverifydetachedjob.moc \
     qgpgmeverifyopaquejob.moc \
+    qgpgmewkdlookupjob.moc \
     qgpgmewkspublishjob.moc \
     tofupolicyjob.moc \
     qgpgmetofupolicyjob.moc \
+    receivekeysjob.moc \
     refreshkeysjob.moc \
     signencryptjob.moc \
     signjob.moc \
@@ -210,6 +229,7 @@
     specialjob.moc \
     verifydetachedjob.moc \
     verifyopaquejob.moc \
+    wkdlookupjob.moc \
     keyformailboxjob.moc \
     wkspublishjob.moc \
     qgpgmekeyformailboxjob.moc \

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/Makefile.in Changed

@@ -146,21 +146,24 @@
 libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
 	../../../src/libgpgme.la
 am__objects_1 = dataprovider.lo debug.lo job.lo multideletejob.lo \
-	qgpgmeadduseridjob.lo qgpgmebackend.lo \
-	qgpgmechangeexpiryjob.lo qgpgmechangeownertrustjob.lo \
-	qgpgmechangepasswdjob.lo qgpgmedecryptjob.lo \
-	qgpgmedecryptverifyjob.lo qgpgmedeletejob.lo \
-	qgpgmedownloadjob.lo qgpgmeencryptjob.lo qgpgmeexportjob.lo \
-	qgpgmeimportfromkeyserverjob.lo qgpgmeimportjob.lo \
-	qgpgmekeygenerationjob.lo qgpgmekeylistjob.lo \
-	qgpgmelistallkeysjob.lo qgpgmenewcryptoconfig.lo \
-	qgpgmerefreshkeysjob.lo qgpgmesecretkeyexportjob.lo \
-	qgpgmesignencryptjob.lo qgpgmesignjob.lo qgpgmesignkeyjob.lo \
+	qgpgmeadduseridjob.lo qgpgmeaddexistingsubkeyjob.lo \
+	qgpgmebackend.lo qgpgmechangeexpiryjob.lo \
+	qgpgmechangeownertrustjob.lo qgpgmechangepasswdjob.lo \
+	qgpgmedecryptjob.lo qgpgmedecryptverifyjob.lo \
+	qgpgmedeletejob.lo qgpgmedownloadjob.lo qgpgmeencryptjob.lo \
+	qgpgmeexportjob.lo qgpgmeimportfromkeyserverjob.lo \
+	qgpgmeimportjob.lo qgpgmekeygenerationjob.lo \
+	qgpgmekeylistjob.lo qgpgmelistallkeysjob.lo \
+	qgpgmenewcryptoconfig.lo qgpgmereceivekeysjob.lo \
+	qgpgmerefreshkeysjob.lo qgpgmesignencryptjob.lo \
+	qgpgmesignjob.lo qgpgmesignkeyjob.lo \
 	qgpgmeverifydetachedjob.lo qgpgmeverifyopaquejob.lo \
-	threadedjobmixin.lo qgpgmekeyformailboxjob.lo qgpgme_debug.lo \
+	qgpgmewkdlookupjob.lo threadedjobmixin.lo \
+	qgpgmekeyformailboxjob.lo qgpgme_debug.lo \
 	qgpgmetofupolicyjob.lo qgpgmequickjob.lo \
 	defaultkeygenerationjob.lo qgpgmewkspublishjob.lo \
-	qgpgmegpgcardjob.lo dn.lo cryptoconfig.lo
+	qgpgmegpgcardjob.lo changeexpiryjob.lo importjob.lo dn.lo \
+	cryptoconfig.lo wkdlookupresult.lo util.lo
 am__objects_2 =
 am_libqgpgme_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 	$(am__objects_2)
@@ -189,11 +192,13 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/conf
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/cryptoconfig.Plo \
-	./$(DEPDIR)/dataprovider.Plo ./$(DEPDIR)/debug.Plo \
-	./$(DEPDIR)/defaultkeygenerationjob.Plo ./$(DEPDIR)/dn.Plo \
+am__depfiles_remade = ./$(DEPDIR)/changeexpiryjob.Plo \
+	./$(DEPDIR)/cryptoconfig.Plo ./$(DEPDIR)/dataprovider.Plo \
+	./$(DEPDIR)/debug.Plo ./$(DEPDIR)/defaultkeygenerationjob.Plo \
+	./$(DEPDIR)/dn.Plo ./$(DEPDIR)/importjob.Plo \
 	./$(DEPDIR)/job.Plo ./$(DEPDIR)/multideletejob.Plo \
 	./$(DEPDIR)/qgpgme_debug.Plo \
+	./$(DEPDIR)/qgpgmeaddexistingsubkeyjob.Plo \
 	./$(DEPDIR)/qgpgmeadduseridjob.Plo \
 	./$(DEPDIR)/qgpgmebackend.Plo \
 	./$(DEPDIR)/qgpgmechangeexpiryjob.Plo \
@@ -214,15 +219,17 @@
 	./$(DEPDIR)/qgpgmelistallkeysjob.Plo \
 	./$(DEPDIR)/qgpgmenewcryptoconfig.Plo \
 	./$(DEPDIR)/qgpgmequickjob.Plo \
+	./$(DEPDIR)/qgpgmereceivekeysjob.Plo \
 	./$(DEPDIR)/qgpgmerefreshkeysjob.Plo \
-	./$(DEPDIR)/qgpgmesecretkeyexportjob.Plo \
 	./$(DEPDIR)/qgpgmesignencryptjob.Plo \
 	./$(DEPDIR)/qgpgmesignjob.Plo ./$(DEPDIR)/qgpgmesignkeyjob.Plo \
 	./$(DEPDIR)/qgpgmetofupolicyjob.Plo \
 	./$(DEPDIR)/qgpgmeverifydetachedjob.Plo \
 	./$(DEPDIR)/qgpgmeverifyopaquejob.Plo \
+	./$(DEPDIR)/qgpgmewkdlookupjob.Plo \
 	./$(DEPDIR)/qgpgmewkspublishjob.Plo \
-	./$(DEPDIR)/threadedjobmixin.Plo
+	./$(DEPDIR)/threadedjobmixin.Plo ./$(DEPDIR)/util.Plo \
+	./$(DEPDIR)/wkdlookupresult.Plo
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -523,26 +530,30 @@
     dataprovider.cpp \
     debug.cpp \
     job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \
+    qgpgmeaddexistingsubkeyjob.cpp \
     qgpgmebackend.cpp qgpgmechangeexpiryjob.cpp qgpgmechangeownertrustjob.cpp \
     qgpgmechangepasswdjob.cpp qgpgmedecryptjob.cpp \
     qgpgmedecryptverifyjob.cpp qgpgmedeletejob.cpp qgpgmedownloadjob.cpp \
     qgpgmeencryptjob.cpp qgpgmeexportjob.cpp qgpgmeimportfromkeyserverjob.cpp \
     qgpgmeimportjob.cpp qgpgmekeygenerationjob.cpp qgpgmekeylistjob.cpp \
     qgpgmelistallkeysjob.cpp qgpgmenewcryptoconfig.cpp \
+    qgpgmereceivekeysjob.cpp \
     qgpgmerefreshkeysjob.cpp \
-    qgpgmesecretkeyexportjob.cpp qgpgmesignencryptjob.cpp \
+    qgpgmesignencryptjob.cpp \
     qgpgmesignjob.cpp qgpgmesignkeyjob.cpp qgpgmeverifydetachedjob.cpp \
-    qgpgmeverifyopaquejob.cpp threadedjobmixin.cpp \
+    qgpgmeverifyopaquejob.cpp qgpgmewkdlookupjob.cpp threadedjobmixin.cpp \
     qgpgmekeyformailboxjob.cpp qgpgme_debug.cpp \
     qgpgmetofupolicyjob.cpp qgpgmequickjob.cpp \
     defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \
-    qgpgmegpgcardjob.cpp \
-    dn.cpp cryptoconfig.cpp
+    qgpgmegpgcardjob.cpp changeexpiryjob.cpp importjob.cpp \
+    dn.cpp cryptoconfig.cpp wkdlookupresult.cpp \
+    util.cpp
 
 
 # If you add one here make sure that you also add one in camelcase
 qgpgme_headers = \
     abstractimportjob.h \
+    addexistingsubkeyjob.h \
     adduseridjob.h \
     changeexpiryjob.h \
     changeownertrustjob.h \
@@ -562,6 +573,7 @@
     qgpgme_export.h \
     qgpgmenewcryptoconfig.h \
     quickjob.h \
+    receivekeysjob.h \
     specialjob.h \
     signjob.h \
     signkeyjob.h \
@@ -578,11 +590,14 @@
     verifydetachedjob.h \
     defaultkeygenerationjob.h \
     tofupolicyjob.h \
+    wkdlookupjob.h \
+    wkdlookupresult.h \
     wkspublishjob.h \
     gpgcardjob.h \
     dn.h
 
 camelcase_headers = \
+    AddExistingSubkeyJob \
     AddUserIDJob \
     AbstractImportJob \
     ChangeExpiryJob \
@@ -602,6 +617,7 @@
     Protocol \
     QGpgMENewCryptoConfig \
     QuickJob \
+    ReceiveKeysJob \
     SpecialJob \
     SignJob \
     SignKeyJob \
@@ -618,6 +634,8 @@
     VerifyDetachedJob \
     KeyForMailboxJob \
     DefaultKeyGenerationJob \
+    WKDLookupJob \
+    WKDLookupResult \
     WKSPublishJob \
     TofuPolicyJob \
     GpgCardJob
@@ -625,6 +643,8 @@
 private_qgpgme_headers = \
     qgpgme_export.h \
     protocol_p.h \
+    job_p.h \
+    qgpgmeaddexistingsubkeyjob.h \
     qgpgmeadduseridjob.h \
     qgpgmebackend.h \
     qgpgmechangeexpiryjob.h \
@@ -641,22 +661,25 @@
     qgpgmekeygenerationjob.h \
     qgpgmekeylistjob.h \
     qgpgmelistallkeysjob.h \
+    qgpgmereceivekeysjob.h \
     qgpgmerefreshkeysjob.h \
-    qgpgmesecretkeyexportjob.h \
     qgpgmesignencryptjob.h \
     qgpgmesignjob.h \
     qgpgmesignkeyjob.h \
     qgpgmeverifydetachedjob.h \
     qgpgmeverifyopaquejob.h \
+    qgpgmewkdlookupjob.h \
     qgpgmekeyformailboxjob.h \
     qgpgmewkspublishjob.h \
     qgpgmetofupolicyjob.h \
     qgpgmegpgcardjob.h \
     qgpgmequickjob.h \
-    threadedjobmixin.h
+    threadedjobmixin.h \
+    util.h
 
 qgpgme_moc_sources = \
     abstractimportjob.moc \
+    addexistingsubkeyjob.moc \
     adduseridjob.moc \
     changeexpiryjob.moc \
     changeownertrustjob.moc \
@@ -675,6 +698,7 @@
     keylistjob.moc \
     listallkeysjob.moc \
     multideletejob.moc \
+    qgpgmeaddexistingsubkeyjob.moc \
     qgpgmeadduseridjob.moc \
     qgpgmechangeexpiryjob.moc \
     qgpgmechangeownertrustjob.moc \
@@ -690,16 +714,18 @@
     qgpgmekeygenerationjob.moc \
     qgpgmekeylistjob.moc \
     qgpgmelistallkeysjob.moc \
+    qgpgmereceivekeysjob.moc \
     qgpgmerefreshkeysjob.moc \

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/ReceiveKeysJob Added

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/WKDLookupJob Added

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/WKDLookupResult Added

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/addexistingsubkeyjob.h Added

@@ -0,0 +1,79 @@
+/*
+    addexistingsubkeyjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_ADDEXISTINGSUBKEYJOB_H__
+#define __QGPGME_ADDEXISTINGSUBKEYJOB_H__
+
+#include "job.h"
+#include "qgpgme_export.h"
+
+class QString;
+
+namespace GpgME
+{
+class Error;
+class Key;
+class Subkey;
+}
+
+namespace QGpgME
+{
+
+class QGPGME_EXPORT AddExistingSubkeyJob : public Job
+{
+    Q_OBJECT
+protected:
+    explicit AddExistingSubkeyJob(QObject *parent);
+
+public:
+    ~AddExistingSubkeyJob();
+
+    /**
+      Starts the operation. \a key is the key to add the subkey \a subkey to.
+
+      The job deletes itself after it has completed the operation.
+    */
+    virtual GpgME::Error start(const GpgME::Key &key, const GpgME::Subkey &subkey) = 0;
+
+    /**
+      Runs the operation. \a key is the key to add the subkey \a subkey to.
+    */
+    virtual GpgME::Error exec(const GpgME::Key &key, const GpgME::Subkey &subkey) = 0;
+
+Q_SIGNALS:
+    void result(const GpgME::Error &result, const QString &auditLogAsHtml = {}, const GpgME::Error &auditLogError = {});
+};
+
+}
+
+#endif // __QGPGME_ADDEXISTINGSUBKEYJOB_H__

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/changeexpiryjob.cpp Added

@@ -0,0 +1,76 @@
+/*
+    changeexpiryjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "changeexpiryjob.h"
+#include "job_p.h"
+
+#include <context.h>
+
+using namespace GpgME;
+using namespace QGpgME;
+
+namespace
+{
+struct ChangeExpiryJobPrivate : public JobPrivate
+{
+    ChangeExpiryJobPrivate()
+    {
+    }
+
+    ~ChangeExpiryJobPrivate() override = default;
+
+    ChangeExpiryJob::Options m_options = ChangeExpiryJob::Default;
+};
+}
+
+void ChangeExpiryJob::setOptions(ChangeExpiryJob::Options options)
+{
+    auto d = jobPrivate<ChangeExpiryJobPrivate>(this);
+    d->m_options = options;
+}
+
+ChangeExpiryJob::Options ChangeExpiryJob::options() const
+{
+    auto d = jobPrivate<ChangeExpiryJobPrivate>(this);
+    return d->m_options;
+}
+
+/* For ABI compat not pure virtual. */
+Error ChangeExpiryJob::start(const Key &, const QDateTime &, const std::vector<Subkey> &)
+{
+    return {};
+}

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/changeexpiryjob.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/changeexpiryjob.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/cryptoconfig.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/cryptoconfig.cpp Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/cryptoconfig.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/cryptoconfig.h Changed

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/importjob.cpp Added

@@ -0,0 +1,91 @@
+/*
+    importjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "importjob.h"
+#include "job_p.h"
+
+#include <context.h>
+
+using namespace GpgME;
+using namespace QGpgME;
+
+namespace
+{
+struct ImportJobPrivate : public JobPrivate
+{
+    ImportJobPrivate()
+    {
+    }
+
+    ~ImportJobPrivate() override = default;
+
+    QString m_importFilter;
+    Key::Origin m_keyOrigin = Key::OriginUnknown;
+    QString m_keyOriginUrl;
+};
+}
+
+void QGpgME::ImportJob::setImportFilter(const QString &filter)
+{
+    const auto d = jobPrivate<ImportJobPrivate>(this);
+    d->m_importFilter = filter;
+}
+
+QString QGpgME::ImportJob::importFilter() const
+{
+    const auto d = jobPrivate<ImportJobPrivate>(this);
+    return d->m_importFilter;
+}
+
+void ImportJob::setKeyOrigin(GpgME::Key::Origin origin, const QString &url)
+{
+    const auto d = jobPrivate<ImportJobPrivate>(this);
+    d->m_keyOrigin = origin;
+    d->m_keyOriginUrl = url;
+}
+
+GpgME::Key::Origin ImportJob::keyOrigin() const
+{
+    const auto d = jobPrivate<ImportJobPrivate>(this);
+    return d->m_keyOrigin;
+}
+
+QString ImportJob::keyOriginUrl() const
+{
+    const auto d = jobPrivate<ImportJobPrivate>(this);
+    return d->m_keyOriginUrl;
+}

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/importjob.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/importjob.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/job.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/job.cpp Changed

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/job_p.h Added

@@ -0,0 +1,70 @@
+/*
+    job_p.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_JOB_P_H__
+#define __QGPGME_JOB_P_H__
+
+#include "job.h"
+
+#include <memory>
+
+namespace QGpgME
+{
+
+// Base class for pimpl classes for Job subclasses
+class JobPrivate
+{
+public:
+    virtual ~JobPrivate() {}
+};
+
+// Setter and getters for the externally stored pimpl instances of jobs
+// BCI: Add a real d-pointer to Job
+void setJobPrivate(const Job *job, std::unique_ptr<JobPrivate> d);
+
+JobPrivate *getJobPrivate(const Job *job);
+
+template <typename T>
+static T *jobPrivate(const Job *job) {
+    auto d = getJobPrivate(job);
+    if (!d) {
+        std::unique_ptr<T> ref{new T};
+        d = ref.get();
+        setJobPrivate(job, std::move(ref));
+    }
+    return dynamic_cast<T *>(d);
+}
+
+}
+
+#endif // __QGPGME_JOB_P_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/protocol.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/protocol.h Changed

@@ -40,6 +40,7 @@
 #include "qgpgme_export.h"
 
 namespace QGpgME {
+class AddExistingSubkeyJob;
 class CryptoConfig;
 class KeyListJob;
 class ListAllKeysJob;
@@ -64,10 +65,12 @@
 class AddUserIDJob;
 class SpecialJob;
 class KeyForMailboxJob;
+class WKDLookupJob;
 class WKSPublishJob;
 class TofuPolicyJob;
 class QuickJob;
 class GpgCardJob;
+class ReceiveKeysJob;
 
 /** The main entry point for QGpgME Comes in OpenPGP and SMIME(CMS) flavors.
  *
@@ -92,6 +95,7 @@
  * {
  *    // keys and resuls can now be used.
  * });
+ * job->start({QStringLiteral("alfa@example.net")}, false);
  * \endcode
  *
  * \code
@@ -123,9 +127,11 @@
     virtual KeyGenerationJob     *keyGenerationJob() const = 0;
     virtual ImportJob            *importJob() const = 0;
     virtual ImportFromKeyserverJob *importFromKeyserverJob() const = 0;
+    virtual ReceiveKeysJob       *receiveKeysJob() const = 0;
     virtual ExportJob            *publicKeyExportJob(bool armor = false) const = 0;
-    // @param charset the encoding of the passphrase in the exported file
-    virtual ExportJob            *secretKeyExportJob(bool armor = false, const QString &charset = QString()) const = 0;
+    // the second parameter is ignored; the passphrase in the exported file is always utf-8 encoded
+    virtual ExportJob            *secretKeyExportJob(bool armor = false, const QString & = QString()) const = 0;
+    virtual ExportJob            *secretSubkeyExportJob(bool armor = false) const = 0;
     virtual DownloadJob          *downloadJob(bool armor = false) const = 0;
     virtual DeleteJob            *deleteJob() const = 0;
     virtual SignEncryptJob       *signEncryptJob(bool armor = false, bool textMode = false) const = 0;
@@ -135,6 +141,7 @@
     virtual SignKeyJob           *signKeyJob() const = 0;
     virtual ChangePasswdJob      *changePasswdJob() const = 0;
     virtual ChangeOwnerTrustJob  *changeOwnerTrustJob() const = 0;
+    virtual AddExistingSubkeyJob *addExistingSubkeyJob() const = 0;
     virtual AddUserIDJob         *addUserIDJob() const = 0;
     virtual SpecialJob           *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
 
@@ -154,6 +161,9 @@
     /** Find the best key to use for a mailbox. */
     virtual KeyForMailboxJob *keyForMailboxJob() const = 0;
 
+    /** This job looks up a key via WKD without importing it. */
+    virtual WKDLookupJob *wkdLookupJob() const = 0;
+
     /** A Job for interacting with gnupg's wks tools. */
     virtual WKSPublishJob *wksPublishJob() const = 0;

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/protocol_p.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/protocol_p.h Changed

@@ -5,6 +5,8 @@
     Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
     Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
     Software engineering by Intevation GmbH
+    Copyright (c) 2022 by g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -42,7 +44,6 @@
 #include "qgpgmedecryptverifyjob.h"
 #include "qgpgmerefreshkeysjob.h"
 #include "qgpgmedeletejob.h"
-#include "qgpgmesecretkeyexportjob.h"
 #include "qgpgmedownloadjob.h"
 #include "qgpgmesignencryptjob.h"
 #include "qgpgmeencryptjob.h"
@@ -56,11 +57,14 @@
 #include "qgpgmechangeexpiryjob.h"
 #include "qgpgmechangeownertrustjob.h"
 #include "qgpgmechangepasswdjob.h"
+#include "qgpgmeaddexistingsubkeyjob.h"
 #include "qgpgmeadduseridjob.h"
 #include "qgpgmekeyformailboxjob.h"
+#include "qgpgmewkdlookupjob.h"
 #include "qgpgmewkspublishjob.h"
 #include "qgpgmetofupolicyjob.h"
 #include "qgpgmequickjob.h"
+#include "qgpgmereceivekeysjob.h"
 
 namespace
 {
@@ -230,6 +234,19 @@
         return new QGpgME::QGpgMEImportFromKeyserverJob(context);
     }
 
+    QGpgME::ReceiveKeysJob *receiveKeysJob() const override
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return nullptr;
+        }
+
+        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
+        if (!context) {
+            return nullptr;
+        }
+        return new QGpgME::QGpgMEReceiveKeysJob{context};
+    }
+
     QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
@@ -241,14 +258,26 @@
         return new QGpgME::QGpgMEExportJob(context);
     }
 
-    QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &charset) const Q_DECL_OVERRIDE
+    QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const Q_DECL_OVERRIDE
     {
-        if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
+        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
+        if (!context) {
             return nullptr;
         }
 
-        // this operation is not supported by gpgme, so we have to call gpgsm ourselves:
-        return new QGpgME::QGpgMESecretKeyExportJob(armor, charset);
+        context->setArmor(armor);
+        return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecret);
+    }
+
+    QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const Q_DECL_OVERRIDE
+    {
+        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
+        if (!context) {
+            return nullptr;
+        }
+
+        context->setArmor(armor);
+        return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecretSubkey);
     }
 
     QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
@@ -357,6 +386,19 @@
         return new QGpgME::QGpgMEChangeOwnerTrustJob(context);
     }
 
+    QGpgME:: AddExistingSubkeyJob *addExistingSubkeyJob() const override
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return nullptr;    // only supported by gpg
+        }
+
+        GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
+        if (!context) {
+            return nullptr;
+        }
+        return new QGpgME::QGpgMEAddExistingSubkeyJob{context};
+    }
+
     QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {
@@ -392,6 +434,18 @@
         return new QGpgME::QGpgMEKeyForMailboxJob(context);
     }
 
+    QGpgME::WKDLookupJob *wkdLookupJob() const Q_DECL_OVERRIDE
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return nullptr;
+        }
+        auto context = GpgME::Context::createForEngine(GpgME::AssuanEngine);
+        if (!context) {
+            return nullptr;
+        }
+        return new QGpgME::QGpgMEWKDLookupJob(context.release());
+    }
+
     QGpgME::WKSPublishJob *wksPublishJob() const Q_DECL_OVERRIDE
     {
         if (mProtocol != GpgME::OpenPGP) {

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp Added

@@ -0,0 +1,96 @@
+/*
+    qgpgmeaddexistingsubkeyjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "qgpgmeaddexistingsubkeyjob.h"
+
+#include "dataprovider.h"
+
+#include <QDateTime>
+
+#include "context.h"
+#include "data.h"
+#include "gpgaddexistingsubkeyeditinteractor.h"
+#include "key.h"
+
+#include <gpg-error.h>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+QGpgMEAddExistingSubkeyJob::QGpgMEAddExistingSubkeyJob(Context *context)
+    : mixin_type{context}
+{
+    lateInitialization();
+}
+
+QGpgMEAddExistingSubkeyJob::~QGpgMEAddExistingSubkeyJob() = default;
+
+static QGpgMEAddExistingSubkeyJob::result_type add_subkey(Context *ctx, const Key &key, const Subkey &subkey)
+{
+    std::unique_ptr<GpgAddExistingSubkeyEditInteractor> interactor{new GpgAddExistingSubkeyEditInteractor{subkey.keyGrip()}};
+
+    if (!subkey.neverExpires()) {
+        const auto expiry = QDateTime::fromSecsSinceEpoch(subkey.expirationTime(), Qt::UTC).toString(u"yyyyMMdd'T'hhmmss").toStdString();
+        interactor->setExpiry(expiry);
+    }
+
+    QGpgME::QByteArrayDataProvider dp;
+    Data data(&dp);
+    assert(!data.isNull());
+
+    ctx->setFlag("extended-edit", "1");
+
+    const Error err = ctx->edit(key, std::unique_ptr<EditInteractor>(interactor.release()), data);
+    Error ae;
+    const QString log = _detail::audit_log_as_html(ctx, ae);
+    return std::make_tuple(err, log, ae);
+}
+
+Error QGpgMEAddExistingSubkeyJob::start(const GpgME::Key &key, const GpgME::Subkey &subkey)
+{
+    run(std::bind(&add_subkey, std::placeholders::_1, key, subkey));
+    return {};
+}
+
+Error QGpgMEAddExistingSubkeyJob::exec(const GpgME::Key &key, const GpgME::Subkey &subkey)
+{
+    const result_type r = add_subkey(context(), key, subkey);
+    resultHook(r);
+    return std::get<0>(r);
+}
+
+#include "qgpgmeaddexistingsubkeyjob.moc"

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmeaddexistingsubkeyjob.h Added

@@ -0,0 +1,68 @@
+/*
+    qgpgmeaddexistingsubkeyjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_QGPGMEADDEXISTINGSUBKEYJOB_H__
+#define __QGPGME_QGPGMEADDEXISTINGSUBKEYJOB_H__
+
+#include "threadedjobmixin.h"
+#include "addexistingsubkeyjob.h"
+
+namespace QGpgME
+{
+
+class QGpgMEAddExistingSubkeyJob
+#ifdef Q_MOC_RUN
+    : public AddExistingSubkeyJob
+#else
+    : public _detail::ThreadedJobMixin<AddExistingSubkeyJob>
+#endif
+{
+    Q_OBJECT
+#ifdef Q_MOC_RUN
+public Q_SLOTS:
+    void slotFinished();
+#endif
+public:
+    explicit QGpgMEAddExistingSubkeyJob(GpgME::Context *context);
+    ~QGpgMEAddExistingSubkeyJob();
+
+    /* from AddExistingSubkeyJob */
+    GpgME::Error start(const GpgME::Key &key, const GpgME::Subkey &subkey) override;
+
+    /* from AddExistingSubkeyJob */
+    GpgME::Error  exec(const GpgME::Key &key, const GpgME::Subkey &subkey) override;
+};
+
+}
+
+#endif // __QGPGME_QGPGMEADDEXISTINGSUBKEYJOB_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmechangeexpiryjob.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmechangeexpiryjob.cpp Changed

@@ -5,6 +5,8 @@
     Copyright (c) 2008 Klarälvdalens Datakonsult AB
     Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
     Software engineering by Intevation GmbH
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -55,14 +57,32 @@
 QGpgMEChangeExpiryJob::~QGpgMEChangeExpiryJob() {}
 
 static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key &key, const QDateTime &expiry,
-    const std::vector<Subkey> &subkeys)
+    const std::vector<Subkey> &subkeys, ChangeExpiryJob::Options options)
 {
     // convert expiry to "seconds from now"; use 1 second from now if expiry is before the current datetime
     const unsigned long expires = expiry.isValid()
        ? std::max<qint64>(QDateTime::currentDateTime().secsTo(expiry), 1)
        : 0;
 
-    auto err = ctx->setExpire(key, expires, subkeys);
+    // updating the expiration date of the primary key and the subkeys needs to be done in two steps
+    // because --quick-set-expire does not support updating the expiration date of both at the same time
+
+    if (subkeys.empty() || (options & ChangeExpiryJob::UpdatePrimaryKey)) {
+        // update the expiration date of the primary key
+        auto err = ctx->setExpire(key, expires);
+        if (err) {
+            return std::make_tuple(err, QString(), Error());
+        }
+    }
+
+    GpgME::Error err;
+    if (!subkeys.empty()) {
+        // update the expiration date of the specified subkeys
+        err = ctx->setExpire(key, expires, subkeys);
+    } else if (options & ChangeExpiryJob::UpdateAllSubkeys) {
+        // update the expiration date of all subkeys
+        err = ctx->setExpire(key, expires, {}, Context::SetExpireAllSubkeys);
+    }
     return std::make_tuple(err, QString(), Error());
 }
 
@@ -73,13 +93,7 @@
 
 Error QGpgMEChangeExpiryJob::start(const Key &key, const QDateTime &expiry, const std::vector<Subkey> &subkeys)
 {
-    run(std::bind(&change_expiry, std::placeholders::_1, key, expiry, subkeys));
-    return Error();
-}
-
-/* For ABI compat not pure virtual. */
-Error ChangeExpiryJob::start(const Key &, const QDateTime &, const std::vector<Subkey> &)
-{
+    run(std::bind(&change_expiry, std::placeholders::_1, key, expiry, subkeys, options()));
     return Error();
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmechangeownertrustjob.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmechangeownertrustjob.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmeexportjob.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmeexportjob.cpp Changed

@@ -5,6 +5,8 @@
     Copyright (c) 2004,2008 Klarälvdalens Datakonsult AB
     Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
     Software engineering by Intevation GmbH
+    Copyright (c) 2022 by g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -52,23 +54,28 @@
 using namespace GpgME;
 
 QGpgMEExportJob::QGpgMEExportJob(Context *context)
-    : mixin_type(context),
-      m_flags(0)
+    : QGpgMEExportJob{context, 0}
+{
+}
+
+QGpgMEExportJob::QGpgMEExportJob(Context *context, unsigned int forcedMode)
+    : mixin_type{context}
+    , m_exportMode{forcedMode}
+    , m_additionalExportModeFlags{0}
 {
     lateInitialization();
 }
 
-QGpgMEExportJob::~QGpgMEExportJob() {}
+QGpgMEExportJob::~QGpgMEExportJob() = default;
 
-static QGpgMEExportJob::result_type export_qba(Context *ctx, const QStringList &patterns, unsigned int flags)
+static QGpgMEExportJob::result_type export_qba(Context *ctx, const QStringList &patterns, unsigned int mode)
 {
-
     const _detail::PatternConverter pc(patterns);
 
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
 
-    const Error err = ctx->exportPublicKeys(pc.patterns(), data, flags);
+    const Error err = ctx->exportKeys(pc.patterns(), data, mode);
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(err, dp.data(), log, ae);
@@ -76,13 +83,14 @@
 
 Error QGpgMEExportJob::start(const QStringList &patterns)
 {
-    run(std::bind(&export_qba, std::placeholders::_1, patterns, m_flags));
+    auto mode = m_exportMode | m_additionalExportModeFlags;
+    run(std::bind(&export_qba, std::placeholders::_1, patterns, mode));
     return Error();
 }
 
 void QGpgMEExportJob::setExportFlags(unsigned int flags)
 {
-    m_flags = flags;
+    m_additionalExportModeFlags = flags;
 }
 
 /* For ABI compat not pure virtual. */

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmeexportjob.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmeexportjob.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmeimportjob.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmeimportjob.cpp Changed

@@ -40,11 +40,9 @@
 
 #include "dataprovider.h"
 
-#include "context.h"
-#include "data.h"
-#include "key.h"
-
-#include <cassert>
+#include <context.h>
+#include <data.h>
+#include <key.h>
 
 using namespace QGpgME;
 using namespace GpgME;
@@ -55,14 +53,60 @@
     lateInitialization();
 }
 
-QGpgMEImportJob::~QGpgMEImportJob() {}
+QGpgMEImportJob::~QGpgMEImportJob() = default;
 
-static QGpgMEImportJob::result_type import_qba(Context *ctx, const QByteArray &certData)
+static const char *originToString(Key::Origin origin)
 {
+    static const std::map<Key::Origin, const char *> mapping = {
+        { Key::OriginUnknown, "unknown" },
+        { Key::OriginKS,      "ks" },
+        { Key::OriginDane,    "dane" },
+        { Key::OriginWKD,     "wkd" },
+        { Key::OriginURL,     "url" },
+        { Key::OriginFile,    "file" },
+        { Key::OriginSelf,    "self" },
+    };
+    const auto it = mapping.find(origin);
+    return (it != std::end(mapping)) ? it->second : nullptr;
+}
+
+static QGpgMEImportJob::result_type import_qba(Context *ctx, const QByteArray &certData, const QString &importFilter,
+                                               Key::Origin keyOrigin, const QString &keyOriginUrl)
+{
+    if (!importFilter.isEmpty()) {
+        ctx->setFlag("import-filter", importFilter.toStdString().c_str());
+    }
+    if (keyOrigin != Key::OriginUnknown) {
+        if (const auto origin = originToString(keyOrigin)) {
+            std::string value{origin};
+            if (!keyOriginUrl.isEmpty()) {
+                value += ",";
+                value += keyOriginUrl.toStdString();
+            }
+            ctx->setFlag("key-origin", value.c_str());
+        }
+    }
+
     QGpgME::QByteArrayDataProvider dp(certData);
     Data data(&dp);
 
-    const ImportResult res = ctx->importKeys(data);
+    ImportResult res = ctx->importKeys(data);
+    // HACK: If the import failed with an error, then check if res.imports()
+    // contains only import statuses with "bad passphrase" error; if yes, this
+    // means that the user probably entered a wrong password to decrypt an
+    // encrypted key for import. In this case, return a result with "bad
+    // passphrase" error instead of the original error.
+    // We check if all import statuses instead of any import status has a
+    // "bad passphrase" error to avoid breaking imports that partially worked.
+    // See https://dev.gnupg.org/T5713.
+    const auto imports = res.imports();
+    if (res.error() && !imports.empty()
+        && std::all_of(std::begin(imports), std::end(imports),
+                       (const Import &import) {
+                           return import.error().code() == GPG_ERR_BAD_PASSPHRASE;
+                       })) {
+        res = ImportResult{Error{GPG_ERR_BAD_PASSPHRASE}};
+    }
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
     return std::make_tuple(res, log, ae);
@@ -70,13 +114,13 @@
 
 Error QGpgMEImportJob::start(const QByteArray &certData)
 {
-    run(std::bind(&import_qba, std::placeholders::_1, certData));
+    run(std::bind(&import_qba, std::placeholders::_1, certData, importFilter(), keyOrigin(), keyOriginUrl()));
     return Error();
 }
 
 GpgME::ImportResult QGpgME::QGpgMEImportJob::exec(const QByteArray &keyData)
 {
-    const result_type r = import_qba(context(), keyData);
+    const result_type r = import_qba(context(), keyData, importFilter(), keyOrigin(), keyOriginUrl());
     resultHook(r);
     return mResult;
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmenewcryptoconfig.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmenewcryptoconfig.cpp Changed

@@ -43,6 +43,7 @@
 
 #include <QFile>
 #include <QDir>
+#include <QList>
 
 #include "global.h"
 #include "error.h"
@@ -710,6 +711,57 @@
     return m_option.dirty();
 }
 
+QVariant QGpgMENewCryptoConfigEntry::defaultValue() const
+{
+    const auto defaultValue = m_option.defaultValue();
+    if (defaultValue.isNull() || defaultValue.numElements() == 0) {
+        return {};
+    }
+    if (defaultValue.numElements() == 1) {
+        switch (m_option.alternateType()) {
+        case NoType:
+            return QVariant{defaultValue.boolValue()};
+        case StringType:
+            return QVariant{QString::fromUtf8(defaultValue.stringValue())};
+        case IntegerType:
+            return QVariant{defaultValue.intValue()};
+        case UnsignedIntegerType:
+            return QVariant{defaultValue.uintValue()};
+        default:
+            // alternateType should always be one of the above four types
+            qCWarning(QGPGME_LOG) << __func__ << ": unsupported alternateType" << m_option.alternateType();
+        }
+    } else {
+        QList<QVariant> list;
+        switch (m_option.alternateType()) {
+        case StringType: {
+            const auto values = defaultValue.stringValues();
+            std::transform(std::begin(values), std::end(values), std::back_inserter(list),
+                           (const char *value) { return QVariant{QString::fromUtf8(value)}; });
+            break;
+        }
+        case IntegerType: {
+            const auto values = defaultValue.intValues();
+            std::transform(std::begin(values), std::end(values), std::back_inserter(list),
+                           (int value) { return QVariant{value}; });
+            break;
+        }
+        case UnsignedIntegerType: {
+            const auto values = defaultValue.uintValues();
+            std::transform(std::begin(values), std::end(values), std::back_inserter(list),
+                           (unsigned int value) { return QVariant{value}; });
+            break;
+        }
+        default:
+            // alternateType should always be one of the above four types
+            qCWarning(QGPGME_LOG) << __func__ << ": unsupported alternateType" << m_option.alternateType() << "for list";
+        }
+        return QVariant{list};
+    }
+
+    return {};
+}
+
 #if 0
 QString QGpgMENewCryptoConfigEntry::toString(bool escape) const
 {

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/qgpgmenewcryptoconfig.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmenewcryptoconfig.h Changed

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmereceivekeysjob.cpp Added

@@ -0,0 +1,79 @@
+/*
+    qgpgmereceivekeysjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "qgpgmereceivekeysjob.h"
+
+#include "util.h"
+
+using namespace QGpgME;
+using namespace GpgME;
+
+QGpgMEReceiveKeysJob::QGpgMEReceiveKeysJob(Context *context)
+    : mixin_type{context}
+{
+    lateInitialization();
+}
+
+QGpgMEReceiveKeysJob::~QGpgMEReceiveKeysJob() = default;
+
+static QGpgMEReceiveKeysJob::result_type importfromkeyserver(Context *ctx, const QStringList &keyIds)
+{
+    const ImportResult res = ctx->importKeys(toStrings(keyIds));
+    Error ae;
+    const QString log = _detail::audit_log_as_html(ctx, ae);
+    return std::make_tuple(res, log, ae);
+}
+
+Error QGpgMEReceiveKeysJob::start(const QStringList &keyIds)
+{
+    run(std::bind(&importfromkeyserver, std::placeholders::_1, keyIds));
+    return Error();
+}
+
+GpgME::ImportResult QGpgME::QGpgMEReceiveKeysJob::exec(const QStringList &keyIds)
+{
+    const result_type r = importfromkeyserver(context(), keyIds);
+    resultHook(r);
+    return mResult;
+}
+
+void QGpgME::QGpgMEReceiveKeysJob::resultHook(const result_type &tuple)
+{
+    mResult = std::get<0>(tuple);
+}
+
+#include "qgpgmereceivekeysjob.moc"

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmereceivekeysjob.h Added

@@ -0,0 +1,79 @@
+/*
+    qgpgmereceivekeysjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_QGPGMERECEIVEKEYSJOB_H__
+#define __QGPGME_QGPGMERECEIVEKEYSJOB_H__
+
+#include "receivekeysjob.h"
+
+#include "threadedjobmixin.h"
+
+#ifdef BUILDING_QGPGME
+# include "importresult.h"
+#else
+# include <gpgme++/importresult.h>
+#endif
+
+namespace QGpgME
+{
+
+class QGpgMEReceiveKeysJob
+#ifdef Q_MOC_RUN
+    : public ReceiveKeysJob
+#else
+    : public _detail::ThreadedJobMixin<ReceiveKeysJob, std::tuple<GpgME::ImportResult, QString, GpgME::Error>>
+#endif
+{
+    Q_OBJECT
+#ifdef Q_MOC_RUN
+public Q_SLOTS:
+    void slotFinished();
+#endif
+public:
+    explicit QGpgMEReceiveKeysJob(GpgME::Context *context);
+    ~QGpgMEReceiveKeysJob() override;
+
+    GpgME::Error start(const QStringList &keyIds) override;
+
+    GpgME::ImportResult exec(const QStringList &keyIds) override;
+
+    /* from ThreadedJobMixin */
+    void resultHook(const result_type &r) override;
+
+private:
+    GpgME::ImportResult mResult;
+};
+
+}
+
+#endif // __QGPGME_QGPGMERECEIVEKEYSJOB_H__

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmewkdlookupjob.cpp Added

@@ -0,0 +1,183 @@
+/*
+    qgpgmewkdlookupjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "qgpgmewkdlookupjob.h"
+
+#include "qgpgme_debug.h"
+
+#include <context.h>
+#include <data.h>
+#include <defaultassuantransaction.h>
+
+#include <gpg-error.h>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+QGpgMEWKDLookupJob::QGpgMEWKDLookupJob(Context *context)
+    : mixin_type{context}
+{
+    lateInitialization();
+}
+
+QGpgMEWKDLookupJob::~QGpgMEWKDLookupJob() = default;
+
+static GpgME::Error startDirmngr(Context *assuanCtx)
+{
+    Error err;
+
+    auto spawnCtx = std::unique_ptr<Context>{Context::createForEngine(SpawnEngine, &err)};
+    if (err) {
+        qCDebug(QGPGME_LOG) << "Error: Failed to get context for spawn engine (" << err.asString() << ")";
+    }
+
+    const auto dirmngrProgram = GpgME::dirInfo("dirmngr-name");
+    const auto homedir = GpgME::dirInfo("homedir");
+    const char *argv = {
+        dirmngrProgram,
+        "--homedir",
+        homedir,
+        "--daemon",
+        NULL
+    };
+    auto ignoreIO = Data{Data::null};
+    if (!err) {
+        qCDebug(QGPGME_LOG) << "Starting dirmngr ...";
+        err = spawnCtx->spawnAsync(dirmngrProgram, argv,
+                                   ignoreIO, ignoreIO, ignoreIO,
+                                   Context::SpawnDetached);
+    }
+
+    if (!err) {
+        // wait for socket to become available
+        int cnt = 0;
+        do {
+            ++cnt;
+            qCDebug(QGPGME_LOG) << "Waiting for dirmngr to start ...";
+            QThread::msleep(250 * cnt);
+            err = assuanCtx->assuanTransact("GETINFO version");
+        } while (err.code() == GPG_ERR_ASS_CONNECT_FAILED && cnt < 5);
+    }
+
+    return err;
+}
+
+static GpgME::Error setUpDirmngrAssuanConnection(Context *ctx)
+{
+    Error err;
+
+    const std::string dirmngrSocket = GpgME::dirInfo("dirmngr-socket");
+    err = ctx->setEngineFileName(dirmngrSocket.c_str());
+
+    if (!err) {
+        err = ctx->setEngineHomeDirectory("");
+    }
+
+    if (!err) {
+        // try do connect to dirmngr
+        err = ctx->assuanTransact("GETINFO version");
+        if (err.code() == GPG_ERR_ASS_CONNECT_FAILED) {
+            err = startDirmngr(ctx);
+        }
+    }
+
+    return err;
+}
+
+static GpgME::Error run_wkd_get(Context *ctx, const std::string &email)
+{
+    Error err;
+
+    const auto cmd = std::string{"WKD_GET "} + email;
+    err = ctx->assuanTransact(cmd.c_str());
+    if (err.code() == GPG_ERR_NO_NAME || err.code() == GPG_ERR_NO_DATA) {
+        // ignore those benign errors; GPG_ERR_NO_NAME indicates that the domain
+        // doesn't exist (on first request); GPG_ERR_NO_DATA indicates that
+        // no key for email is available via WKD or that the domain doesn't
+        // support WKD or that the domain doesn't exist (on subsequent requests
+        // using dirmngr's internal cache)
+        qCDebug(QGPGME_LOG) << "WKD_GET returned" << err.asString() << "; ignoring...";
+        err = {};
+    }
+    if (err) {
+        qCDebug(QGPGME_LOG) << "WKD_GET failed with" << err.asString();
+    }
+
+    return err;
+}
+
+static QGpgMEWKDLookupJob::result_type lookup_keys(Context *ctx, const QString &email)
+{
+    WKDLookupResult result;
+
+    Error err = setUpDirmngrAssuanConnection(ctx);
+
+    const auto pattern = email.toUtf8().toStdString();
+    if (!err) {
+        err = run_wkd_get(ctx, pattern);
+    }
+
+    if (!err) {
+        const auto transaction = std::unique_ptr<DefaultAssuanTransaction>(dynamic_cast<DefaultAssuanTransaction*>(ctx->takeLastAssuanTransaction().release()));
+        const auto source = transaction->firstStatusLine("SOURCE");
+        const auto rawData = transaction->data();
+        if (rawData.size() == 0) {
+            qCDebug(QGPGME_LOG) << "No key found for" << email;
+            result = WKDLookupResult{pattern, GpgME::Data::null, {}, {}};
+        } else {
+            qCDebug(QGPGME_LOG) << "Found key for" << email << "at" << source.c_str();
+            result = WKDLookupResult{pattern, GpgME::Data{rawData.c_str(), rawData.size()}, source, {}};
+        }
+    }
+
+    return std::make_tuple(err ? WKDLookupResult{pattern, err} : result, QString{}, Error{});
+}
+
+Error QGpgMEWKDLookupJob::start(const QString &email)
+{
+    run(std::bind(&lookup_keys, std::placeholders::_1, email));
+    return Error();
+}
+
+WKDLookupResult QGpgMEWKDLookupJob::exec(const QString &email)
+{
+    const result_type r = lookup_keys(context(), email);
+    resultHook(r);
+    return std::get<0>(r);
+}
+
+#include "qgpgmewkdlookupjob.moc"

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/qgpgmewkdlookupjob.h Added

@@ -0,0 +1,70 @@
+/*
+    qgpgmewkdlookupjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_QGPGMEWKDLOOKUPJOB_H__
+#define __QGPGME_QGPGMEWKDLOOKUPJOB_H__
+
+#include "threadedjobmixin.h"
+#include "wkdlookupjob.h"
+#include "wkdlookupresult.h"
+
+namespace QGpgME
+{
+class WKDLookupResult;
+
+class QGpgMEWKDLookupJob
+#ifdef Q_MOC_RUN
+    : public WKDLookupJob
+#else
+    : public _detail::ThreadedJobMixin<WKDLookupJob, std::tuple<WKDLookupResult, QString, GpgME::Error> >
+#endif
+{
+    Q_OBJECT
+#ifdef Q_MOC_RUN
+public Q_SLOTS:
+    void slotFinished();
+#endif
+public:
+    explicit QGpgMEWKDLookupJob(GpgME::Context *context);
+    ~QGpgMEWKDLookupJob();
+
+    /* from WKDLookupJob */
+    GpgME::Error start(const QString &email) Q_DECL_OVERRIDE;
+
+    /* from WKDLookupJob */
+    WKDLookupResult exec(const QString &email) Q_DECL_OVERRIDE;
+};
+
+}
+
+#endif // __QGPGME_QGPGMEWKDLOOKUPJOB_H__

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/receivekeysjob.h Added

@@ -0,0 +1,66 @@
+/*
+    receivekeysjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_RECEIVEKEYSJOB_H__
+#define __QGPGME_RECEIVEKEYSJOB_H__
+
+#include "abstractimportjob.h"
+#include "qgpgme_export.h"
+
+namespace QGpgME
+{
+
+class QGPGME_EXPORT ReceiveKeysJob : public AbstractImportJob
+{
+    Q_OBJECT
+protected:
+    explicit ReceiveKeysJob(QObject *parent);
+public:
+    ~ReceiveKeysJob() override;
+
+    /**
+       Starts the import of keys from a keyserver. \a keyIds is a list of
+       key ids and/or fingerprints specifying the keys to import.
+    */
+    virtual GpgME::Error start(const QStringList &keyIds) = 0;
+
+    /**
+       Runs the import of keys from a keyserver. \a keyIds is a list of
+       key ids and/or fingerprints specifying the keys to import.
+    */
+    virtual GpgME::ImportResult exec(const QStringList &keyIds) = 0;
+};
+
+}
+
+#endif // __QGPGME_RECEIVEKEYSJOB_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/signkeyjob.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/signkeyjob.h Changed

@@ -117,14 +117,14 @@
      *
      * Not pure virtual for ABI compatibility.
      **/
-    virtual void setDupeOk(bool) {};
+    virtual void setDupeOk(bool) {}
 
     /**
      * Add a remark to the signature. This uses rem@gnupg.org as a notation.
      *
      * Not pure virtual for ABI compatibility.
      **/
-    virtual void setRemark(const QString &) {};
+    virtual void setRemark(const QString &) {}
 
     /**
      * If set, then the created signature will be a trust signature. By default,
@@ -143,7 +143,7 @@
      *
      * Not pure virtual for ABI compatibility.
      **/
-    virtual void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) { Q_UNUSED(trust); Q_UNUSED(depth); Q_UNUSED(scope); };
+    virtual void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) { Q_UNUSED(trust); Q_UNUSED(depth); Q_UNUSED(scope); }
 
     /**
      * Sets the expiration date of the key signature to @a expiration. By default,

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/src/threadedjobmixin.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/threadedjobmixin.cpp Changed

@@ -53,53 +53,10 @@
 using namespace QGpgME;
 using namespace GpgME;
 
-#ifdef Q_OS_WIN
-#include <windows.h>
-
-static QString fromEncoding (unsigned int src_encoding, const char *data)
-{
-    int n = MultiByteToWideChar(src_encoding, 0, data, -1, NULL, 0);
-    if (n < 0) {
-        return QString();
-    }
-
-    wchar_t *result = (wchar_t *) malloc ((n+1) * sizeof *result);
-
-    n = MultiByteToWideChar(src_encoding, 0, data, -1, result, n);
-    if (n < 0) {
-        free(result);
-        return QString();
-    }
-    const auto ret = QString::fromWCharArray(result, n);
-    free(result);
-    return ret;
-}
-#endif
-
 static QString stringFromGpgOutput(const QByteArray &ba)
 {
 #ifdef Q_OS_WIN
-    /* Qt on Windows uses GetACP while GnuPG prefers
-     * GetConsoleOutputCP.
-     *
-     * As we are not a console application GetConsoleOutputCP
-     * usually returns 0.
-     * From experience the closest thing that let's us guess
-     * what GetConsoleOutputCP returns for a console application
-     * it appears to be the OEMCP.
-     */
-    unsigned int cpno = GetConsoleOutputCP ();
-    if (!cpno) {
-        cpno = GetOEMCP();
-    }
-    if (!cpno) {
-        cpno = GetACP();
-    }
-    if (!cpno) {
-        return QString();
-    }
-
-    return fromEncoding(cpno, ba.constData());
+    return QString::fromUtf8(ba);
 #else
     return QString::fromLocal8Bit(ba);
 #endif

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/util.cpp Added

@@ -0,0 +1,47 @@
+/*
+    util.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#include "util.h"
+
+#include <QStringList>
+#include <functional>
+
+std::vector<std::string> toStrings(const QStringList &l)
+{
+    std::vector<std::string> v;
+    v.reserve(l.size());
+    std::transform(std::begin(l), std::end(l),
+                   std::back_inserter(v),
+                   std::mem_fn(&QString::toStdString));
+    return v;
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/util.h Added

@@ -0,0 +1,51 @@
+/*
+    util.h - some internal helpers
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_UTIL_H__
+#define __QGPGME_UTIL_H__
+
+#include <gpgme.h>
+
+#include <string>
+#include <vector>
+
+class QStringList;
+
+static inline gpgme_error_t make_error(gpgme_err_code_t code)
+{
+    return gpgme_err_make((gpgme_err_source_t)22, code);
+}
+
+std::vector<std::string> toStrings(const QStringList &l);
+
+#endif // __QGPGME_UTIL_H__

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/wkdlookupjob.h Added

@@ -0,0 +1,78 @@
+/*
+    wkdlookupjob.h
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_WKDLOOKUPJOB_H__
+#define __QGPGME_WKDLOOKUPJOB_H__
+
+#include "job.h"
+#include "qgpgme_export.h"
+
+class QString;
+
+namespace GpgME
+{
+class Data;
+class Error;
+}
+
+namespace QGpgME
+{
+
+class WKDLookupResult;
+
+class QGPGME_EXPORT WKDLookupJob : public Job
+{
+    Q_OBJECT
+protected:
+    explicit WKDLookupJob(QObject *parent);
+
+public:
+    ~WKDLookupJob();
+
+    /**
+      Starts a key lookup operation for the email address \a email via WKD.
+    */
+    virtual GpgME::Error start(const QString &email) = 0;
+
+    /**
+      Runs a key lookup operation for the email address \a email via WKD.
+    */
+    virtual WKDLookupResult exec(const QString &email) = 0;
+
+Q_SIGNALS:
+    void result(const WKDLookupResult &result, const QString &auditLogAsHtml = {}, const GpgME::Error &auditLogError = {});
+};
+
+}
+
+#endif // __QGPGME_WKDLOOKUPJOB_H__

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/wkdlookupresult.cpp Added

@@ -0,0 +1,117 @@
+/*
+    wkdlookupresult.cpp - wraps the result of a WKDLookupJob
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "wkdlookupresult.h"
+
+#include <data.h>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+class WKDLookupResult::Private
+{
+public:
+    std::string pattern;
+    GpgME::Data keyData;
+    std::string source;
+};
+
+WKDLookupResult::WKDLookupResult() = default;
+
+WKDLookupResult::~WKDLookupResult() = default;
+
+WKDLookupResult::WKDLookupResult(const std::string &pattern, const Error &error)
+    : Result{error}
+    , d{new Private{pattern, {}, {}}}
+{
+}
+
+WKDLookupResult::WKDLookupResult(const std::string &pattern, const Data &keyData, const std::string &source, const Error &error)
+    : Result{error}
+    , d{new Private{pattern, keyData, source}}
+{
+}
+
+WKDLookupResult::WKDLookupResult(const WKDLookupResult &other)
+    : Result{other}
+{
+    if (other.d) {
+        d.reset(new Private{*other.d});
+    }
+}
+
+WKDLookupResult &WKDLookupResult::operator=(const WKDLookupResult &other)
+{
+    auto tmp = other;
+    swap(tmp);
+    return *this;
+}
+
+WKDLookupResult::WKDLookupResult(WKDLookupResult &&other) = default;
+
+WKDLookupResult &WKDLookupResult::operator=(WKDLookupResult &&other) = default;
+
+void WKDLookupResult::swap(WKDLookupResult &other) noexcept
+{
+    Result::swap(other);
+    std::swap(this->d, other.d);
+}
+
+bool WKDLookupResult::isNull() const
+{
+    return !d && !bool(error());
+}
+
+std::string WKDLookupResult::pattern() const
+{
+    return d ? d->pattern : std::string{};
+}
+
+Data WKDLookupResult::keyData() const
+{
+    return d ? d->keyData : Data{};
+}
+
+std::string WKDLookupResult::source() const
+{
+    return d ? d->source : std::string{};
+}
+
+void QGpgME::swap(WKDLookupResult &a, WKDLookupResult &b)
+{
+    a.swap(b);
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/src/wkdlookupresult.h Added

@@ -0,0 +1,88 @@
+/*
+    wkdlookupresult.h - wraps the result of a WKDLookupJob
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifndef __QGPGME_WKDLOOKUPRESULT_H__
+#define __QGPGME_WKDLOOKUPRESULT_H__
+
+#include "qgpgme_export.h"
+
+#ifdef BUILDING_QGPGME
+# include <result.h>
+#else
+# include <gpgme++/result.h>
+#endif
+
+#include <memory>
+
+namespace GpgME
+{
+class Data;
+class Error;
+}
+
+namespace QGpgME
+{
+
+class QGPGME_EXPORT WKDLookupResult : public GpgME::Result
+{
+public:
+    WKDLookupResult();
+    ~WKDLookupResult();
+
+    explicit WKDLookupResult(const std::string &pattern, const GpgME::Error &err);
+    explicit WKDLookupResult(const std::string &pattern, const GpgME::Data &keyData, const std::string &source, const GpgME::Error &err);
+
+    WKDLookupResult(const WKDLookupResult &other);
+    WKDLookupResult &operator=(const WKDLookupResult &other);
+
+    WKDLookupResult(WKDLookupResult &&other);
+    WKDLookupResult &operator=(WKDLookupResult &&other);
+
+    void swap(WKDLookupResult &other) noexcept;
+
+    bool isNull() const;
+
+    std::string pattern() const;
+    GpgME::Data keyData() const;
+    std::string source() const;
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
+
+QGPGME_EXPORT void swap(WKDLookupResult &a, WKDLookupResult &b);
+
+}
+
+#endif // __QGPGME_WKDLOOKUPRESULT_H__

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/Makefile.am Changed

@@ -24,14 +24,22 @@
 GNUPGHOME=$(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME)
 
-EXTRA_DIST = initial.test
+EXTRA_DIST = initial.test final.test
 
-TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
-        t-encrypt t-verify t-various t-config t-remarks t-trustsignatures
+the_tests = \
+	t-addexistingsubkey \
+	t-keylist t-keylocate t-ownertrust t-tofuinfo \
+	t-encrypt t-verify t-various t-config t-remarks t-trustsignatures \
+	t-changeexpiryjob t-wkdlookup t-import
 
-moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
-            t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
-            t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc
+TESTS = initial.test $(the_tests) final.test
+
+moc_files = \
+	t-addexistingsubkey.moc \
+	t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
+	t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
+	t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc \
+	t-changeexpiryjob.moc t-wkdlookup.moc t-import.moc
 
 AM_LDFLAGS = -no-install
 
@@ -47,6 +55,7 @@
 
 support_src = t-support.h t-support.cpp
 
+t_addexistingsubkey_SOURCES = t-addexistingsubkey.cpp $(support_src)
 t_keylist_SOURCES = t-keylist.cpp $(support_src)
 t_keylocate_SOURCES = t-keylocate.cpp $(support_src)
 t_ownertrust_SOURCES = t-ownertrust.cpp $(support_src)
@@ -58,15 +67,24 @@
 t_config_SOURCES = t-config.cpp $(support_src)
 t_remarks_SOURCES = t-remarks.cpp $(support_src)
 t_trustsignatures_SOURCES = t-trustsignatures.cpp $(support_src)
+t_changeexpiryjob_SOURCES = t-changeexpiryjob.cpp $(support_src)
+t_wkdlookup_SOURCES = t-wkdlookup.cpp $(support_src)
+t_import_SOURCES = t-import.cpp $(support_src)
+run_exportjob_SOURCES = run-exportjob.cpp
+run_importjob_SOURCES = run-importjob.cpp
 run_keyformailboxjob_SOURCES = run-keyformailboxjob.cpp
+run_receivekeysjob_SOURCES = run-receivekeysjob.cpp
 
 nodist_t_keylist_SOURCES = $(moc_files)
 
 BUILT_SOURCES = $(moc_files) pubring-stamp
 
-noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
-    run-keyformailboxjob t-wkspublish t-verify t-various t-config t-remarks \
-    t-trustsignatures
+noinst_PROGRAMS = \
+	t-addexistingsubkey \
+	t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
+	run-keyformailboxjob t-wkspublish t-verify t-various t-config t-remarks \
+	t-trustsignatures t-changeexpiryjob t-wkdlookup t-import run-importjob \
+	run-exportjob run-receivekeysjob
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/Makefile.in Changed

@@ -107,15 +107,15 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = initial.test t-keylist$(EXEEXT) t-keylocate$(EXEEXT) \
-	t-ownertrust$(EXEEXT) t-tofuinfo$(EXEEXT) t-encrypt$(EXEEXT) \
-	t-verify$(EXEEXT) t-various$(EXEEXT) t-config$(EXEEXT) \
-	t-remarks$(EXEEXT) t-trustsignatures$(EXEEXT)
-noinst_PROGRAMS = t-keylist$(EXEEXT) t-keylocate$(EXEEXT) \
-	t-ownertrust$(EXEEXT) t-tofuinfo$(EXEEXT) t-encrypt$(EXEEXT) \
-	run-keyformailboxjob$(EXEEXT) t-wkspublish$(EXEEXT) \
-	t-verify$(EXEEXT) t-various$(EXEEXT) t-config$(EXEEXT) \
-	t-remarks$(EXEEXT) t-trustsignatures$(EXEEXT)
+TESTS = initial.test $(am__EXEEXT_1) final.test
+noinst_PROGRAMS = t-addexistingsubkey$(EXEEXT) t-keylist$(EXEEXT) \
+	t-keylocate$(EXEEXT) t-ownertrust$(EXEEXT) t-tofuinfo$(EXEEXT) \
+	t-encrypt$(EXEEXT) run-keyformailboxjob$(EXEEXT) \
+	t-wkspublish$(EXEEXT) t-verify$(EXEEXT) t-various$(EXEEXT) \
+	t-config$(EXEEXT) t-remarks$(EXEEXT) \
+	t-trustsignatures$(EXEEXT) t-changeexpiryjob$(EXEEXT) \
+	t-wkdlookup$(EXEEXT) t-import$(EXEEXT) run-importjob$(EXEEXT) \
+	run-exportjob$(EXEEXT) run-receivekeysjob$(EXEEXT)
 subdir = lang/qt/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
@@ -137,16 +137,43 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_run_keyformailboxjob_OBJECTS = run-keyformailboxjob.$(OBJEXT)
-run_keyformailboxjob_OBJECTS = $(am_run_keyformailboxjob_OBJECTS)
-run_keyformailboxjob_LDADD = $(LDADD)
-run_keyformailboxjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+am_run_exportjob_OBJECTS = run-exportjob.$(OBJEXT)
+run_exportjob_OBJECTS = $(am_run_exportjob_OBJECTS)
+run_exportjob_LDADD = $(LDADD)
+run_exportjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
 	../src/libqgpgme.la ../../../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+am_run_importjob_OBJECTS = run-importjob.$(OBJEXT)
+run_importjob_OBJECTS = $(am_run_importjob_OBJECTS)
+run_importjob_LDADD = $(LDADD)
+run_importjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
+am_run_keyformailboxjob_OBJECTS = run-keyformailboxjob.$(OBJEXT)
+run_keyformailboxjob_OBJECTS = $(am_run_keyformailboxjob_OBJECTS)
+run_keyformailboxjob_LDADD = $(LDADD)
+run_keyformailboxjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
+am_run_receivekeysjob_OBJECTS = run-receivekeysjob.$(OBJEXT)
+run_receivekeysjob_OBJECTS = $(am_run_receivekeysjob_OBJECTS)
+run_receivekeysjob_LDADD = $(LDADD)
+run_receivekeysjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
 am__objects_1 = t-support.$(OBJEXT)
+am_t_addexistingsubkey_OBJECTS = t-addexistingsubkey.$(OBJEXT) \
+	$(am__objects_1)
+t_addexistingsubkey_OBJECTS = $(am_t_addexistingsubkey_OBJECTS)
+t_addexistingsubkey_LDADD = $(LDADD)
+t_addexistingsubkey_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
+am_t_changeexpiryjob_OBJECTS = t-changeexpiryjob.$(OBJEXT) \
+	$(am__objects_1)
+t_changeexpiryjob_OBJECTS = $(am_t_changeexpiryjob_OBJECTS)
+t_changeexpiryjob_LDADD = $(LDADD)
+t_changeexpiryjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
 am_t_config_OBJECTS = t-config.$(OBJEXT) $(am__objects_1)
 t_config_OBJECTS = $(am_t_config_OBJECTS)
 t_config_LDADD = $(LDADD)
@@ -157,6 +184,11 @@
 t_encrypt_LDADD = $(LDADD)
 t_encrypt_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
 	../src/libqgpgme.la ../../../src/libgpgme.la
+am_t_import_OBJECTS = t-import.$(OBJEXT) $(am__objects_1)
+t_import_OBJECTS = $(am_t_import_OBJECTS)
+t_import_LDADD = $(LDADD)
+t_import_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
 am_t_keylist_OBJECTS = t-keylist.$(OBJEXT) $(am__objects_1)
 am__objects_2 =
 nodist_t_keylist_OBJECTS = $(am__objects_2)
@@ -201,6 +233,11 @@
 t_verify_LDADD = $(LDADD)
 t_verify_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
 	../src/libqgpgme.la ../../../src/libgpgme.la
+am_t_wkdlookup_OBJECTS = t-wkdlookup.$(OBJEXT) $(am__objects_1)
+t_wkdlookup_OBJECTS = $(am_t_wkdlookup_OBJECTS)
+t_wkdlookup_LDADD = $(LDADD)
+t_wkdlookup_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
+	../src/libqgpgme.la ../../../src/libgpgme.la
 am_t_wkspublish_OBJECTS = t-wkspublish.$(OBJEXT) $(am__objects_1)
 t_wkspublish_OBJECTS = $(am_t_wkspublish_OBJECTS)
 t_wkspublish_LDADD = $(LDADD)
@@ -221,13 +258,19 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/conf
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/run-keyformailboxjob.Po \
-	./$(DEPDIR)/t-config.Po ./$(DEPDIR)/t-encrypt.Po \
+am__depfiles_remade = ./$(DEPDIR)/run-exportjob.Po \
+	./$(DEPDIR)/run-importjob.Po \
+	./$(DEPDIR)/run-keyformailboxjob.Po \
+	./$(DEPDIR)/run-receivekeysjob.Po \
+	./$(DEPDIR)/t-addexistingsubkey.Po \
+	./$(DEPDIR)/t-changeexpiryjob.Po ./$(DEPDIR)/t-config.Po \
+	./$(DEPDIR)/t-encrypt.Po ./$(DEPDIR)/t-import.Po \
 	./$(DEPDIR)/t-keylist.Po ./$(DEPDIR)/t-keylocate.Po \
 	./$(DEPDIR)/t-ownertrust.Po ./$(DEPDIR)/t-remarks.Po \
 	./$(DEPDIR)/t-support.Po ./$(DEPDIR)/t-tofuinfo.Po \
 	./$(DEPDIR)/t-trustsignatures.Po ./$(DEPDIR)/t-various.Po \
-	./$(DEPDIR)/t-verify.Po ./$(DEPDIR)/t-wkspublish.Po
+	./$(DEPDIR)/t-verify.Po ./$(DEPDIR)/t-wkdlookup.Po \
+	./$(DEPDIR)/t-wkspublish.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -265,19 +308,25 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(run_keyformailboxjob_SOURCES) $(t_config_SOURCES) \
-	$(t_encrypt_SOURCES) $(t_keylist_SOURCES) \
-	$(nodist_t_keylist_SOURCES) $(t_keylocate_SOURCES) \
-	$(t_ownertrust_SOURCES) $(t_remarks_SOURCES) \
-	$(t_tofuinfo_SOURCES) $(t_trustsignatures_SOURCES) \
-	$(t_various_SOURCES) $(t_verify_SOURCES) \
-	$(t_wkspublish_SOURCES)
-DIST_SOURCES = $(run_keyformailboxjob_SOURCES) $(t_config_SOURCES) \
-	$(t_encrypt_SOURCES) $(t_keylist_SOURCES) \
+SOURCES = $(run_exportjob_SOURCES) $(run_importjob_SOURCES) \
+	$(run_keyformailboxjob_SOURCES) $(run_receivekeysjob_SOURCES) \
+	$(t_addexistingsubkey_SOURCES) $(t_changeexpiryjob_SOURCES) \
+	$(t_config_SOURCES) $(t_encrypt_SOURCES) $(t_import_SOURCES) \
+	$(t_keylist_SOURCES) $(nodist_t_keylist_SOURCES) \
 	$(t_keylocate_SOURCES) $(t_ownertrust_SOURCES) \
 	$(t_remarks_SOURCES) $(t_tofuinfo_SOURCES) \
 	$(t_trustsignatures_SOURCES) $(t_various_SOURCES) \
-	$(t_verify_SOURCES) $(t_wkspublish_SOURCES)
+	$(t_verify_SOURCES) $(t_wkdlookup_SOURCES) \
+	$(t_wkspublish_SOURCES)
+DIST_SOURCES = $(run_exportjob_SOURCES) $(run_importjob_SOURCES) \
+	$(run_keyformailboxjob_SOURCES) $(run_receivekeysjob_SOURCES) \
+	$(t_addexistingsubkey_SOURCES) $(t_changeexpiryjob_SOURCES) \
+	$(t_config_SOURCES) $(t_encrypt_SOURCES) $(t_import_SOURCES) \
+	$(t_keylist_SOURCES) $(t_keylocate_SOURCES) \
+	$(t_ownertrust_SOURCES) $(t_remarks_SOURCES) \
+	$(t_tofuinfo_SOURCES) $(t_trustsignatures_SOURCES) \
+	$(t_various_SOURCES) $(t_verify_SOURCES) \
+	$(t_wkdlookup_SOURCES) $(t_wkspublish_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -324,6 +373,12 @@
     std='&#x1b;m'; \
   fi; \
 }
+am__EXEEXT_1 = t-addexistingsubkey$(EXEEXT) t-keylist$(EXEEXT) \
+	t-keylocate$(EXEEXT) t-ownertrust$(EXEEXT) t-tofuinfo$(EXEEXT) \
+	t-encrypt$(EXEEXT) t-verify$(EXEEXT) t-various$(EXEEXT) \
+	t-config$(EXEEXT) t-remarks$(EXEEXT) \
+	t-trustsignatures$(EXEEXT) t-changeexpiryjob$(EXEEXT) \
+	t-wkdlookup$(EXEEXT) t-import$(EXEEXT)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
@@ -529,10 +584,19 @@
 GPG = gpg
 GNUPGHOME = $(abs_builddir)
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME)
-EXTRA_DIST = initial.test
-moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
-            t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
-            t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc
+EXTRA_DIST = initial.test final.test
+the_tests = \
+	t-addexistingsubkey \
+	t-keylist t-keylocate t-ownertrust t-tofuinfo \
+	t-encrypt t-verify t-various t-config t-remarks t-trustsignatures \
+	t-changeexpiryjob t-wkdlookup t-import
+
+moc_files = \
+	t-addexistingsubkey.moc \
+	t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
+	t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
+	t-various.moc t-config.moc t-remarks.moc t-trustsignatures.moc \
+	t-changeexpiryjob.moc t-wkdlookup.moc t-import.moc
 
 AM_LDFLAGS = -no-install
 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
@@ -546,6 +610,7 @@
               -DTOP_SRCDIR="$(top_srcdir)"
 
 support_src = t-support.h t-support.cpp
+t_addexistingsubkey_SOURCES = t-addexistingsubkey.cpp $(support_src)
 t_keylist_SOURCES = t-keylist.cpp $(support_src)
 t_keylocate_SOURCES = t-keylocate.cpp $(support_src)

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/final.test Added

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/run-exportjob.cpp Added

@@ -0,0 +1,119 @@
+/*
+    run-exportjob.cpp
+
+    This file is part of QGpgME's test suite.
+    Copyright (c) 2022 by g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License,
+    version 2, as published by the Free Software Foundation.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include <exportjob.h>
+#include <protocol.h>
+
+#include <context.h>
+
+#include <QCoreApplication>
+
+#include <iostream>
+
+using namespace GpgME;
+using std::cout;
+using std::cerr;
+
+static void showUsageAndExitWithCode(int exitCode)
+{
+    cerr << "Usage: run-exportjob OPTION... PATTERN...\n"
+         "Options:\n"
+         "  --secret         export secret keys instead of public keys\n"
+         "  --secret-subkey  export secret subkeys instead of public keys\n";
+
+    exit(exitCode);
+}
+
+static auto createExportJob(unsigned int mode)
+{
+    if (mode & Context::ExportSecretSubkey) {
+        return QGpgME::openpgp()->secretSubkeyExportJob(/*armor=*/true);
+    } else if (mode & Context::ExportSecret) {
+        return QGpgME::openpgp()->secretKeyExportJob(/*armor=*/true);
+    }
+    return QGpgME::openpgp()->publicKeyExportJob(/*armor=*/true);
+}
+
+int main(int argc, char *argv)
+{
+    GpgME::initializeLibrary();
+
+    QCoreApplication app{argc, argv};
+
+    unsigned int exportMode = 0;
+
+    auto arguments = app.arguments();
+    if (!arguments.isEmpty()) {
+        arguments.pop_front(); // remove program name
+    }
+    while (!arguments.isEmpty()) {
+        const auto &arg = arguments.front();
+        if (!arg.startsWith(QLatin1String{"--"})) {
+            break;
+        }
+        if (arg == QLatin1String{"--"}) {
+            arguments.pop_front();
+            break;
+        }
+        if (arg == QLatin1String{"--help"}) {
+            showUsageAndExitWithCode(0);
+        } else if (arg == QLatin1String{"--secret"}) {
+            exportMode = Context::ExportSecret;
+            arguments.pop_front();
+        } else if (arg == QLatin1String{"--secret-subkey"}) {
+            exportMode = Context::ExportSecretSubkey;
+            arguments.pop_front();
+        } else {
+            cerr << "Error: Invalid option " << arg.toStdString() << std::endl;
+            showUsageAndExitWithCode(1);
+        }
+    }
+
+    auto job = createExportJob(exportMode);
+    QObject::connect(job, &QGpgME::ExportJob::result,
+                     &app, &app (const GpgME::Error &err, const QByteArray &keyData, const QString &, const GpgME::Error &) {
+                         if (err) {
+                             cerr << "The ChangeExpiryJob failed with" << err.asString() << ".";
+                             app.exit(1);
+                             return;
+                         }
+                         cout << "Begin Result:\n" << keyData.toStdString() << "End Result:\n";
+                         app.exit();
+                     });
+    job->start(arguments);
+
+    return app.exec();
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/run-importjob.cpp Added

@@ -0,0 +1,99 @@
+/*
+    run-importjob.cpp
+
+    This file is part of QGpgME's test suite.
+    Copyright (c) 2021 by g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License,
+    version 2, as published by the Free Software Foundation.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include <importjob.h>
+#include <importresult.h>
+#include <protocol.h>
+
+#include <QFile>
+#include <QFileInfo>
+
+#include <QDebug>
+
+#include <set>
+#include <sstream>
+
+GpgME::Protocol guessProtocol(const QString &filename)
+{
+    static const std::set<QString> cmsExtensions = {"cer", "crt", "der", "p12", "p7c", "pem", "pfx"};
+    static const std::set<QString> pgpExtensions = {"asc", "gpg", "pgp"};
+
+    const auto extension = QFileInfo{filename}.suffix();
+    if (cmsExtensions.find(extension) != cmsExtensions.end()) {
+        return GpgME::CMS;
+    } else if (pgpExtensions.find(extension) != pgpExtensions.end()) {
+        return GpgME::OpenPGP;
+    }
+    qDebug() << "Unknown file name extension" << extension;
+    return GpgME::UnknownProtocol;
+}
+
+int main(int argc, char **argv)
+{
+    GpgME::initializeLibrary();
+
+    if (argc != 2) {
+        qInfo().noquote() << "Usage:" << argv0 << "<certificate file>";
+        return 1;
+    }
+    const auto filename = QString::fromLocal8Bit(argv1);
+
+    QFile f{filename};
+    if (!f.exists()) {
+        qWarning() << "Error: File not found" << filename;
+        return 1;
+    }
+    const auto protocol = guessProtocol(filename);
+    if (protocol == GpgME::UnknownProtocol) {
+        qWarning() << "Error: Unknown file type";
+        return 1;
+    }
+    if (!f.open(QIODevice::ReadOnly)) {
+        qWarning() << "Error: Failed to open file" << filename << "for reading.";
+        return 1;
+    }
+
+    const auto keyData = f.readAll();
+    auto job = (protocol == GpgME::CMS ? QGpgME::smime() : QGpgME::openpgp())->importJob();
+    const auto result = job->exec(keyData);
+    qDebug() << "Result error:" << result.error().asString();
+    std::ostringstream ostr;
+    ostr << result;
+    for (const auto &line : QString::fromStdString(ostr.str()).split('\n')) {
+        qDebug().noquote() << line;
+    }
+    return 0;
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/run-receivekeysjob.cpp Added

@@ -0,0 +1,65 @@
+/*
+    run-receivekeysjob.cpp
+
+    This file is part of QGpgME's test suite.
+    Copyright (c) 2022 by g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License,
+    version 2, as published by the Free Software Foundation.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include <importresult.h>
+#include <protocol.h>
+#include <receivekeysjob.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+
+#include <iostream>
+
+int main(int argc, char **argv)
+{
+    GpgME::initializeLibrary();
+
+    if (argc < 2) {
+        std::cerr << "Usage: " << argv0 << " KEYID..." << std::endl;
+        return 1;
+    }
+
+    QCoreApplication app(argc, argv);
+    const QStringList keyIds = qApp->arguments().mid(1);
+
+    auto job = QGpgME::openpgp()->receiveKeysJob();
+    const auto result = job->exec(keyIds);
+
+    std::cout << "Result: " << result.error().asString() << std::endl;
+    std::cout << "Details:\n" << result << std::endl;
+
+    return 0;
+}

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-addexistingsubkey.cpp Added

@@ -0,0 +1,260 @@
+/* t-addexistingsubkey.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2022 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "t-support.h"
+
+#include "addexistingsubkeyjob.h"
+#include "protocol.h"
+
+#include <QSignalSpy>
+#include <QTest>
+
+#include "context.h"
+#include "data.h"
+#include "engineinfo.h"
+
+#include <algorithm>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+static const char *requiredVersion = "2.3.5";
+
+/* Test keys
+    sec#  ed25519 2022-01-13 SC
+        1CB8C6A0317AA83F44FE009932392C82B814C8E0
+    uid            unknown source-key@example.net
+    ssb   cv25519 2022-01-13 E
+    ssb   cv25519 2022-01-13 E expires: 2100-01-01
+
+    sec   ed25519 2022-01-13 SC
+        C3C87F0A3920B01F9E4450EA2B79F21D4DD10BFC
+    uid            unknown target-key@example.net
+    ssb   cv25519 2022-01-13 E
+ * generated with
+export GNUPGHOME=$(mktemp -d)
+gpg -K
+gpg --batch --pinentry-mode loopback --passphrase abc --quick-gen-key source-key@example.net default default never
+fpr=$(gpg -k --with-colons source-key@example.net | grep ^fpr | head -1 | cut -d ':' -f 10)
+gpg --batch --pinentry-mode loopback --passphrase abc --quick-add-key ${fpr} default default 21000101T120000
+gpg --batch --pinentry-mode loopback --passphrase abc --quick-gen-key target-key@example.net default default never
+gpg -K
+gpg --export-secret-subkeys --armor --batch --pinentry-mode loopback --passphrase abc --comment source-key@example.net source-key@example.net | sed 's/$.*$/    "\1\\n"/'
+gpg --export-secret-keys --armor --batch --pinentry-mode loopback --passphrase abc --comment target-key@example.net target-key@example.net | sed 's/$.*$/    "\1\\n"/'
+#rm -rf ${GNUPGHOME}
+unset GNUPGHOME
+*/
+static const char *testKeyData =
+    "-----BEGIN PGP PRIVATE KEY BLOCK-----\n"
+    "Comment: source-key@example.net\n"
+    "\n"
+    "lDsEYd/ujBYJKwYBBAHaRw8BAQdAwiZPINTcrpgmu6ZWSaPZlcRSd4nDuofVMhe7\n"
+    "c2XrFyT/AGUAR05VAbQWc291cmNlLWtleUBleGFtcGxlLm5ldIiUBBMWCgA8FiEE\n"
+    "HLjGoDF6qD9E/gCZMjksgrgUyOAFAmHf7owCGwMFCwkIBwIDIgIBBhUKCQgLAgQW\n"
+    "AgMBAh4HAheAAAoJEDI5LIK4FMjgupIA/Au2YEAT9dYdJd0eJCJerG5YAeoB+uBs\n"
+    "mBkgr6xXE0bIAP43b6u1Jtvf/Wm3BhRbLd5Tg67Ba4CIZ8ZLGng73FBoBpyLBGHf\n"
+    "7owSCisGAQQBl1UBBQEBB0Cpg8Qof/WShxROZZtmPnw24vTk0R8nIAF1CZJ0bG/C\n"
+    "SwMBCAf+BwMCtzxziVxQEor8w/VVzHp4/hVSCUyrpiX7Djf04cIMs2bFPduZLgxb\n"
+    "c1SXhlgiqU0YBNntbGGNdKjTP6FMbYWq1+NwQm6ZXtC76LPG7syM94h4BBgWCgAg\n"
+    "FiEEHLjGoDF6qD9E/gCZMjksgrgUyOAFAmHf7owCGwwACgkQMjksgrgUyOCI0wEA\n"
+    "+f56fkvDDUwMOMw7n4+GKpfJXpWhVL08ttccbBOa/9IA/2HYA/78ZaD8E5EyqAEK\n"
+    "Aj9Au+2oJu9V5qo92QEoqwYHnIsEYd/vgxIKKwYBBAGXVQEFAQEHQBa9FxJkm/9D\n"
+    "xABildkaYMrbJbu8BPk6uv9V8aLmv9FnAwEIB/4HAwIPhcbN8s6OzPz8/g78TrCh\n"
+    "xqQb2kygCEj+OQ4/XXU3lus2b5xS5h44LGt99Wisqx+wVPDXmPDJOaxjhHXDmJxd\n"
+    "/LplIEhykojSm3uUDxERiH4EGBYKACYWIQQcuMagMXqoP0T+AJkyOSyCuBTI4AUC\n"
+    "Yd/vgwIbDAUJkqcQPQAKCRAyOSyCuBTI4IUjAP9BTfOD+jy6lLmzNO9pquRSAxi/\n"
+    "PQuglGtpS0LQEJMEOwD+PFnsMe2EtQ+WVSDBeB7O0m61EXeY+RhpuhNtsNXVuwc=\n"
+    "=wIPU\n"
+    "-----END PGP PRIVATE KEY BLOCK-----\n"
+    "-----BEGIN PGP PRIVATE KEY BLOCK-----\n"
+    "Comment: target-key@example.net\n"
+    "\n"
+    "lIYEYd/v/RYJKwYBBAHaRw8BAQdAKoILWXG3yaLb2EniNKQLUjwsrvy5vgAN299J\n"
+    "W5cFbrz+BwMC/uKbCq3sK5H8QVtEQ/IxGmjWNBpy6c8EDlOG4APi4o4VE+bEYD8w\n"
+    "J3Kk/lzSm6ZT5vC6DDASks797omjXD+J7zZ0vtTPvheYi/nsVz2UebQWdGFyZ2V0\n"
+    "LWtleUBleGFtcGxlLm5ldIiUBBMWCgA8FiEEw8h/CjkgsB+eRFDqK3nyHU3RC/wF\n"
+    "AmHf7/0CGwMFCwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJECt58h1N0Qv8\n"
+    "rXcBAPxnkXqpp4IY3iTKV5XAdo7Uys7U/joUD73rj2XEvgI1AQDhKK4PLxPhf3ki\n"
+    "FKU0RA7itxzOH+F8bQ5BdYS49jDPCpyLBGHf7/0SCisGAQQBl1UBBQEBB0Dq9rwA\n"
+    "hAA2UFJShFsLFp7+g4uhWDfuDa3VjeIQRM+9QgMBCAf+BwMCMfCTl0LNqsn836t5\n"
+    "f2ZHBuMcNs4JWYmdLAIVaewEHq7zhOsX3iB+/yxwu9g2mXc4XUJ1iQzXLOYwgGov\n"
+    "8jIovrr01hDkSg4rvM9JKMWdd4h4BBgWCgAgFiEEw8h/CjkgsB+eRFDqK3nyHU3R\n"
+    "C/wFAmHf7/0CGwwACgkQK3nyHU3RC/xyfAEAqnMdSv6FTAwAWrYvJqJtSVoEhjMn\n"
+    "3c2qMsu34Bk86/MBAKHbLFmdyePvHaxKeO8CkQDoJzK8rYzw3RAmq/5JsQkL\n"
+    "=rOVf\n"
+    "-----END PGP PRIVATE KEY BLOCK-----\n";
+
+class AddExistingSubkeyJobTest : public QGpgMETest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        QGpgMETest::initTestCase();
+
+        // set up the test fixture for this test
+        qputenv("GNUPGHOME", mGnupgHomeTestFixture.path().toUtf8());
+        QVERIFY(importSecretKeys(testKeyData, 2));
+    }
+
+    void init()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < requiredVersion) {
+            QSKIP("gpg does not yet support adding an existing subkey to another key via the command API");
+        }
+
+        // set up a copy of the test fixture for each test function
+        mGnupgHomeTestCopy.reset(new QTemporaryDir{});
+        QVERIFY(copyKeyrings(mGnupgHomeTestFixture.path(), mGnupgHomeTestCopy->path()));
+        qputenv("GNUPGHOME", mGnupgHomeTestCopy->path().toUtf8());
+    }
+
+    void testAddExistingSubkeyAsync()
+    {
+        // Get the key the subkey should be added to
+        auto key = getTestKey("target-key@example.net");
+        QVERIFY(!key.isNull());
+
+        // Get the key with the subkey to add
+        auto sourceKey = getTestKey("source-key@example.net", 3);
+        QVERIFY(!sourceKey.isNull());
+
+        auto job = std::unique_ptr<AddExistingSubkeyJob>{openpgp()->addExistingSubkeyJob()};
+        hookUpPassphraseProvider(job.get());
+
+        Error result;
+        connect(job.get(), &AddExistingSubkeyJob::result,
+                job.get(), this, &result(const Error &result_) {
+                    result = result_;
+                    Q_EMIT asyncDone();
+                });
+        QVERIFY(!job->start(key, sourceKey.subkey(1)));
+        job.release(); // after the job has been started it's on its own
+
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
+        QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
+
+        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
+        key.update();
+        QCOMPARE(key.numSubkeys(), 3u);
+    }
+
+    void testAddExistingSubkeySync()
+    {
+        // Get the key the subkey should be added to
+        auto key = getTestKey("target-key@example.net");
+        QVERIFY(!key.isNull());
+
+        // Get the key with the subkey to add
+        auto sourceKey = getTestKey("source-key@example.net", 3);
+        QVERIFY(!sourceKey.isNull());
+        auto sourceSubkey = sourceKey.subkey(1);
+        QVERIFY(sourceSubkey.expirationTime() == 0);
+
+        auto job = std::unique_ptr<AddExistingSubkeyJob>{openpgp()->addExistingSubkeyJob()};
+        hookUpPassphraseProvider(job.get());
+
+        const auto result = job->exec(key, sourceSubkey);
+
+        QVERIFY(result.code() == GPG_ERR_NO_ERROR);
+        key.update();
+        QCOMPARE(key.numSubkeys(), 3u);
+        QCOMPARE(key.subkey(2).expirationTime(), 0);
+    }
+
+    void testAddExistingSubkeyWithExpiration()

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-changeexpiryjob.cpp Added

@@ -0,0 +1,396 @@
+/* t-changeexpiryjob.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "t-support.h"
+
+#include "changeexpiryjob.h"
+#include "context.h"
+#include "engineinfo.h"
+#include "protocol.h"
+
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+class TestChangeExpiryJob: public QGpgMETest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void test_change_expiration_default_without_subkeys()
+    {
+        Error err;
+
+        if (!loopbackSupported()) {
+            return;
+        }
+
+        auto ctx = Context::create(OpenPGP);
+        QVERIFY(ctx);
+
+        // Get the key (alfa@example.net)
+        auto key = ctx->key("A0FF4590BB6122EDEF6E3C542D727CC768697734", err, true);
+        QVERIFY(!err);
+        QVERIFY(!key.isNull());
+        QVERIFY(!key.subkey(0).isNull());
+        QVERIFY(!key.subkey(1).isNull());
+        const auto subkeyExpiration = key.subkey(1).expirationTime();
+
+        {
+            // Create the job
+            auto job = std::unique_ptr<ChangeExpiryJob>{openpgp()->changeExpiryJob()};
+            QVERIFY(job);
+            hookUpPassphraseProvider(job.get());
+
+            // Use defaults of job
+
+            connect(job.get(), &ChangeExpiryJob::result,
+                    this, this (const GpgME::Error &err2, const QString &, const GpgME::Error &) {
+                        Q_EMIT asyncDone();
+                        if (err2) {
+                            QFAIL(qPrintable(QString("The ChangeExpiryJob failed with '%1'.").arg(err2.asString())));
+                        }
+                    });
+
+            const auto newExpirationDate = QDateTime::currentDateTime().addDays(1);
+            job->start(key, newExpirationDate);
+            QSignalSpy spy (this, SIGNAL(asyncDone()));
+            QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
+
+            // At this point the expiration date should have been changed.
+            key.update();
+
+            // allow a few seconds earlier expiration because job calculates "seconds from now" passed to gpg after it was started
+            const auto expectedExpirationRange = std::make_pair(
+                newExpirationDate.toSecsSinceEpoch() - 10,
+                QDateTime::currentDateTime().addDays(1).toSecsSinceEpoch());
+            {
+                const auto actualExpiration = key.subkey(0).expirationTime();
+                QVERIFY2(actualExpiration >= expectedExpirationRange.first,
+                        ("actual: " + std::to_string(actualExpiration) +
+                         "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
+                QVERIFY2(actualExpiration <= expectedExpirationRange.second,
+                        ("actual: " + std::to_string(actualExpiration) +
+                         "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
+            }
+            {
+                const auto actualExpiration = key.subkey(1).expirationTime();
+                QCOMPARE(actualExpiration, subkeyExpiration);  // unchanged
+            }
+        }
+    }
+
+    void test_change_expiration_default_with_subkeys()
+    {
+        Error err;
+
+        if (!loopbackSupported()) {
+            return;
+        }
+
+        auto ctx = Context::create(OpenPGP);
+        QVERIFY(ctx);
+
+        // Get the key (alfa@example.net)
+        auto key = ctx->key("A0FF4590BB6122EDEF6E3C542D727CC768697734", err, true);
+        QVERIFY(!err);
+        QVERIFY(!key.isNull());
+        QVERIFY(!key.subkey(0).isNull());
+        QVERIFY(!key.subkey(1).isNull());
+        const auto primaryKeyExpiration = key.subkey(0).expirationTime();
+
+        {
+            // Create the job
+            auto job = std::unique_ptr<ChangeExpiryJob>{openpgp()->changeExpiryJob()};
+            QVERIFY(job);
+            hookUpPassphraseProvider(job.get());
+
+            // Use defaults of job
+
+            connect(job.get(), &ChangeExpiryJob::result,
+                    this, this (const GpgME::Error &err2, const QString &, const GpgME::Error &) {
+                        Q_EMIT asyncDone();
+                        if (err2) {
+                            QFAIL(qPrintable(QString("The ChangeExpiryJob failed with '%1'.").arg(err2.asString())));
+                        }
+                    });
+
+            const auto newExpirationDate = QDateTime::currentDateTime().addDays(2);
+            job->start(key, newExpirationDate, {key.subkey(1)});
+            QSignalSpy spy (this, SIGNAL(asyncDone()));
+            QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
+
+            // At this point the expiration date should have been changed.
+            key.update();
+
+            // allow a few seconds earlier expiration because job calculates "seconds from now" passed to gpg after it was started
+            const auto expectedExpirationRange = std::make_pair(
+                newExpirationDate.toSecsSinceEpoch() - 10,
+                QDateTime::currentDateTime().addDays(2).toSecsSinceEpoch());
+            {
+                const auto actualExpiration = key.subkey(0).expirationTime();
+                QCOMPARE(actualExpiration, primaryKeyExpiration);  // unchanged
+            }
+            {
+                const auto actualExpiration = key.subkey(1).expirationTime();
+                QVERIFY2(actualExpiration >= expectedExpirationRange.first,
+                        ("actual: " + std::to_string(actualExpiration) +
+                         "; expected: " + std::to_string(expectedExpirationRange.first)).c_str());
+                QVERIFY2(actualExpiration <= expectedExpirationRange.second,
+                        ("actual: " + std::to_string(actualExpiration) +
+                         "; expected: " + std::to_string(expectedExpirationRange.second)).c_str());
+            }
+        }
+    }
+
+    void test_change_expiration_update_primary_key_without_subkeys()
+    {
+        Error err;
+
+        if (!loopbackSupported()) {
+            return;
+        }
+
+        auto ctx = Context::create(OpenPGP);
+        QVERIFY(ctx);
+
+        // Get the key (alfa@example.net)
+        auto key = ctx->key("A0FF4590BB6122EDEF6E3C542D727CC768697734", err, true);
+        QVERIFY(!err);
+        QVERIFY(!key.isNull());
+        QVERIFY(!key.subkey(0).isNull());
+        QVERIFY(!key.subkey(1).isNull());
+        const auto subkeyExpiration = key.subkey(1).expirationTime();

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-config.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-config.cpp Changed

@@ -57,27 +57,24 @@
             // be unsupported in older versions.
             return;
         }
-        // First set compliance to de-vs
         auto conf = cryptoConfig();
         QVERIFY(conf);
-        auto entry = conf->entry(QStringLiteral("gpg"),
-                QStringLiteral("Configuration"),
-                QStringLiteral("compliance"));
+        auto entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("compliance"));
         QVERIFY(entry);
+        const auto defaultValue = entry->defaultValue().toString();
+        QCOMPARE(defaultValue, QStringLiteral("gnupg"));
+
         entry->setStringValue("de-vs");
         conf->sync(true);
         conf->clear();
-        entry = conf->entry(QStringLiteral("gpg"),
-                QStringLiteral("Configuration"),
-                QStringLiteral("compliance"));
+        entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("compliance"));
         QCOMPARE(entry->stringValue(), QStringLiteral("de-vs"));
+
         entry->resetToDefault();
         conf->sync(true);
         conf->clear();
-        entry = conf->entry(QStringLiteral("gpg"),
-                QStringLiteral("Configuration"),
-                QStringLiteral("compliance"));
-        QCOMPARE(entry->stringValue(), QStringLiteral("gnupg"));
+        entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("compliance"));
+        QCOMPARE(entry->stringValue(), defaultValue);
     }
 
     void initTestCase()

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-encrypt.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-encrypt.cpp Changed

@@ -63,9 +63,6 @@
 {
     Q_OBJECT
 
-Q_SIGNALS:
-    void asyncDone();
-
 private Q_SLOTS:
 
     void testSimpleEncryptDecrypt()
@@ -92,10 +89,7 @@
             return;
         }
         auto decJob = openpgp()->decryptJob();
-        auto ctx = Job::context(decJob);
-        TestPassphraseProvider provider;
-        ctx->setPassphraseProvider(&provider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(decJob);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
         QVERIFY(!decResult.error());
@@ -163,10 +157,8 @@
             return;
         }
         auto job = openpgp()->encryptJob();
+        hookUpPassphraseProvider(job);
         auto ctx = Job::context(job);
-        TestPassphraseProvider provider;
-        ctx->setPassphraseProvider(&provider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setArmor(true);
         ctx->setTextMode(true);
         QByteArray cipherText;
@@ -179,9 +171,7 @@
         killAgent(mDir.path());
 
         auto decJob = openpgp()->decryptJob();
-        auto ctx2 = Job::context(decJob);
-        ctx2->setPassphraseProvider(&provider);
-        ctx2->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(decJob);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);
         QVERIFY(!result.error());
@@ -204,13 +194,9 @@
         delete listjob;
 
         auto job = openpgp()->signEncryptJob(/*ASCII Armor */true, /* Textmode */ true);
-
-        auto encSignCtx = Job::context(job);
-        TestPassphraseProvider provider1;
-        encSignCtx->setPassphraseProvider(&provider1);
-        encSignCtx->setPinentryMode(Context::PinentryLoopback);
-
         QVERIFY(job);
+        hookUpPassphraseProvider(job);
+
         QByteArray cipherText;
         auto result = job->exec(keys, keys, QStringLiteral("Hello World").toUtf8(), Context::AlwaysTrust, cipherText);
         delete job;
@@ -225,10 +211,8 @@
         }
 
         auto decJob = openpgp()->decryptJob();
+        hookUpPassphraseProvider(decJob);
         auto ctx = Job::context(decJob);
-        TestPassphraseProvider provider;
-        ctx->setPassphraseProvider(&provider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setDecryptionFlags(Context::DecryptUnwrap);
 
         QByteArray plainText;
@@ -269,9 +253,8 @@
         delete listjob;
 
         auto job = openpgp()->encryptJob();
+        hookUpPassphraseProvider(job);
         auto ctx = Job::context(job);
-        ctx->setPassphraseProvider(new TestPassphraseProvider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
         ctx->setArmor(true);
         ctx->setTextMode(true);
         QByteArray cipherText;
@@ -297,9 +280,8 @@
         agentConf.close();
 
         auto decJob = openpgp()->decryptJob();
+        hookUpPassphraseProvider(decJob);
         auto ctx2 = Job::context(decJob);
-        ctx2->setPassphraseProvider(new TestPassphraseProvider);
-        ctx2->setPinentryMode(Context::PinentryLoopback);
         ctx2->setTextMode(true);
         QByteArray plainText;
         auto decResult = decJob->exec(cipherText, plainText);

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-import.cpp Added

@@ -0,0 +1,169 @@
+/* t-import.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "t-support.h"
+
+#include "context.h"
+#include "engineinfo.h"
+#include "protocol.h"
+#include "importjob.h"
+
+#include <importresult.h>
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+class ImportTest : public QGpgMETest
+{
+    Q_OBJECT
+
+private:
+    QTemporaryDir tempGpgHome;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        QGpgMETest::initTestCase();
+        QVERIFY2(tempGpgHome.isValid(), "Failed to create temporary GNUPGHOME");
+        qputenv("GNUPGHOME", tempGpgHome.path().toLocal8Bit());
+    }
+
+    void testImportWithImportFilter()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.1.14") {
+            QSKIP("gpg does not yet support the --import-filter option");
+        }
+
+        // pub   ed25519 2021-12-15 SC
+        //       E7A0841292ACC9465D3142652FB3A6F51FBF28A2
+        // uid           ultimate importWithImportFilter@example.com
+        // uid           ultimate importWithImportFilter@example.net
+        // sub   cv25519 2021-12-15 E
+        static const char keyFpr = "E7A0841292ACC9465D3142652FB3A6F51FBF28A2";
+        static const char keyData =
+            "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+            "\n"
+            "mDMEYbm2PhYJKwYBBAHaRw8BAQdACzxBWtNNsmJ6rzpZkjh1yBe+Ajsk9NR8umEu\n"
+            "Da3HLgG0ImltcG9ydFdpdGhJbXBvcnRGaWx0ZXJAZXhhbXBsZS5uZXSIlAQTFgoA\n"
+            "PBYhBOeghBKSrMlGXTFCZS+zpvUfvyiiBQJhubY+AhsDBQsJCAcCAyICAQYVCgkI\n"
+            "CwIEFgIDAQIeBwIXgAAKCRAvs6b1H78oosRgAQCc/ke6q076nvzIE2UzT83JK/B6\n"
+            "lxSV7Fb8bKltOMpvsAD+Phap3EzA8jdMyKoO0FM926bw5lX7QROfeZ/JBYqyPwC0\n"
+            "ImltcG9ydFdpdGhJbXBvcnRGaWx0ZXJAZXhhbXBsZS5jb22IlAQTFgoAPBYhBOeg\n"
+            "hBKSrMlGXTFCZS+zpvUfvyiiBQJhubZlAhsDBQsJCAcCAyICAQYVCgkICwIEFgID\n"
+            "AQIeBwIXgAAKCRAvs6b1H78oohPWAQC/u9UXzkxRkrB2huaTZCsyimWEGZIMmxWd\n"
+            "tE+vN9/IvQD/Yzia+xRS6yca3Yz6iW8xS844ZqRxvkUEHjtJXSOzagm4OARhubY+\n"
+            "EgorBgEEAZdVAQUBAQdANQFjmDctY3N0/ELPZtj9tapwFs4vrmTVpx/SCfZmihkD\n"
+            "AQgHiHgEGBYKACAWIQTnoIQSkqzJRl0xQmUvs6b1H78oogUCYbm2PgIbDAAKCRAv\n"
+            "s6b1H78oovGyAP41ySzvvDpV7XDJBOAFxvWLmywa5IcO7Lrg7y1efoWj0AD+Kk/B\n"
+            "s7jGLdoG51h670h50MMoYCANB6MwAdSP+qZUlQg=\n"
+            "=/3O0\n"
+            "-----END PGP PUBLIC KEY BLOCK-----\n";
+
+        auto *job = openpgp()->importJob();
+        job->setImportFilter(QLatin1String{"keep-uid=mbox = importWithImportFilter@example.net"});
+        connect(job, &ImportJob::result, this,
+                this(ImportResult result, QString, Error)
+        {
+            QVERIFY(!result.error());
+            QVERIFY(!result.imports().empty());
+            QVERIFY(result.numImported());
+            Q_EMIT asyncDone();
+        });
+        job->start(QByteArray{keyData});
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
+        QVERIFY(spy.wait());
+
+        auto ctx = Context::createForProtocol(GpgME::OpenPGP);
+        GpgME::Error err;
+        const auto key = ctx->key(keyFpr, err, false);
+        QVERIFY(!key.isNull());
+        QCOMPARE(key.numUserIDs(), 1);
+        QCOMPARE(key.userID(0).id(), "importWithImportFilter@example.net");
+    }
+
+    void testImportWithKeyOrigin()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.1.22") {
+            QSKIP("gpg does not yet support the --key-origin option");
+        }
+
+        static const char keyFpr = "5C5C428FABCC20F6913464BCCA6FB442887289B3";
+        static const char keyData =
+            "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+            "\n"
+            "mDMEYbhuixYJKwYBBAHaRw8BAQdAulOM3IksCjdOJluEVlwalD8oZ5oa6wCw3EgW\n"
+            "NswXXb60H2ltcG9ydFdpdGhLZXlPcmlnaW5AZXhhbXBsZS5uZXSIlAQTFgoAPBYh\n"
+            "BFxcQo+rzCD2kTRkvMpvtEKIcomzBQJhuG6LAhsDBQsJCAcCAyICAQYVCgkICwIE\n"
+            "FgIDAQIeBwIXgAAKCRDKb7RCiHKJs+cIAQDaeoOw1OCAGpZQb8xJmLJHul5dLLzU\n"
+            "RBdHauMx9NROmQEA23QUVedc7walQjNKFzyIJA/YqRdbAKPiLonRBmxk9Ay4OARh\n"
+            "uG6LEgorBgEEAZdVAQUBAQdAMVdO9mNWIP/q8PtNOnBGlPyhx/vs07sF5sXk50A+\n"
+            "61QDAQgHiHgEGBYKACAWIQRcXEKPq8wg9pE0ZLzKb7RCiHKJswUCYbhuiwIbDAAK\n"
+            "CRDKb7RCiHKJs/x6AP0SEbZqW4iLCz2i1JntQghK5qpSZOVqsBTcARd6pcJ/cwEA\n"
+            "mrwskWazuS9+GVbHT5RATWOXnGaj+AICSDPE6qHtGgA=\n"
+            "=putz\n"
+            "-----END PGP PUBLIC KEY BLOCK-----\n";
+
+        auto *job = openpgp()->importJob();
+        job->setKeyOrigin(GpgME::Key::OriginWKD, "https://example.net");
+        connect(job, &ImportJob::result, this,
+                this(ImportResult result, QString, Error)
+        {
+            QVERIFY(!result.error());
+            QVERIFY(!result.imports().empty());
+            QVERIFY(result.numImported());
+            Q_EMIT asyncDone();
+        });
+        job->start(QByteArray{keyData});
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
+        QVERIFY(spy.wait());
+
+        auto ctx = Context::createForProtocol(GpgME::OpenPGP);
+        GpgME::Error err;
+        const auto key = ctx->key(keyFpr, err, false);
+        QVERIFY(!key.isNull());
+        QVERIFY(key.origin() == Key::OriginWKD);
+        // the origin URL is currently not available in GpgME
+    }
+};
+
+QTEST_MAIN(ImportTest)
+
+#include "t-import.moc"

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-keylist.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-keylist.cpp Changed

@@ -57,9 +57,6 @@
 {
     Q_OBJECT
 
-Q_SIGNALS:
-    void asyncDone();
-
 private Q_SLOTS:
     void testSingleKeyListSync()
     {
@@ -151,7 +148,7 @@
         delete job;
         QVERIFY(!result.error());
 
-        QCOMPARE(secKeys.size(), 2u);
+        QCOMPARE(secKeys.size(), static_cast<decltype(secKeys.size())>(2));
         std::vector<std::string> secKeyFingerprints = std::accumulate(secKeys.begin(), secKeys.end(), std::vector<std::string>(), accumulateFingerprints);
         QCOMPARE(secKeyFingerprints, std::vector<std::string>({
                 "23FD347A419429BACCD5E72D6BC4778054ACD246",
@@ -162,7 +159,7 @@
             QVERIFY(secKeys0.subkeys()0.keyGrip());
         }
 
-        QCOMPARE(pubKeys.size(), 26u);
+        QCOMPARE(pubKeys.size(), static_cast<decltype(pubKeys.size())>(26));
         std::vector<std::string> pubKeyFingerprints = std::accumulate(pubKeys.begin(), pubKeys.end(), std::vector<std::string>(), accumulateFingerprints);
         QCOMPARE(pubKeyFingerprints, std::vector<std::string>({
                 "045B2334ADD69FC221076841A5E67F7FA3AE3EA1",

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-keylocate.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-keylocate.cpp Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-ownertrust.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-ownertrust.cpp Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-remarks.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-remarks.cpp Changed

@@ -54,9 +54,6 @@
 {
     Q_OBJECT
 
-Q_SIGNALS:
-    void asyncDone();
-
 public:
     // This test is disabled (no slot) because the behavior
     // is not clearly defined. Better to prevent that
@@ -77,12 +74,7 @@
         // Create the job
         auto job = openpgp()->signKeyJob();
         QVERIFY (job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job);
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job);
 
         // Setup the job
         job->setExportable(false);
@@ -133,12 +125,7 @@
         // Create the job
         auto job = openpgp()->signKeyJob();
         QVERIFY (job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job);
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job);
 
         // Setup the job
         job->setExportable(true);
@@ -170,11 +157,7 @@
         // Now replace the remark
         auto job3 = openpgp()->signKeyJob();
         QVERIFY (job3);
-
-        // Hack in the passphrase provider
-        auto jobCtx3 = Job::context(job3);
-        jobCtx3->setPassphraseProvider(&provider);
-        jobCtx3->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job3);
 
         // Setup the job
         job3->setExportable(false);
@@ -229,12 +212,7 @@
         // Create the job
         auto job = openpgp()->signKeyJob();
         QVERIFY (job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job);
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job);
 
         // Setup the first job
         job->setExportable(false);
@@ -257,11 +235,7 @@
         // Now another remark from zulu
         auto job3 = openpgp()->signKeyJob();
         QVERIFY (job3);
-
-        // Hack in the passphrase provider
-        auto jobCtx3 = Job::context(job3);
-        jobCtx3->setPassphraseProvider(&provider);
-        jobCtx3->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job3);
 
         // Setup the job
         job3->setExportable(false);
@@ -315,12 +289,7 @@
         // Create the job
         auto job = openpgp()->signKeyJob();
         QVERIFY (job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job);
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job);
 
         // Setup the job
         job->setExportable(false);
@@ -352,11 +321,7 @@
         // Now replace the remark
         auto job3 = openpgp()->signKeyJob();
         QVERIFY (job3);
-
-        // Hack in the passphrase provider
-        auto jobCtx3 = Job::context(job3);
-        jobCtx3->setPassphraseProvider(&provider);
-        jobCtx3->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job3);
 
         // Setup the job
         job3->setExportable(false);
@@ -405,12 +370,7 @@
         // Create the job
         auto job = openpgp()->signKeyJob();
         QVERIFY (job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job);
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job);
 
         // Setup the job
         job->setExportable(false);
@@ -441,11 +401,7 @@
         // Try to replace it without dupeOK
         auto job2 = openpgp()->signKeyJob();
         QVERIFY (job2);
-
-        // Hack in the passphrase provider
-        auto jobCtx2 = Job::context(job2);
-        jobCtx2->setPassphraseProvider(&provider);
-        jobCtx2->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job2);
 
         // Setup the job
         job2->setExportable(false);
@@ -466,11 +422,7 @@
         // Now replace the remark
         auto job3 = openpgp()->signKeyJob();
         QVERIFY (job3);
-
-        // Hack in the passphrase provider
-        auto jobCtx3 = Job::context(job3);
-        jobCtx3->setPassphraseProvider(&provider);
-        jobCtx3->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job3);
 
         // Setup the job
         job3->setExportable(false);

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-support.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-support.cpp Changed

@@ -35,7 +35,10 @@
 #endif
 
 #include "t-support.h"
-#include "context.h"
+
+#include "importjob.h"
+#include "job.h"
+#include "protocol.h"
 
 #include <QTest>
 
@@ -43,8 +46,14 @@
 #include <QCoreApplication>
 #include <QObject>
 #include <QDir>
+#include <QSignalSpy>
 
+#include "context.h"
 #include "engineinfo.h"
+#include "importresult.h"
+
+using namespace GpgME;
+using namespace QGpgME;
 
 void QGpgMETest::initTestCase()
 {
@@ -59,6 +68,12 @@
     killAgent();
 }
 
+// static
+bool QGpgMETest::doOnlineTests()
+{
+    return !qgetenv("DO_ONLINE_TESTS").isEmpty();
+}
+
 bool QGpgMETest::copyKeyrings(const QString &src, const QString &dest)
 {
     bool is21dir = QFileInfo(src + QDir::separator() + QStringLiteral("pubring.kbx")).exists();
@@ -86,6 +101,41 @@
     return true;
 }
 
+bool QGpgMETest::importSecretKeys(const char *keyData, int expectedKeys)
+{
+    auto job = std::unique_ptr<ImportJob>{openpgp()->importJob()};
+    VERIFY_OR_FALSE(job);
+    hookUpPassphraseProvider(job.get());
+
+    ImportResult result;
+    connect(job.get(), &ImportJob::result,
+            this, this, &result(const ImportResult &result_) {
+                result = result_;
+                Q_EMIT asyncDone();
+            });
+    VERIFY_OR_FALSE(!job->start(keyData));
+    job.release(); // after the job has been started it's on its own
+
+    QSignalSpy spy (this, SIGNAL(asyncDone()));
+    VERIFY_OR_FALSE(spy.wait(QSIGNALSPY_TIMEOUT));
+    VERIFY_OR_FALSE(!result.error());
+    VERIFY_OR_FALSE(!result.imports().empty());
+    COMPARE_OR_FALSE(result.numSecretKeysImported(), expectedKeys);
+
+    return true;
+}
+
+void QGpgMETest::hookUpPassphraseProvider(GpgME::Context *context)
+{
+    context->setPassphraseProvider(&mPassphraseProvider);
+    context->setPinentryMode(Context::PinentryLoopback);
+}
+
+void QGpgMETest::hookUpPassphraseProvider(QGpgME::Job *job)
+{
+    hookUpPassphraseProvider(Job::context(job));
+}
+
 void killAgent(const QString& dir)
 {
     QProcess proc;

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-support.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-support.h Changed

@@ -34,11 +34,57 @@
 
 #include "interfaces/passphraseprovider.h"
 #include <QObject>
+#include <QTest>
 
 #include <gpg-error.h>
 
 namespace GpgME
 {
+class Context;
+}
+
+namespace QGpgME
+{
+class Job;
+}
+
+/// generic variant of QVERIFY returning \a returnValue on failure
+#define VERIFY_OR_RETURN_VALUE(statement, returnValue) \
+do {\
+    if (!QTest::qVerify(static_cast<bool>(statement), #statement, "", __FILE__, __LINE__))\
+        return returnValue;\
+} while (false)
+
+/// generic variant of QCOMPARE returning \a returnValue on failure
+#define COMPARE_OR_RETURN_VALUE(actual, expected, returnValue) \
+do {\
+    if (!QTest::qCompare(actual, expected, #actual, #expected, __FILE__, __LINE__))\
+        return returnValue;\
+} while (false)
+
+/// variant of QVERIFY returning a default constructed object on failure
+#define VERIFY_OR_OBJECT(statement) VERIFY_OR_RETURN_VALUE(statement, {})
+
+/// variant of QCOMPARE returning a default constructed object on failure
+#define COMPARE_OR_OBJECT(actual, expected) COMPARE_OR_RETURN_VALUE(actual, expected, {})
+
+/// variant of QVERIFY returning \c false on failure
+#define VERIFY_OR_FALSE(statement) VERIFY_OR_RETURN_VALUE(statement, false)
+
+/// variant of QCOMPARE returning \c false on failure
+#define COMPARE_OR_FALSE(actual, expected) COMPARE_OR_RETURN_VALUE(actual, expected, false)
+
+namespace QTest
+{
+template <>
+inline char *toString(const std::string &s)
+{
+    return QTest::toString(s.c_str());
+}
+}
+
+namespace GpgME
+{
 class TestPassphraseProvider : public PassphraseProvider
 {
 public:
@@ -59,12 +105,26 @@
 class QGpgMETest : public QObject
 {
     Q_OBJECT
+
+Q_SIGNALS:
+    void asyncDone();
+
 protected:
+    static bool doOnlineTests();
+
     bool copyKeyrings(const QString &from, const QString& to);
 
+    bool importSecretKeys(const char *keyData, int expectedKeys = 1);
+
+    void hookUpPassphraseProvider(GpgME::Context *context);
+    void hookUpPassphraseProvider(QGpgME::Job *job);
+
 public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
+
+private:
+    GpgME::TestPassphraseProvider mPassphraseProvider;
 };
 
 /* Timeout, in milliseconds, for use with QSignalSpy to wait on

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-tofuinfo.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-tofuinfo.cpp Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-trustsignatures.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-trustsignatures.cpp Changed

@@ -1,4 +1,4 @@
-/* t-remarks.cpp
+/* t-trustsignatures.cpp
 
     This file is part of qgpgme, the Qt API binding for gpgme
     Copyright (c) 2021 g10 Code GmbH
@@ -52,9 +52,6 @@
 {
     Q_OBJECT
 
-Q_SIGNALS:
-    void asyncDone();
-
 private Q_SLOTS:
     void test_tsign_single_uid_key_and_then_tsign_it_again()
     {
@@ -83,12 +80,7 @@
             // Create the job
             auto job = std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job.get());
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job.get());
 
             // Setup the job
             job->setExportable(true);
@@ -131,12 +123,7 @@
             // Create the job
             auto job = std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job.get());
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job.get());
 
             // Setup the job
             job->setExportable(true);
@@ -204,12 +191,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-             TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);
@@ -252,12 +234,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);
@@ -325,12 +302,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);
@@ -374,12 +346,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);
@@ -447,12 +414,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);
@@ -495,12 +457,7 @@
             // Create the job
             auto job = openpgp()->signKeyJob();//std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
             QVERIFY(job);
-
-            // Hack in the passphrase provider
-            auto jobCtx = Job::context(job);
-            TestPassphraseProvider provider;
-            jobCtx->setPassphraseProvider(&provider);
-            jobCtx->setPinentryMode(Context::PinentryLoopback);
+            hookUpPassphraseProvider(job);
 
             // Setup the job
             job->setExportable(true);

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-various.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-various.cpp Changed

@@ -71,9 +71,6 @@
 {
     Q_OBJECT
 
-Q_SIGNALS:
-    void asyncDone();
-
 private Q_SLOTS:
     void testDN()
     {
@@ -137,9 +134,7 @@
 
         auto ctx = Context::createForProtocol(key.protocol());
         QVERIFY (ctx);
-        TestPassphraseProvider provider;
-        ctx->setPassphraseProvider(&provider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(ctx);
 
         QVERIFY(!ctx->addUid(key, uid));
         delete ctx;
@@ -190,9 +185,7 @@
 
         auto ctx = Context::createForProtocol(key.protocol());
         QVERIFY (ctx);
-        TestPassphraseProvider provider;
-        ctx->setPassphraseProvider(&provider);
-        ctx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(ctx);
 
         // change expiration of the main key
         QVERIFY(!ctx->setExpire(key, 1000));
@@ -230,7 +223,7 @@
         std::vector<Subkey> primaryKey;
         primaryKey.push_back(key.subkey(0));
         const auto err = ctx->setExpire(key, 3000, primaryKey);
-        QCOMPARE(err.code(), GPG_ERR_NOT_FOUND);
+        QCOMPARE(err.code(), static_cast<int>(GPG_ERR_NOT_FOUND));
         delete ctx;
     }
 
@@ -259,12 +252,7 @@
         // Create the job
         auto job = std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
         QVERIFY(job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job.get());
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job.get());
 
         // Setup the job
         job->setExportable(true);
@@ -319,12 +307,7 @@
         // Create the job
         auto job = std::unique_ptr<SignKeyJob>{openpgp()->signKeyJob()};
         QVERIFY(job);
-
-        // Hack in the passphrase provider
-        auto jobCtx = Job::context(job.get());
-        TestPassphraseProvider provider;
-        jobCtx->setPassphraseProvider(&provider);
-        jobCtx->setPinentryMode(Context::PinentryLoopback);
+        hookUpPassphraseProvider(job.get());
 
         // Setup the job
         job->setExportable(true);
@@ -355,7 +338,7 @@
         target.update();
         const auto keySignature = target.userID(0).signature(target.userID(0).numSignatures() - 1);
         QVERIFY(!keySignature.neverExpires());
-        const auto expirationDate = QDateTime::fromSecsSinceEpoch(keySignature.expirationTime()).date();
+        const auto expirationDate = QDateTime::fromSecsSinceEpoch(uint_least32_t(keySignature.expirationTime())).date();
         QCOMPARE(expirationDate, QDate(2106, 2, 6));  // expiration date is capped at 2106-02-06
     }

_service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-wkdlookup.cpp Added

@@ -0,0 +1,155 @@
+/* t-wkdlookup.cpp
+
+    This file is part of qgpgme, the Qt API binding for gpgme
+    Copyright (c) 2021 g10 Code GmbH
+    Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
+
+    QGpgME is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    QGpgME is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of this program with any edition of
+    the Qt library by Trolltech AS, Norway (or with modified versions
+    of Qt that use the same license as Qt), and distribute linked
+    combinations including the two.  You must obey the GNU General
+    Public License in all respects for all of the code used other than
+    Qt.  If you modify this file, you may extend this exception to
+    your version of the file, but you are not obligated to do so.  If
+    you do not wish to do so, delete this exception statement from
+    your version.
+*/
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "t-support.h"
+
+#include "data.h"
+#include "engineinfo.h"
+#include "protocol.h"
+#include "wkdlookupjob.h"
+#include "wkdlookupresult.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+#include <algorithm>
+
+using namespace QGpgME;
+using namespace GpgME;
+
+static const char *requiredVersion = "2.1.12";
+
+namespace
+{
+bool keyHasUserIDWithMatchingEmailAddress(const Key &key, const QString &expectedEmailAddress)
+{
+    const auto email = expectedEmailAddress.toLower();
+    const auto userIds = key.userIDs();
+    return std::any_of(
+        std::begin(userIds), std::end(userIds),
+        email(const UserID &uid) {
+            return email == QString::fromUtf8(uid.email()).toLower();
+        });
+}
+}
+
+class WKDLookupTest : public QGpgMETest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void testWKDLookupAsync()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < requiredVersion) {
+            QSKIP("dirmngr does not yet support WKD lookup");
+        }
+        if (!doOnlineTests()) {
+            QSKIP("Set DO_ONLINE_TESTS environment variable to run this test.");
+        }
+        const QString email = QLatin1String{"wk@gnupg.org"};
+
+        WKDLookupResult result;
+        auto *job = openpgp()->wkdLookupJob();
+        connect(job, &WKDLookupJob::result, job, this, &result(const WKDLookupResult &result_, const QString &, const Error &)
+        {
+            result = result_;
+            Q_EMIT asyncDone();
+        });
+        job->start(email);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
+        QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
+
+        QVERIFY(result.error().code() == GPG_ERR_NO_ERROR);
+        QCOMPARE(result.pattern(), "wk@gnupg.org");
+        QCOMPARE(result.source(), "https://openpgpkey.gnupg.org");
+        const auto keys = result.keyData().toKeys(GpgME::OpenPGP);
+        QVERIFY(keys.size() == 1);
+        QVERIFY(keyHasUserIDWithMatchingEmailAddress(keys.front(), email));
+    }
+
+    void testWKDLookupSync()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < requiredVersion) {
+            QSKIP("dirmngr does not yet support WKD lookup");
+        }
+        if (!doOnlineTests()) {
+            QSKIP("Set DO_ONLINE_TESTS environment variable to run this test.");
+        }
+        const QString email = QLatin1String{"wk@gnupg.org"};
+
+        auto *job = openpgp()->wkdLookupJob();
+        const auto result = job->exec(email);
+
+        QVERIFY(result.error().code() == GPG_ERR_NO_ERROR);
+        QCOMPARE(result.pattern(), "wk@gnupg.org");
+        QCOMPARE(result.source(), "https://openpgpkey.gnupg.org");
+        const auto keys = result.keyData().toKeys(GpgME::OpenPGP);
+        QVERIFY(keys.size() == 1);
+        QVERIFY(keyHasUserIDWithMatchingEmailAddress(keys.front(), email));
+    }
+
+    void testLookupWithNoResultAsync()
+    {
+        if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < requiredVersion) {
+            QSKIP("dirmngr does not yet support WKD lookup");
+        }
+        if (!doOnlineTests()) {
+            QSKIP("Set DO_ONLINE_TESTS environment variable to run this test.");
+        }
+        const QString email = QLatin1String{"alfa@example.net"};
+
+        WKDLookupResult result;
+        auto *job = openpgp()->wkdLookupJob();
+        connect(job, &WKDLookupJob::result, job, this, &result(const WKDLookupResult &result_, const QString &, const Error &)
+        {
+            result = result_;
+            Q_EMIT asyncDone();
+        });
+        job->start(email);
+        QSignalSpy spy (this, SIGNAL(asyncDone()));
+        QVERIFY(spy.wait(QSIGNALSPY_TIMEOUT));
+
+        QVERIFY(result.error().code() == GPG_ERR_NO_ERROR);
+        QCOMPARE(result.pattern(), "alfa@example.net");
+        QCOMPARE(result.source(), "");
+        QVERIFY(result.keyData().isNull());
+    }
+};
+
+QTEST_MAIN(WKDLookupTest)
+
+#include "t-wkdlookup.moc"

_service:tar_scm:gpgme-1.16.0.tar.bz2/lang/qt/tests/t-wkspublish.cpp -> _service:tar_scm:gpgme-1.17.0.tar.bz2/lang/qt/tests/t-wkspublish.cpp Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/m4/libtool.m4 -> _service:tar_scm:gpgme-1.17.0.tar.bz2/m4/libtool.m4 Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/ath.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/ath.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/ath.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/ath.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/context.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/context.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/data.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/data.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/debug.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/debug.h Changed

@@ -141,7 +141,7 @@
   return err;
 }
 
-/* Trace a system call result and return it.  */
+/* Trace a system call result of type int and return it.  */
 #define TRACE_SYSRES(res) \
     _trace_sysres ((res), _gpgme_trace_level, _gpgme_trace_func, __LINE__)
 static inline int
@@ -157,6 +157,38 @@
   return res;
 }
 
+/* Trace a system call result of type gpgme_off_t and return it.  */
+#define TRACE_SYSRES_OFF_T(res) \
+    _trace_sysres_off_t ((res), _gpgme_trace_level, _gpgme_trace_func, __LINE__)
+static inline gpgme_off_t
+_trace_sysres_off_t (gpgme_off_t res, int lvl, const char *func, int line)
+{
+  if (res >= 0)
+    _gpgme_debug (NULL, lvl, 3, func, NULL, NULL, "result=%ld", res);
+  else
+    _gpgme_debug (NULL, lvl, -1, NULL, NULL, NULL,
+                  "%s:%d: error: %s (%d)\n",
+                  func, line,  strerror (errno), errno);
+  _gpgme_debug_frame_end ();
+  return res;
+}
+
+/* Trace a system call result of type gpgme_ssize_t and return it.  */
+#define TRACE_SYSRES_SSIZE_T(res) \
+    _trace_sysres_ssize_t ((res), _gpgme_trace_level, _gpgme_trace_func, __LINE__)
+static inline gpgme_ssize_t
+_trace_sysres_ssize_t (gpgme_ssize_t res, int lvl, const char *func, int line)
+{
+  if (res >= 0)
+    _gpgme_debug (NULL, lvl, 3, func, NULL, NULL, "result=%zd", res);
+  else
+    _gpgme_debug (NULL, lvl, -1, NULL, NULL, NULL,
+                  "%s:%d: error: %s (%d)\n",
+                  func, line,  strerror (errno), errno);
+  _gpgme_debug_frame_end ();
+  return res;
+}
+
 /* Trace a system call error and return it.  */
 #define TRACE_SYSERR(rc) \
     _trace_syserr ((rc), _gpgme_trace_level, _gpgme_trace_func, __LINE__)

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/dirinfo.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/dirinfo.c Changed

@@ -44,6 +44,7 @@
     WANT_LIBDIR,
     WANT_DATADIR,
     WANT_LOCALEDIR,
+    WANT_SOCKETDIR,
     WANT_AGENT_SOCKET,
     WANT_AGENT_SSH_SOCKET,
     WANT_DIRMNGR_SOCKET,
@@ -52,6 +53,11 @@
     WANT_GPG_NAME,
     WANT_GPGSM_NAME,
     WANT_G13_NAME,
+    WANT_KEYBOXD_NAME,
+    WANT_AGENT_NAME,
+    WANT_SCDAEMON_NAME,
+    WANT_DIRMNGR_NAME,
+    WANT_PINENTRY_NAME,
     WANT_GPG_WKS_CLIENT_NAME,
     WANT_GPG_ONE_MODE
   };
@@ -67,6 +73,7 @@
   char *libdir;
   char *datadir;
   char *localedir;
+  char *socketdir;
   char *agent_socket;
   char *agent_ssh_socket;
   char *dirmngr_socket;
@@ -75,6 +82,11 @@
   char *gpg_name;
   char *gpgsm_name;
   char *g13_name;
+  char *keyboxd_name;
+  char *agent_name;
+  char *scdaemon_name;
+  char *dirmngr_name;
+  char *pinentry_name;
   char *gpg_wks_client_name;
   int  gpg_one_mode;  /* System is in gpg1 mode.  */
 } dirinfo;
@@ -135,6 +147,16 @@
         dirinfo.gpgsm_name = strdup (value);
       else if (!strcmp (line, "g13") && !dirinfo.g13_name)
         dirinfo.g13_name = strdup (value);
+      else if (!strcmp (line, "keyboxd") && !dirinfo.keyboxd_name)
+        dirinfo.keyboxd_name = strdup (value);
+      else if (!strcmp (line, "gpg-agent") && !dirinfo.agent_name)
+        dirinfo.agent_name = strdup (value);
+      else if (!strcmp (line, "scdaemon") && !dirinfo.scdaemon_name)
+        dirinfo.scdaemon_name = strdup (value);
+      else if (!strcmp (line, "dirmngr") && !dirinfo.dirmngr_name)
+        dirinfo.dirmngr_name = strdup (value);
+      else if (!strcmp (line, "pinentry") && !dirinfo.pinentry_name)
+        dirinfo.pinentry_name = strdup (value);
     }
   else
     {
@@ -152,6 +174,8 @@
         dirinfo.datadir = strdup (value);
       else if (!strcmp (line, "localedir") && !dirinfo.localedir)
         dirinfo.localedir = strdup (value);
+      else if (!strcmp (line, "socketdir") && !dirinfo.socketdir)
+        dirinfo.socketdir = strdup (value);
       else if (!strcmp (line, "agent-socket") && !dirinfo.agent_socket)
         {
           const char name = "S.uiserver";
@@ -306,10 +330,34 @@
         _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
                       "gpgme-dinfo:   gpgsm='%s'\n",
                       dirinfo.gpgsm_name);
+      if (dirinfo.keyboxd_name)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo:     keyboxd='%s'\n",
+                      dirinfo.keyboxd_name);
+      if (dirinfo.agent_name)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo:     gpg-agent='%s'\n",
+                      dirinfo.agent_name);
+      if (dirinfo.scdaemon_name)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo:     scdaemon='%s'\n",
+                      dirinfo.scdaemon_name);
+      if (dirinfo.dirmngr_name)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo:     dirmngr='%s'\n",
+                      dirinfo.dirmngr_name);
+      if (dirinfo.pinentry_name)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo:     pinentry='%s'\n",
+                      dirinfo.pinentry_name);
       if (dirinfo.homedir)
         _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
                       "gpgme-dinfo: homedir='%s'\n",
                       dirinfo.homedir);
+      if (dirinfo.socketdir)
+        _gpgme_debug (NULL, DEBUG_INIT, -1, NULL, NULL, NULL,
+                      "gpgme-dinfo: sockdir='%s'\n",
+                      dirinfo.socketdir);
       if (dirinfo.agent_socket)
         _gpgme_debug (NULL,DEBUG_INIT, -1, NULL, NULL, NULL,
                       "gpgme-dinfo:   agent='%s'\n",
@@ -336,6 +384,7 @@
     case WANT_LIBDIR:     result = dirinfo.libdir; break;
     case WANT_DATADIR:    result = dirinfo.datadir; break;
     case WANT_LOCALEDIR:  result = dirinfo.localedir; break;
+    case WANT_SOCKETDIR:  result = dirinfo.socketdir; break;
     case WANT_AGENT_SOCKET: result = dirinfo.agent_socket; break;
     case WANT_AGENT_SSH_SOCKET: result = dirinfo.agent_ssh_socket; break;
     case WANT_DIRMNGR_SOCKET: result = dirinfo.dirmngr_socket; break;
@@ -343,6 +392,11 @@
     case WANT_GPG_NAME:   result = dirinfo.gpg_name; break;
     case WANT_GPGSM_NAME: result = dirinfo.gpgsm_name; break;
     case WANT_G13_NAME:   result = dirinfo.g13_name; break;
+    case WANT_KEYBOXD_NAME: result = dirinfo.keyboxd_name; break;
+    case WANT_AGENT_NAME: result = dirinfo.agent_name; break;
+    case WANT_SCDAEMON_NAME: result = dirinfo.scdaemon_name; break;
+    case WANT_DIRMNGR_NAME: result = dirinfo.dirmngr_name; break;
+    case WANT_PINENTRY_NAME: result = dirinfo.pinentry_name; break;
     case WANT_UISRV_SOCKET:  result = dirinfo.uisrv_socket; break;
     case WANT_GPG_ONE_MODE: result = dirinfo.gpg_one_mode? "1":NULL; break;
     case WANT_GPG_WKS_CLIENT_NAME:
@@ -458,6 +512,16 @@
     return get_gpgconf_item (WANT_GPGSM_NAME);
   else if (!strcmp (what, "g13-name"))
     return get_gpgconf_item (WANT_G13_NAME);
+  else if (!strcmp (what, "keyboxd-name"))
+    return get_gpgconf_item (WANT_KEYBOXD_NAME);
+  else if (!strcmp (what, "agent-name"))
+    return get_gpgconf_item (WANT_AGENT_NAME);
+  else if (!strcmp (what, "scdaemon-name"))
+    return get_gpgconf_item (WANT_SCDAEMON_NAME);
+  else if (!strcmp (what, "dirmngr-name"))
+    return get_gpgconf_item (WANT_DIRMNGR_NAME);
+  else if (!strcmp (what, "pinentry-name"))
+    return get_gpgconf_item (WANT_PINENTRY_NAME);
   else if (!strcmp (what, "gpg-wks-client-name"))
     return get_gpgconf_item (WANT_GPG_WKS_CLIENT_NAME);
   else if (!strcmp (what, "agent-ssh-socket"))
@@ -476,6 +540,8 @@
     return get_gpgconf_item (WANT_DATADIR);
   else if (!strcmp (what, "localedir"))
     return get_gpgconf_item (WANT_LOCALEDIR);
+  else if (!strcmp (what, "socketdir"))
+    return get_gpgconf_item (WANT_SOCKETDIR);
   else
     return NULL;
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine-backend.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine-backend.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine-gpg.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine-gpg.c Changed

@@ -59,7 +59,7 @@
   int print_fd;    /* Print the fd number and not the special form of it.  */
   int *arg_locp;   /* Write back the argv idx of this argument when
 		      building command line to this location.  */
-  char arg1;     /* Used if data above is not used.  */
+  char argFLEXIBLE_ARRAY_MEMBER;     /* Used if data above is not used.  */
 };
 
 
@@ -233,7 +233,7 @@
   assert (gpg);
   assert (arg);
 
-  a = malloc (sizeof *a + prefixlen + arglen);
+  a = malloc (offsetof (struct arg_and_data_s, arg) + prefixlen + arglen + 1);
   if (!a)
     return gpg_error_from_syserror ();
 
@@ -307,7 +307,7 @@
   assert (gpg);
   assert (data);
 
-  a = malloc (sizeof *a - 1);
+  a = malloc (offsetof (struct arg_and_data_s, arg));
   if (!a)
     return gpg_error_from_syserror ();
   a->next = NULL;
@@ -2354,7 +2354,8 @@
   if ((mode & ~(GPGME_EXPORT_MODE_EXTERN
                 |GPGME_EXPORT_MODE_MINIMAL
                 |GPGME_EXPORT_MODE_SSH
-                |GPGME_EXPORT_MODE_SECRET)))
+                |GPGME_EXPORT_MODE_SECRET
+                |GPGME_EXPORT_MODE_SECRET_SUBKEY)))
     return gpg_error (GPG_ERR_NOT_SUPPORTED);
 
   if ((mode & GPGME_EXPORT_MODE_MINIMAL))
@@ -2379,7 +2380,9 @@
     }
   else
     {
-      if ((mode & GPGME_EXPORT_MODE_SECRET))
+      if ((mode & GPGME_EXPORT_MODE_SECRET_SUBKEY))
+        err = add_arg (gpg, "--export-secret-subkeys");
+      else if ((mode & GPGME_EXPORT_MODE_SECRET))
         err = add_arg (gpg, "--export-secret-keys");
       else
         err = add_arg (gpg, "--export");
@@ -2766,21 +2769,43 @@
 
 
 static gpgme_error_t
-gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray)
+gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
+            const char *keyids, const char *import_filter,
+            const char *key_origin)
 {
   engine_gpg_t gpg = engine;
   gpgme_error_t err;
   int idx;
   gpgme_data_encoding_t dataenc;
 
-  if (keydata && keyarray)
+  if ((keydata && keyarray) || (keydata && keyids) || (keyarray && keyids))
     return gpg_error (GPG_ERR_INV_VALUE); /* Only one is allowed.  */
 
   dataenc = gpgme_data_get_encoding (keydata);
 
-  if (keyarray)
+  if (keyids)
     {
       err = add_arg (gpg, "--recv-keys");
+      if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
+        {
+          err = add_arg (gpg, "--import-filter");
+          if (!err)
+            err = add_arg (gpg, import_filter);
+        }
+      if (!err)
+        err = add_arg (gpg, "--");
+      while (!err && *keyids && **keyids)
+        err = add_arg (gpg, *(keyids++));
+    }
+  else if (keyarray)
+    {
+      err = add_arg (gpg, "--recv-keys");
+      if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
+        {
+          err = add_arg (gpg, "--import-filter");
+          if (!err)
+            err = add_arg (gpg, import_filter);
+        }
       if (!err)
         err = add_arg (gpg, "--");
       for (idx=0; !err && keyarrayidx; idx++)
@@ -2812,6 +2837,12 @@
          should use an option to gpg to modify such commands (ala
          --multifile).  */
       err = add_arg (gpg, "--fetch-keys");
+      if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
+        {
+          err = add_arg (gpg, "--import-filter");
+          if (!err)
+            err = add_arg (gpg, import_filter);
+        }
       if (!err)
         err = add_arg (gpg, "--");
       helpptr = NULL;
@@ -2830,6 +2861,18 @@
   else
     {
       err = add_arg (gpg, "--import");
+      if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
+        {
+          err = add_arg (gpg, "--import-filter");
+          if (!err)
+            err = add_arg (gpg, import_filter);
+        }
+      if (!err && key_origin && have_gpg_version (gpg, "2.1.22"))
+        {
+          err = add_arg (gpg, "--key-origin");
+          if (!err)
+            err = add_arg (gpg, key_origin);
+        }
       if (!err)
         err = add_arg (gpg, "--");
       if (!err)

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine-gpgconf.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine-gpgconf.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine-gpgsm.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine-gpgsm.c Changed

@@ -1512,6 +1512,12 @@
   if (!gpgsm)
     return gpg_error (GPG_ERR_INV_VALUE);
 
+  if ((mode & ~(GPGME_EXPORT_MODE_SECRET
+                |GPGME_EXPORT_MODE_MINIMAL
+                |GPGME_EXPORT_MODE_RAW
+                |GPGME_EXPORT_MODE_PKCS12)))
+    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
   if (!pattern)
     pattern = "";
 
@@ -1559,6 +1565,12 @@
   if (!gpgsm)
     return gpg_error (GPG_ERR_INV_VALUE);
 
+  if ((mode & ~(GPGME_EXPORT_MODE_SECRET
+                |GPGME_EXPORT_MODE_MINIMAL
+                |GPGME_EXPORT_MODE_RAW
+                |GPGME_EXPORT_MODE_PKCS12)))
+    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
   if (pattern && *pattern)
     {
       const char **pat = pattern;
@@ -1696,16 +1708,24 @@
 
 
 static gpgme_error_t
-gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray)
+gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
+              const char *keyids, const char *import_filter,
+              const char *key_origin)
 {
   engine_gpgsm_t gpgsm = engine;
   gpgme_error_t err;
   gpgme_data_encoding_t dataenc;
   int idx;
 
+  (void)import_filter;
+  (void)key_origin;
+
   if (!gpgsm)
     return gpg_error (GPG_ERR_INV_VALUE);
 
+  if (keyids)
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+
   if (keydata && keyarray)
     return gpg_error (GPG_ERR_INV_VALUE); /* Only one is allowed.  */

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/engine.h -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/engine.h Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/export.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/export.c Changed

@@ -105,7 +105,8 @@
         return err;
       else if (opd->err)
         ; /* We only want to report the first error.  */
-      else if (!strcmp (loc, "keyserver_send"))
+      else if (!strcmp (loc, "keyserver_send")
+               || !strcmp (loc, "export_keys.secret"))
         opd->err = err;
       break;
 
@@ -117,21 +118,29 @@
 
 
 static gpgme_error_t
-export_start (gpgme_ctx_t ctx, int synchronous, const char *pattern,
-	      gpgme_export_mode_t mode, gpgme_data_t keydata)
+check_mode (gpgme_export_mode_t mode, gpgme_protocol_t protocol,
+            gpgme_data_t keydata)
 {
-  gpgme_error_t err;
-  void *hook;
-  op_data_t opd;
-
   if ((mode & ~(GPGME_EXPORT_MODE_EXTERN
                 |GPGME_EXPORT_MODE_MINIMAL
                 |GPGME_EXPORT_MODE_SECRET
                 |GPGME_EXPORT_MODE_SSH
                 |GPGME_EXPORT_MODE_RAW
-                |GPGME_EXPORT_MODE_PKCS12)))
+                |GPGME_EXPORT_MODE_PKCS12
+                |GPGME_EXPORT_MODE_SECRET_SUBKEY)))
     return gpg_error (GPG_ERR_INV_VALUE); /* Invalid flags in MODE.  */
 
+  if ((mode & GPGME_EXPORT_MODE_SSH))
+    {
+       if ((mode & (GPGME_EXPORT_MODE_EXTERN
+                    |GPGME_EXPORT_MODE_MINIMAL
+                    |GPGME_EXPORT_MODE_SECRET
+                    |GPGME_EXPORT_MODE_RAW
+                    |GPGME_EXPORT_MODE_PKCS12
+                    |GPGME_EXPORT_MODE_SECRET_SUBKEY)))
+          return gpg_error (GPG_ERR_INV_FLAG);  /* Combination not allowed. */
+    }
+
   if ((mode & GPGME_EXPORT_MODE_SECRET))
     {
       if ((mode & GPGME_EXPORT_MODE_EXTERN))
@@ -140,11 +149,17 @@
           && (mode & GPGME_EXPORT_MODE_PKCS12))
         return gpg_error (GPG_ERR_INV_FLAG);  /* Combination not allowed. */
 
-      if (ctx->protocol != GPGME_PROTOCOL_CMS
+      if (protocol != GPGME_PROTOCOL_CMS
           && (mode & (GPGME_EXPORT_MODE_RAW|GPGME_EXPORT_MODE_PKCS12)))
         return gpg_error (GPG_ERR_INV_FLAG);  /* Only supported for X.509.  */
     }
 
+  if ((mode & GPGME_EXPORT_MODE_SECRET_SUBKEY))
+    {
+      if ((mode & GPGME_EXPORT_MODE_EXTERN))
+        return gpg_error (GPG_ERR_INV_FLAG);  /* Combination not allowed. */
+    }
+
   if ((mode & GPGME_EXPORT_MODE_EXTERN))
     {
       if (keydata)
@@ -156,6 +171,22 @@
         return gpg_error (GPG_ERR_INV_VALUE);
     }
 
+  return 0;
+}
+
+
+static gpgme_error_t
+export_start (gpgme_ctx_t ctx, int synchronous, const char *pattern,
+	      gpgme_export_mode_t mode, gpgme_data_t keydata)
+{
+  gpgme_error_t err;
+  void *hook;
+  op_data_t opd;
+
+  err = check_mode (mode, ctx->protocol, keydata);
+  if (err)
+    return err;
+
   err = _gpgme_op_reset (ctx, synchronous);
   if (err)
     return err;
@@ -227,37 +258,9 @@
   void *hook;
   op_data_t opd;
 
-  if ((mode & ~(GPGME_EXPORT_MODE_EXTERN
-                |GPGME_EXPORT_MODE_MINIMAL
-                |GPGME_EXPORT_MODE_SECRET
-                |GPGME_EXPORT_MODE_SSH
-                |GPGME_EXPORT_MODE_RAW
-                |GPGME_EXPORT_MODE_PKCS12)))
-    return gpg_error (GPG_ERR_INV_VALUE); /* Invalid flags in MODE.  */
-
-  if ((mode & GPGME_EXPORT_MODE_SECRET))
-    {
-      if ((mode & GPGME_EXPORT_MODE_EXTERN))
-        return gpg_error (GPG_ERR_INV_FLAG);  /* Combination not allowed. */
-      if ((mode & GPGME_EXPORT_MODE_RAW)
-          && (mode & GPGME_EXPORT_MODE_PKCS12))
-        return gpg_error (GPG_ERR_INV_FLAG);  /* Combination not allowed. */
-
-      if (ctx->protocol != GPGME_PROTOCOL_CMS
-          && (mode & (GPGME_EXPORT_MODE_RAW|GPGME_EXPORT_MODE_PKCS12)))
-        return gpg_error (GPG_ERR_INV_FLAG);  /* Only supported for X.509.  */
-    }
-
-  if ((mode & GPGME_EXPORT_MODE_EXTERN))
-    {
-      if (keydata)
-        return gpg_error (GPG_ERR_INV_VALUE);
-    }
-  else
-    {
-      if (!keydata)
-        return gpg_error (GPG_ERR_INV_VALUE);
-    }
+  err = check_mode (mode, ctx->protocol, keydata);
+  if (err)
+    return err;
 
   err = _gpgme_op_reset (ctx, synchronous);
   if (err)
@@ -375,6 +378,11 @@
   if (!keys)
     return gpg_error (GPG_ERR_INV_VALUE);
 
+  if ((mode & GPGME_EXPORT_MODE_SECRET_SUBKEY))
+    {
+      return gpg_error (GPG_ERR_INV_FLAG);
+    }
+
   /* Create a list of pattern from the keys.  */
   for (idx=nkeys=0; keysidx; idx++)
     if (keysidx->protocol == ctx->protocol)

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/gpgme-tool.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/gpgme-tool.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/gpgme.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/gpgme.c Changed

@@ -254,6 +254,8 @@
   free (ctx->auto_key_locate);
   free (ctx->trust_model);
   free (ctx->cert_expire);
+  free (ctx->key_origin);
+  free (ctx->import_filter);
   _gpgme_engine_info_release (ctx->engine_info);
   ctx->engine_info = NULL;
   DESTROY_LOCK (ctx->lock);
@@ -586,6 +588,20 @@
       if (!ctx->cert_expire)
         err = gpg_error_from_syserror ();
     }
+  else if (!strcmp (name, "key-origin"))
+    {
+      free (ctx->key_origin);
+      ctx->key_origin = strdup (value);
+      if (!ctx->key_origin)
+        err = gpg_error_from_syserror ();
+    }
+  else if (!strcmp (name, "import-filter"))
+    {
+      free (ctx->import_filter);
+      ctx->import_filter = strdup (value);
+      if (!ctx->import_filter)
+        err = gpg_error_from_syserror ();
+    }
   else
     err = gpg_error (GPG_ERR_UNKNOWN_NAME);
 
@@ -659,6 +675,14 @@
     {
       return ctx->cert_expire? ctx->cert_expire : "";
     }
+  else if (!strcmp (name, "key-origin"))
+    {
+      return ctx->key_origin? ctx->key_origin : "";
+    }
+  else if (!strcmp (name, "import-filter"))
+    {
+      return ctx->import_filter? ctx->import_filter : "";
+    }
   else
     return NULL;
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/gpgme.def -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/gpgme.def Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/gpgme.h.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/gpgme.h.in Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/gpgme.pc.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/gpgme.pc.in Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/import.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/import.c Changed

@@ -103,7 +103,7 @@
       while (impstat)
 	{
 	  TRACE_LOG  ("import%i for %s = 0x%x (%s)",
-		      i, impstat->fpr, impstat->status,
+		      i, impstat->fpr ? impstat->fpr : "null", impstat->status,
                       gpgme_strerror (impstat->result));
 	  impstat = impstat->next;
 	  i++;
@@ -223,6 +223,49 @@
 }
 
 
+/* Parses an error on a status line and adds a corresponding import status.
+   Currently, only supports "import.parsep12 11".  */
+static gpgme_error_t
+parse_error (char *args, gpgme_import_status_t *import_status)
+{
+  gpgme_import_status_t import;
+  char *tail;
+  long int nr;
+
+  tail = strchr (args, ' ');
+  if (!tail)
+    return 0;
+
+  *tail = '\0';
+  if (strcmp( args, "import.parsep12" ))
+    return 0;
+
+  args = tail + 1;
+
+  gpg_err_set_errno (0);
+  nr = strtol (args, &tail, 0);
+  if (errno || args == tail || !(*tail == ' ' || !*tail))
+    {
+      /* The crypto backend does not behave.  */
+      return trace_gpg_error (GPG_ERR_INV_ENGINE);
+    }
+  if (nr != GPG_ERR_BAD_PASSPHRASE)
+    return 0;
+
+  import = malloc (sizeof (*import));
+  if (!import)
+    return gpg_error_from_syserror ();
+  import->next = NULL;
+
+  import->result = gpg_error (GPG_ERR_BAD_PASSPHRASE);
+  import->status = 0;
+  import->fpr = 0;
+
+  *import_status = import;
+  return 0;
+}
+
+
 static gpgme_error_t
 import_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
@@ -252,6 +295,15 @@
       err = parse_import_res (args, &opd->result);
       break;
 
+    case GPGME_STATUS_ERROR:
+      err = parse_error (args, opd->lastp);
+      if (err)
+        return err;
+
+      if (*opd->lastp)
+        opd->lastp = &(*opd->lastp)->next;
+      break;
+
     default:
       break;
     }
@@ -282,7 +334,8 @@
 
   _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
 
-  return _gpgme_engine_op_import (ctx->engine, keydata, NULL);
+  return _gpgme_engine_op_import (ctx->engine, keydata, NULL, NULL,
+                                  ctx->import_filter, ctx->key_origin);
 }
 
 
@@ -365,7 +418,8 @@
 
   _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
 
-  return _gpgme_engine_op_import (ctx->engine, NULL, keys);
+  return _gpgme_engine_op_import (ctx->engine, NULL, keys, NULL,
+                                  ctx->import_filter, ctx->key_origin);
 }
 
 
@@ -438,6 +492,94 @@
 }
 
 
+static gpgme_error_t
+_gpgme_op_receive_keys_start (gpgme_ctx_t ctx, int synchronous, const char *keyids)
+{
+  gpgme_error_t err;
+  void *hook;
+  op_data_t opd;
+
+  err = _gpgme_op_reset (ctx, synchronous);
+  if (err)
+    return err;
+
+  err = _gpgme_op_data_lookup (ctx, OPDATA_IMPORT, &hook,
+			       sizeof (*opd), release_op_data);
+  opd = hook;
+  if (err)
+    return err;
+  opd->lastp = &opd->result.imports;
+
+  if (!keyids || !*keyids)
+    return gpg_error (GPG_ERR_NO_DATA);
+
+  _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
+
+  return _gpgme_engine_op_import (ctx->engine, NULL, NULL, keyids,
+                                  ctx->import_filter, ctx->key_origin);
+}
+
+
+/* Asynchronous version of gpgme_op_receive_keys.  */
+gpgme_error_t
+gpgme_op_receive_keys_start (gpgme_ctx_t ctx, const char *keyids)
+{
+  gpgme_error_t err;
+
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_receive_keys_start", ctx, "");
+
+  if (!ctx)
+    return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
+  if (_gpgme_debug_trace () && keyids)
+    {
+      int i = 0;
+
+      while (keyidsi && *keyidsi)
+	{
+	  TRACE_LOG  ("keyids%i = %s", i, keyidsi);
+	  i++;
+	}
+    }
+
+  err = _gpgme_op_receive_keys_start (ctx, 1, keyids);
+  return TRACE_ERR (err);
+}
+
+
+/* Retrieve the keys from the array KEYIDS from a keyserver and import
+   them into the keyring.
+
+   KEYIDS is a NULL terminated array of .  The result
+   is the usual import result structure.  */
+gpgme_error_t
+gpgme_op_receive_keys (gpgme_ctx_t ctx, const char *keyids)
+{
+  gpgme_error_t err;
+
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_receive_keys", ctx, "");
+
+  if (!ctx)
+    return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
+  if (_gpgme_debug_trace () && keyids)
+    {
+      int i = 0;
+
+      while (keyidsi && *keyidsi)
+	{
+	  TRACE_LOG  ("keyids%i = %s", i, keyidsi);
+	  i++;
+	}
+    }
+
+  err = _gpgme_op_receive_keys_start (ctx, 1, keyids);
+  if (!err)
+    err = _gpgme_wait_one (ctx);
+  return TRACE_ERR (err);
+}
+
+
 /* Deprecated interface.  */
 gpgme_error_t
 gpgme_op_import_ext (gpgme_ctx_t ctx, gpgme_data_t keydata, int *nr)

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/libgpgme.vers -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/libgpgme.vers Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/posix-io.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/posix-io.c Changed

@@ -570,7 +570,7 @@
               if (fd_listi.fd > fd)
                 fd = fd_listi.fd;
             fd++;
-#if defined(__sun) || defined(__FreeBSD__)
+#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__)
             closefrom (fd);
             max_fds = fd;
 #else /*!__sun */
@@ -691,8 +691,119 @@
 
 /* Select on the list of fds.  Returns: -1 = error, 0 = timeout or
    nothing to select, > 0 = number of signaled fds.  */
-int
-_gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
+#ifdef HAVE_POLL_H
+static int
+_gpgme_io_select_poll (struct io_select_fd_s *fds, size_t nfds, int nonblock)
+{
+  struct pollfd *poll_fds = NULL;
+  nfds_t poll_nfds;
+  /* Use a 1s timeout.  */
+  int timeout = 1000;
+  unsigned int i;
+  int any;
+  int count;
+  void *dbg_help = NULL;
+  TRACE_BEG  (DEBUG_SYSIO, "_gpgme_io_select", NULL,
+	      "nfds=%zu, nonblock=%u", nfds, nonblock);
+
+
+  if (nonblock)
+    timeout = 0;
+
+  poll_fds = malloc (sizeof (*poll_fds)*nfds);
+  if (!poll_fds)
+    return -1;
+
+  poll_nfds = 0;
+
+  TRACE_SEQ (dbg_help, "poll on  ");
+
+  any = 0;
+  for (i = 0; i < nfds; i++)
+    {
+      if (fdsi.fd == -1)
+	continue;
+      if (fdsi.for_read || fdsi.for_write)
+	{
+          poll_fdspoll_nfds.fd = fdsi.fd;
+          poll_fdspoll_nfds.events = 0;
+          poll_fdspoll_nfds.revents = 0;
+          if (fdsi.for_read)
+            {
+              poll_fdspoll_nfds.events |= POLLIN;
+              TRACE_ADD1 (dbg_help, "r=%d ", fdsi.fd);
+            }
+          if (fdsi.for_write)
+            {
+              poll_fdspoll_nfds.events |= POLLOUT;
+              TRACE_ADD1 (dbg_help, "w=%d ", fdsi.fd);
+            }
+          poll_nfds++;
+          any = 1;
+        }
+      fdsi.signaled = 0;
+    }
+  TRACE_END (dbg_help, "");
+  if (!any)
+    {
+      free (poll_fds);
+      return TRACE_SYSRES (0);
+    }
+
+  do
+    count = poll (poll_fds, poll_nfds, timeout);
+  while (count < 0 && (errno == EINTR || errno == EAGAIN));
+  if (count < 0)
+    {
+      int save_errno = errno;
+      free (poll_fds);
+      errno = save_errno;
+      return TRACE_SYSRES (-1);
+    }
+
+  TRACE_SEQ (dbg_help, "poll OK  ");
+  if (TRACE_ENABLED (dbg_help))
+    {
+      poll_nfds = 0;
+      for (i = 0; i < nfds; i++)
+	{
+          if (fdsi.fd == -1)
+            continue;
+	  if ((poll_fdspoll_nfds.revents & (POLLIN|POLLHUP)))
+	    TRACE_ADD1 (dbg_help, "r=%d ", i);
+	  if ((poll_fdspoll_nfds.revents & POLLOUT))
+	    TRACE_ADD1 (dbg_help, "w=%d ", i);
+          poll_nfds++;
+        }
+      TRACE_END (dbg_help, "");
+    }
+
+  poll_nfds = 0;
+  for (i = 0; i < nfds; i++)
+    {
+      if (fdsi.fd == -1)
+	continue;
+      if (fdsi.for_read || fdsi.for_write)
+	{
+          short events_to_be_checked = 0;
+
+          if (fdsi.for_read)
+            events_to_be_checked |= (POLLIN|POLLHUP);
+          if (fdsi.for_write)
+            events_to_be_checked |= POLLOUT;
+          if ((poll_fdspoll_nfds.revents & events_to_be_checked))
+            fdsi.signaled = 1;
+
+          poll_nfds++;
+        }
+    }
+
+  free (poll_fds);
+  return TRACE_SYSRES (count);
+}
+#else
+static int
+_gpgme_io_select_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
 {
   fd_set readfds;
   fd_set writefds;
@@ -802,7 +913,17 @@
     }
   return TRACE_SYSRES (count);
 }
+#endif
 
+int
+_gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
+{
+#ifdef HAVE_POLL_H
+  return _gpgme_io_select_poll (fds, nfds, nonblock);
+#else
+  return _gpgme_io_select_select (fds, nfds, nonblock);
+#endif
+}
 &#xc;
 int
 _gpgme_io_recvmsg (int fd, struct msghdr *msg, int flags)

_service:tar_scm:gpgme-1.16.0.tar.bz2/src/w32-util.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/src/w32-util.c Changed

@@ -841,16 +841,17 @@
 
 
 /* Like CreateProcessA but mapping the arguments to wchar API */
-int _gpgme_create_process_utf8 (const char *application_name_utf8,
-                                char *command_line_utf8,
-                                LPSECURITY_ATTRIBUTES lpProcessAttributes,
-                                LPSECURITY_ATTRIBUTES lpThreadAttributes,
-                                BOOL bInheritHandles,
-                                DWORD dwCreationFlags,
-                                void *lpEnvironment,
-                                char *working_directory_utf8,
-                                LPSTARTUPINFOA si,
-                                LPPROCESS_INFORMATION lpProcessInformation)
+int
+_gpgme_create_process_utf8 (const char *application_name_utf8,
+                            char *command_line_utf8,
+                            LPSECURITY_ATTRIBUTES lpProcessAttributes,
+                            LPSECURITY_ATTRIBUTES lpThreadAttributes,
+                            BOOL bInheritHandles,
+                            DWORD dwCreationFlags,
+                            void *lpEnvironment,
+                            char *working_directory_utf8,
+                            LPSTARTUPINFOA si,
+                            LPPROCESS_INFORMATION lpProcessInformation)
 {
   BOOL ret;
   wchar_t *application_name = utf8_to_wchar0 (application_name_utf8);

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/Makefile.am Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/Makefile.in Changed

@@ -114,7 +114,8 @@
 	run-export$(EXEEXT) run-import$(EXEEXT) run-sign$(EXEEXT) \
 	run-verify$(EXEEXT) run-encrypt$(EXEEXT) run-identify$(EXEEXT) \
 	run-decrypt$(EXEEXT) run-genkey$(EXEEXT) run-keysign$(EXEEXT) \
-	run-tofu$(EXEEXT) run-swdb$(EXEEXT) run-threaded$(EXEEXT)
+	run-tofu$(EXEEXT) run-swdb$(EXEEXT) run-threaded$(EXEEXT) \
+	run-receive-keys$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
@@ -175,6 +176,10 @@
 run_keysign_OBJECTS = run-keysign.$(OBJEXT)
 run_keysign_LDADD = $(LDADD)
 run_keysign_DEPENDENCIES = ../src/libgpgme.la
+run_receive_keys_SOURCES = run-receive-keys.c
+run_receive_keys_OBJECTS = run-receive-keys.$(OBJEXT)
+run_receive_keys_LDADD = $(LDADD)
+run_receive_keys_DEPENDENCIES = ../src/libgpgme.la
 run_sign_SOURCES = run-sign.c
 run_sign_OBJECTS = run-sign.$(OBJEXT)
 run_sign_LDADD = $(LDADD)
@@ -184,7 +189,7 @@
 run_swdb_LDADD = $(LDADD)
 run_swdb_DEPENDENCIES = ../src/libgpgme.la
 run_threaded_SOURCES = run-threaded.c
-run_threaded_OBJECTS = run-threaded.$(OBJEXT)
+run_threaded_OBJECTS = run_threaded-run-threaded.$(OBJEXT)
 run_threaded_DEPENDENCIES = ../src/libgpgme.la
 run_tofu_SOURCES = run-tofu.c
 run_tofu_OBJECTS = run-tofu.$(OBJEXT)
@@ -225,11 +230,11 @@
 	./$(DEPDIR)/run-encrypt.Po ./$(DEPDIR)/run-export.Po \
 	./$(DEPDIR)/run-genkey.Po ./$(DEPDIR)/run-identify.Po \
 	./$(DEPDIR)/run-import.Po ./$(DEPDIR)/run-keylist.Po \
-	./$(DEPDIR)/run-keysign.Po ./$(DEPDIR)/run-sign.Po \
-	./$(DEPDIR)/run-swdb.Po ./$(DEPDIR)/run-threaded.Po \
+	./$(DEPDIR)/run-keysign.Po ./$(DEPDIR)/run-receive-keys.Po \
+	./$(DEPDIR)/run-sign.Po ./$(DEPDIR)/run-swdb.Po \
 	./$(DEPDIR)/run-tofu.Po ./$(DEPDIR)/run-verify.Po \
-	./$(DEPDIR)/t-data.Po ./$(DEPDIR)/t-engine-info.Po \
-	./$(DEPDIR)/t-version.Po
+	./$(DEPDIR)/run_threaded-run-threaded.Po ./$(DEPDIR)/t-data.Po \
+	./$(DEPDIR)/t-engine-info.Po ./$(DEPDIR)/t-version.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -251,12 +256,12 @@
 am__v_CCLD_1 = 
 SOURCES = run-decrypt.c run-encrypt.c run-export.c run-genkey.c \
 	run-identify.c run-import.c run-keylist.c run-keysign.c \
-	run-sign.c run-swdb.c run-threaded.c run-tofu.c run-verify.c \
-	t-data.c t-engine-info.c t-version.c
+	run-receive-keys.c run-sign.c run-swdb.c run-threaded.c \
+	run-tofu.c run-verify.c t-data.c t-engine-info.c t-version.c
 DIST_SOURCES = run-decrypt.c run-encrypt.c run-export.c run-genkey.c \
 	run-identify.c run-import.c run-keylist.c run-keysign.c \
-	run-sign.c run-swdb.c run-threaded.c run-tofu.c run-verify.c \
-	t-data.c t-engine-info.c t-version.c
+	run-receive-keys.c run-sign.c run-swdb.c run-threaded.c \
+	run-tofu.c run-verify.c t-data.c t-engine-info.c t-version.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -552,11 +557,13 @@
 TESTS_ENVIRONMENT = GNUPGHOME=$(GNUPGHOME)
 EXTRA_DIST = start-stop-agent t-data-1.txt t-data-2.txt ChangeLog-2011
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
-AM_LDFLAGS = -no-install
+@HAVE_W32_SYSTEM_FALSE@AM_LDFLAGS = -no-install
+@HAVE_W32_SYSTEM_TRUE@AM_LDFLAGS = -no-fast-install
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
 noinst_HEADERS = run-support.h
-run_threaded_LDADD = ../src/libgpgme.la -lpthread @GPG_ERROR_LIBS@ \
-		     @LDADD_FOR_TESTS_KLUDGE@
+run_threaded_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_MT_CFLAGS@
+run_threaded_LDADD = ../src/libgpgme.la \
+		     @GPG_ERROR_MT_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
 
 @RUN_GPG_TESTS_FALSE@gpgtests = 
 @RUN_GPG_TESTS_TRUE@gpgtests = gpg json
@@ -638,6 +645,10 @@
 	@rm -f run-keysign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_keysign_OBJECTS) $(run_keysign_LDADD) $(LIBS)
 
+run-receive-keys$(EXEEXT): $(run_receive_keys_OBJECTS) $(run_receive_keys_DEPENDENCIES) $(EXTRA_run_receive_keys_DEPENDENCIES) 
+	@rm -f run-receive-keys$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(run_receive_keys_OBJECTS) $(run_receive_keys_LDADD) $(LIBS)
+
 run-sign$(EXEEXT): $(run_sign_OBJECTS) $(run_sign_DEPENDENCIES) $(EXTRA_run_sign_DEPENDENCIES) 
 	@rm -f run-sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_sign_OBJECTS) $(run_sign_LDADD) $(LIBS)
@@ -684,11 +695,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-import.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keylist.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keysign.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-receive-keys.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-sign.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-swdb.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-threaded.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-tofu.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-verify.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run_threaded-run-threaded.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-data.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-engine-info.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-version.Po@am__quote@ # am--include-marker
@@ -720,6 +732,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+run_threaded-run-threaded.o: run-threaded.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_threaded_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT run_threaded-run-threaded.o -MD -MP -MF $(DEPDIR)/run_threaded-run-threaded.Tpo -c -o run_threaded-run-threaded.o `test -f 'run-threaded.c' || echo '$(srcdir)/'`run-threaded.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/run_threaded-run-threaded.Tpo $(DEPDIR)/run_threaded-run-threaded.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-threaded.c' object='run_threaded-run-threaded.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_threaded_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o run_threaded-run-threaded.o `test -f 'run-threaded.c' || echo '$(srcdir)/'`run-threaded.c
+
+run_threaded-run-threaded.obj: run-threaded.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_threaded_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT run_threaded-run-threaded.obj -MD -MP -MF $(DEPDIR)/run_threaded-run-threaded.Tpo -c -o run_threaded-run-threaded.obj `if test -f 'run-threaded.c'; then $(CYGPATH_W) 'run-threaded.c'; else $(CYGPATH_W) '$(srcdir)/run-threaded.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/run_threaded-run-threaded.Tpo $(DEPDIR)/run_threaded-run-threaded.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='run-threaded.c' object='run_threaded-run-threaded.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_threaded_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o run_threaded-run-threaded.obj `if test -f 'run-threaded.c'; then $(CYGPATH_W) 'run-threaded.c'; else $(CYGPATH_W) '$(srcdir)/run-threaded.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1026,11 +1052,12 @@
 	-rm -f ./$(DEPDIR)/run-import.Po
 	-rm -f ./$(DEPDIR)/run-keylist.Po
 	-rm -f ./$(DEPDIR)/run-keysign.Po
+	-rm -f ./$(DEPDIR)/run-receive-keys.Po
 	-rm -f ./$(DEPDIR)/run-sign.Po
 	-rm -f ./$(DEPDIR)/run-swdb.Po
-	-rm -f ./$(DEPDIR)/run-threaded.Po
 	-rm -f ./$(DEPDIR)/run-tofu.Po
 	-rm -f ./$(DEPDIR)/run-verify.Po
+	-rm -f ./$(DEPDIR)/run_threaded-run-threaded.Po
 	-rm -f ./$(DEPDIR)/t-data.Po
 	-rm -f ./$(DEPDIR)/t-engine-info.Po
 	-rm -f ./$(DEPDIR)/t-version.Po
@@ -1087,11 +1114,12 @@
 	-rm -f ./$(DEPDIR)/run-import.Po
 	-rm -f ./$(DEPDIR)/run-keylist.Po
 	-rm -f ./$(DEPDIR)/run-keysign.Po
+	-rm -f ./$(DEPDIR)/run-receive-keys.Po
 	-rm -f ./$(DEPDIR)/run-sign.Po
 	-rm -f ./$(DEPDIR)/run-swdb.Po
-	-rm -f ./$(DEPDIR)/run-threaded.Po
 	-rm -f ./$(DEPDIR)/run-tofu.Po
 	-rm -f ./$(DEPDIR)/run-verify.Po
+	-rm -f ./$(DEPDIR)/run_threaded-run-threaded.Po
 	-rm -f ./$(DEPDIR)/t-data.Po
 	-rm -f ./$(DEPDIR)/t-engine-info.Po
 	-rm -f ./$(DEPDIR)/t-version.Po

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/Makefile.am -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/Makefile.am Changed

@@ -38,8 +38,8 @@
 c_tests = \
         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
-	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait	\
-	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign	\
+	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \
+	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \
 	$(tests_unix)
 
 TESTS = initial.test $(c_tests) final.test
@@ -60,17 +60,26 @@
 EXTRA_DIST = initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	cipher-3.asc cipher-no-sig.asc \
-	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
+	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys) \
+	gpg.conf.in
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            gpg-sample.stamp
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
-t_thread1_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_verify_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_cancel_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
+
+WITH_THREAD_CPPFLAGS =  -I$(top_builddir)/src @GPG_ERROR_MT_CFLAGS@
+WITH_THREAD_LDADD = ../../src/libgpgme.la \
+	@GPG_ERROR_MT_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
+t_thread1_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread1_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_verify_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_verify_LDADD = $(WITH_THREAD_LDADD)
+t_cancel_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_cancel_LDADD = $(WITH_THREAD_LDADD)
 
 # We don't run t-genkey and t-cancel in the test suite, because it
 # takes too long
@@ -101,11 +110,8 @@
 		--import $(srcdir)/secdemo.asc
 	echo x > ./pubring-stamp
 
-gpg.conf:
-# This is required for t-sig-notations.
-	echo no-force-v3-sigs > ./gpg.conf
-# This is required for t-edit-sign.
-	echo allow-weak-key-signatures >> ./gpg.conf
+gpg.conf: $(srcdir)/gpg.conf.in
+	cp $(srcdir)/gpg.conf.in gpg.conf
 
 gpg-agent.conf:
 # This is required for gpg2, which does not support command fd for the

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/Makefile.in -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/Makefile.in Changed

@@ -149,8 +149,9 @@
 am__EXEEXT_4 = t-genkey$(EXEEXT) $(am__EXEEXT_3)
 PROGRAMS = $(noinst_PROGRAMS)
 t_cancel_SOURCES = t-cancel.c
-t_cancel_OBJECTS = t-cancel.$(OBJEXT)
-t_cancel_DEPENDENCIES = ../../src/libgpgme.la
+t_cancel_OBJECTS = t_cancel-t-cancel.$(OBJEXT)
+am__DEPENDENCIES_1 = ../../src/libgpgme.la
+t_cancel_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -240,14 +241,16 @@
 t_signers_LDADD = $(LDADD)
 t_signers_DEPENDENCIES = ../../src/libgpgme.la
 t_thread_keylist_SOURCES = t-thread-keylist.c
-t_thread_keylist_OBJECTS = t-thread-keylist.$(OBJEXT)
-t_thread_keylist_DEPENDENCIES = ../../src/libgpgme.la
+t_thread_keylist_OBJECTS =  \
+	t_thread_keylist-t-thread-keylist.$(OBJEXT)
+t_thread_keylist_DEPENDENCIES = $(am__DEPENDENCIES_1)
 t_thread_keylist_verify_SOURCES = t-thread-keylist-verify.c
-t_thread_keylist_verify_OBJECTS = t-thread-keylist-verify.$(OBJEXT)
-t_thread_keylist_verify_DEPENDENCIES = ../../src/libgpgme.la
+t_thread_keylist_verify_OBJECTS =  \
+	t_thread_keylist_verify-t-thread-keylist-verify.$(OBJEXT)
+t_thread_keylist_verify_DEPENDENCIES = $(am__DEPENDENCIES_1)
 t_thread1_SOURCES = t-thread1.c
-t_thread1_OBJECTS = t-thread1.$(OBJEXT)
-t_thread1_DEPENDENCIES = ../../src/libgpgme.la
+t_thread1_OBJECTS = t_thread1-t-thread1.$(OBJEXT)
+t_thread1_DEPENDENCIES = $(am__DEPENDENCIES_1)
 t_verify_SOURCES = t-verify.c
 t_verify_OBJECTS = t-verify.$(OBJEXT)
 t_verify_LDADD = $(LDADD)
@@ -271,21 +274,22 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/conf
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/t-cancel.Po \
-	./$(DEPDIR)/t-decrypt-verify.Po ./$(DEPDIR)/t-decrypt.Po \
-	./$(DEPDIR)/t-edit-sign.Po ./$(DEPDIR)/t-edit.Po \
-	./$(DEPDIR)/t-encrypt-large.Po ./$(DEPDIR)/t-encrypt-mixed.Po \
-	./$(DEPDIR)/t-encrypt-sign.Po ./$(DEPDIR)/t-encrypt-sym.Po \
-	./$(DEPDIR)/t-encrypt.Po ./$(DEPDIR)/t-eventloop.Po \
-	./$(DEPDIR)/t-export.Po ./$(DEPDIR)/t-file-name.Po \
-	./$(DEPDIR)/t-genkey.Po ./$(DEPDIR)/t-gpgconf.Po \
-	./$(DEPDIR)/t-import.Po ./$(DEPDIR)/t-keylist-secret-sig.Po \
+am__depfiles_remade = ./$(DEPDIR)/t-decrypt-verify.Po \
+	./$(DEPDIR)/t-decrypt.Po ./$(DEPDIR)/t-edit-sign.Po \
+	./$(DEPDIR)/t-edit.Po ./$(DEPDIR)/t-encrypt-large.Po \
+	./$(DEPDIR)/t-encrypt-mixed.Po ./$(DEPDIR)/t-encrypt-sign.Po \
+	./$(DEPDIR)/t-encrypt-sym.Po ./$(DEPDIR)/t-encrypt.Po \
+	./$(DEPDIR)/t-eventloop.Po ./$(DEPDIR)/t-export.Po \
+	./$(DEPDIR)/t-file-name.Po ./$(DEPDIR)/t-genkey.Po \
+	./$(DEPDIR)/t-gpgconf.Po ./$(DEPDIR)/t-import.Po \
+	./$(DEPDIR)/t-keylist-secret-sig.Po \
 	./$(DEPDIR)/t-keylist-sig.Po ./$(DEPDIR)/t-keylist.Po \
 	./$(DEPDIR)/t-sig-notation.Po ./$(DEPDIR)/t-sign.Po \
-	./$(DEPDIR)/t-signers.Po \
-	./$(DEPDIR)/t-thread-keylist-verify.Po \
-	./$(DEPDIR)/t-thread-keylist.Po ./$(DEPDIR)/t-thread1.Po \
-	./$(DEPDIR)/t-verify.Po ./$(DEPDIR)/t-wait.Po
+	./$(DEPDIR)/t-signers.Po ./$(DEPDIR)/t-verify.Po \
+	./$(DEPDIR)/t-wait.Po ./$(DEPDIR)/t_cancel-t-cancel.Po \
+	./$(DEPDIR)/t_thread1-t-thread1.Po \
+	./$(DEPDIR)/t_thread_keylist-t-thread-keylist.Po \
+	./$(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -582,8 +586,8 @@
 c_tests = \
         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
-	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait	\
-	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign	\
+	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \
+	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \
 	$(tests_unix)
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
@@ -601,7 +605,8 @@
 EXTRA_DIST = initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	cipher-3.asc cipher-no-sig.asc \
-	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
+	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys) \
+	gpg.conf.in
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            gpg-sample.stamp
@@ -609,10 +614,18 @@
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la @LDADD_FOR_TESTS_KLUDGE@
-t_thread1_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_thread_keylist_verify_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
-t_cancel_LDADD = ../../src/libgpgme.la -lpthread @LDADD_FOR_TESTS_KLUDGE@
+WITH_THREAD_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_MT_CFLAGS@
+WITH_THREAD_LDADD = ../../src/libgpgme.la \
+	@GPG_ERROR_MT_LIBS@ @LDADD_FOR_TESTS_KLUDGE@
+
+t_thread1_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread1_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_LDADD = $(WITH_THREAD_LDADD)
+t_thread_keylist_verify_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_thread_keylist_verify_LDADD = $(WITH_THREAD_LDADD)
+t_cancel_CPPFLAGS = $(WITH_THREAD_CPPFLAGS)
+t_cancel_LDADD = $(WITH_THREAD_LDADD)
 
 # We don't run t-genkey and t-cancel in the test suite, because it
 # takes too long
@@ -775,7 +788,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-cancel.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-decrypt-verify.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-decrypt.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-edit-sign.Po@am__quote@ # am--include-marker
@@ -797,11 +809,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-sig-notation.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-sign.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-signers.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread-keylist-verify.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread-keylist.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-thread1.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-verify.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-wait.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cancel-t-cancel.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_thread1-t-thread1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_thread_keylist-t-thread-keylist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -830,6 +843,62 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+t_cancel-t-cancel.o: t-cancel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_cancel_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_cancel-t-cancel.o -MD -MP -MF $(DEPDIR)/t_cancel-t-cancel.Tpo -c -o t_cancel-t-cancel.o `test -f 't-cancel.c' || echo '$(srcdir)/'`t-cancel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_cancel-t-cancel.Tpo $(DEPDIR)/t_cancel-t-cancel.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-cancel.c' object='t_cancel-t-cancel.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_cancel_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_cancel-t-cancel.o `test -f 't-cancel.c' || echo '$(srcdir)/'`t-cancel.c
+
+t_cancel-t-cancel.obj: t-cancel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_cancel_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_cancel-t-cancel.obj -MD -MP -MF $(DEPDIR)/t_cancel-t-cancel.Tpo -c -o t_cancel-t-cancel.obj `if test -f 't-cancel.c'; then $(CYGPATH_W) 't-cancel.c'; else $(CYGPATH_W) '$(srcdir)/t-cancel.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_cancel-t-cancel.Tpo $(DEPDIR)/t_cancel-t-cancel.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-cancel.c' object='t_cancel-t-cancel.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_cancel_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_cancel-t-cancel.obj `if test -f 't-cancel.c'; then $(CYGPATH_W) 't-cancel.c'; else $(CYGPATH_W) '$(srcdir)/t-cancel.c'; fi`
+
+t_thread_keylist-t-thread-keylist.o: t-thread-keylist.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread_keylist-t-thread-keylist.o -MD -MP -MF $(DEPDIR)/t_thread_keylist-t-thread-keylist.Tpo -c -o t_thread_keylist-t-thread-keylist.o `test -f 't-thread-keylist.c' || echo '$(srcdir)/'`t-thread-keylist.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread_keylist-t-thread-keylist.Tpo $(DEPDIR)/t_thread_keylist-t-thread-keylist.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread-keylist.c' object='t_thread_keylist-t-thread-keylist.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread_keylist-t-thread-keylist.o `test -f 't-thread-keylist.c' || echo '$(srcdir)/'`t-thread-keylist.c
+
+t_thread_keylist-t-thread-keylist.obj: t-thread-keylist.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread_keylist-t-thread-keylist.obj -MD -MP -MF $(DEPDIR)/t_thread_keylist-t-thread-keylist.Tpo -c -o t_thread_keylist-t-thread-keylist.obj `if test -f 't-thread-keylist.c'; then $(CYGPATH_W) 't-thread-keylist.c'; else $(CYGPATH_W) '$(srcdir)/t-thread-keylist.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread_keylist-t-thread-keylist.Tpo $(DEPDIR)/t_thread_keylist-t-thread-keylist.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread-keylist.c' object='t_thread_keylist-t-thread-keylist.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread_keylist-t-thread-keylist.obj `if test -f 't-thread-keylist.c'; then $(CYGPATH_W) 't-thread-keylist.c'; else $(CYGPATH_W) '$(srcdir)/t-thread-keylist.c'; fi`
+
+t_thread_keylist_verify-t-thread-keylist-verify.o: t-thread-keylist-verify.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_verify_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread_keylist_verify-t-thread-keylist-verify.o -MD -MP -MF $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Tpo -c -o t_thread_keylist_verify-t-thread-keylist-verify.o `test -f 't-thread-keylist-verify.c' || echo '$(srcdir)/'`t-thread-keylist-verify.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Tpo $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread-keylist-verify.c' object='t_thread_keylist_verify-t-thread-keylist-verify.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_verify_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread_keylist_verify-t-thread-keylist-verify.o `test -f 't-thread-keylist-verify.c' || echo '$(srcdir)/'`t-thread-keylist-verify.c
+
+t_thread_keylist_verify-t-thread-keylist-verify.obj: t-thread-keylist-verify.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_verify_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread_keylist_verify-t-thread-keylist-verify.obj -MD -MP -MF $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Tpo -c -o t_thread_keylist_verify-t-thread-keylist-verify.obj `if test -f 't-thread-keylist-verify.c'; then $(CYGPATH_W) 't-thread-keylist-verify.c'; else $(CYGPATH_W) '$(srcdir)/t-thread-keylist-verify.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Tpo $(DEPDIR)/t_thread_keylist_verify-t-thread-keylist-verify.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread-keylist-verify.c' object='t_thread_keylist_verify-t-thread-keylist-verify.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread_keylist_verify_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread_keylist_verify-t-thread-keylist-verify.obj `if test -f 't-thread-keylist-verify.c'; then $(CYGPATH_W) 't-thread-keylist-verify.c'; else $(CYGPATH_W) '$(srcdir)/t-thread-keylist-verify.c'; fi`
+
+t_thread1-t-thread1.o: t-thread1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread1-t-thread1.o -MD -MP -MF $(DEPDIR)/t_thread1-t-thread1.Tpo -c -o t_thread1-t-thread1.o `test -f 't-thread1.c' || echo '$(srcdir)/'`t-thread1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread1-t-thread1.Tpo $(DEPDIR)/t_thread1-t-thread1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread1.c' object='t_thread1-t-thread1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread1-t-thread1.o `test -f 't-thread1.c' || echo '$(srcdir)/'`t-thread1.c
+
+t_thread1-t-thread1.obj: t-thread1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_thread1-t-thread1.obj -MD -MP -MF $(DEPDIR)/t_thread1-t-thread1.Tpo -c -o t_thread1-t-thread1.obj `if test -f 't-thread1.c'; then $(CYGPATH_W) 't-thread1.c'; else $(CYGPATH_W) '$(srcdir)/t-thread1.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_thread1-t-thread1.Tpo $(DEPDIR)/t_thread1-t-thread1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-thread1.c' object='t_thread1-t-thread1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_thread1_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_thread1-t-thread1.obj `if test -f 't-thread1.c'; then $(CYGPATH_W) 't-thread1.c'; else $(CYGPATH_W) '$(srcdir)/t-thread1.c'; fi`
+
 mostlyclean-libtool:

_service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/gpg.conf.in Added

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/t-cancel.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/t-cancel.c Changed

@@ -38,8 +38,16 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <pthread.h>
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#else
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+# else
+#  ifdef HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  endif
+# endif
 #endif
 
 #include <gpgme.h>
@@ -116,6 +124,60 @@
 }
 
 
+#ifdef HAVE_POLL_H
+static int
+do_select (void)
+{
+  struct pollfd poll_fdsFDLIST_MAX;
+  nfds_t poll_nfds;
+  int i, n;
+  int any = 0;
+
+  pthread_mutex_lock (&lock);
+  poll_nfds = 0;
+  for (i = 0; i < FDLIST_MAX; i++)
+    if (fdlisti.fd != -1)
+      {
+        poll_fdspoll_nfds.fd = fdlisti.fd;
+        poll_fdspoll_nfds.events = 0;
+        poll_fdspoll_nfds.revents = 0;
+        if (fdlisti.dir)
+          poll_fdspoll_nfds.events |= POLLIN;
+        else
+          poll_fdspoll_nfds.events |= POLLOUT;
+        poll_nfds++;
+      }
+  pthread_mutex_unlock (&lock);
+
+  do
+    {
+      n = poll (poll_fds, poll_nfds, 1000);
+    }
+  while (n < 0 && (errno == EINTR || errno == EAGAIN));
+
+  if (n < 0)
+    return n;	/* Error or timeout.  */
+
+  pthread_mutex_lock (&lock);
+  poll_nfds = 0;
+  for (i = 0; i < FDLIST_MAX && n; i++)
+    {
+      if (fdlisti.fd != -1)
+	{
+	  if ((poll_fdspoll_nfds++.revents
+               & (fdlisti.dir ? (POLLIN|POLLHUP) : POLLOUT)))
+	    {
+	      assert (n);
+	      n--;
+	      any = 1;
+	      (*fdlisti.fnc) (fdlisti.fnc_data, fdlisti.fd);
+	    }
+	}
+    }
+  pthread_mutex_unlock (&lock);
+  return any;
+}
+#else
 static int
 do_select (void)
 {
@@ -162,6 +224,7 @@
   pthread_mutex_unlock (&lock);
   return any;
 }
+#endif
 
 static int
 my_wait (void)

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/t-edit-sign.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/t-edit-sign.c Changed

@@ -107,31 +107,19 @@
 }
 
 
-int
-main (int argc, char **argv)
+void
+sign_key (const char *key_fpr, const char *signer_fpr)
 {
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t out = NULL;
-  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
   gpgme_key_t signing_key = NULL;
-  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
   gpgme_key_t key = NULL;
-  gpgme_key_t signed_key = NULL;
-  gpgme_user_id_t signed_uid = NULL;
-  gpgme_key_sig_t key_sig = NULL;
   char *agent_info;
-  int mode;
-
-  (void)argc;
-  (void)argv;
-
-  init_gpgme (GPGME_PROTOCOL_OpenPGP);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
 
-  /* Sign the key */
   agent_info = getenv("GPG_AGENT_INFO");
   if (!(agent_info && strchr (agent_info, ':')))
     gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
@@ -159,8 +147,23 @@
   gpgme_data_release (out);
   gpgme_key_unref (key);
   gpgme_key_unref (signing_key);
+  gpgme_release (ctx);
+}
+
+
+void
+verify_key_signature (const char *key_fpr, const char *signer_keyid)
+{
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_key_t signed_key = NULL;
+  gpgme_user_id_t signed_uid = NULL;
+  gpgme_key_sig_t key_sig = NULL;
+  int mode;
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
 
-  /* Verify the key signature */
   mode  = gpgme_get_keylist_mode (ctx);
   mode |= GPGME_KEYLIST_MODE_SIGS;
   err = gpgme_set_keylist_mode (ctx, mode);
@@ -168,7 +171,7 @@
   err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
   fail_if_err (err);
 
-  signed_uid = key->uids;
+  signed_uid = signed_key->uids;
   if (!signed_uid)
     {
       fprintf (stderr, "Signed key has no user IDs\n");
@@ -180,7 +183,7 @@
       exit (1);
     }
   key_sig = signed_uid->signatures->next;
-  if (strcmp ("2D727CC768697734", key_sig->keyid))
+  if (strcmp (signer_keyid, key_sig->keyid))
     {
       fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
                 key_sig->keyid);
@@ -196,6 +199,23 @@
 
   gpgme_key_unref (signed_key);
   gpgme_release (ctx);
+}
+
+
+int
+main (int argc, char **argv)
+{
+  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
+  const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
+  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
+
+  (void)argc;
+  (void)argv;
+
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
+  sign_key (key_fpr, signer_fpr);
+  verify_key_signature (key_fpr, signer_keyid);
 
   return 0;
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/t-eventloop.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/t-eventloop.c Changed

@@ -31,7 +31,17 @@
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/select.h>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#else
+# ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+# else
+#  ifdef HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  endif
+# endif
+#endif
 
 #include <gpgme.h>
 
@@ -104,6 +114,56 @@
 }
 
 
+#ifdef HAVE_POLL_H
+int
+do_select (void)
+{
+  struct pollfd poll_fdsFDLIST_MAX;
+  nfds_t poll_nfds;
+  int i, n;
+  int any = 0;
+
+  poll_nfds = 0;
+  for (i = 0; i < FDLIST_MAX; i++)
+    if (fdlisti.fd != -1)
+      {
+        poll_fdspoll_nfds.fd = fdlisti.fd;
+        poll_fdspoll_nfds.events = 0;
+        poll_fdspoll_nfds.revents = 0;
+        if (fdlisti.dir)
+          poll_fdspoll_nfds.events |= POLLIN;
+        else
+          poll_fdspoll_nfds.events |= POLLOUT;
+        poll_nfds++;
+      }
+
+  do
+    {
+      n = poll (poll_fds, poll_nfds, 1000);
+    }
+  while (n < 0 && (errno == EINTR || errno == EAGAIN));
+
+  if (n < 0)
+    return n;	/* Error or timeout.  */
+
+  poll_nfds = 0;
+  for (i = 0; i < FDLIST_MAX && n; i++)
+    {
+      if (fdlisti.fd != -1)
+	{
+	  if ((poll_fdspoll_nfds++.revents
+               & (fdlisti.dir ? (POLLIN|POLLHUP) : POLLOUT)))
+	    {
+	      assert (n);
+	      n--;
+	      any = 1;
+	      (*fdlisti.fnc) (fdlisti.fnc_data, fdlisti.fd);
+	    }
+	}
+    }
+  return any;
+}
+#else
 int
 do_select (void)
 {
@@ -146,6 +206,7 @@
     }
   return any;
 }
+#endif
 
 int
 my_wait (void)

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/gpg/t-import.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/gpg/t-import.c Changed

@@ -149,16 +149,17 @@
 	  exit (1);
 	}
     }
-  if (strcmp (fpr, result->imports->fpr))
+  if (!result->imports->fpr || strcmp (fpr, result->imports->fpr))
     {
       fprintf (stderr, "Unexpected fingerprint %s\n",
-	       result->imports->fpr);
+	       result->imports->fpr ? result->imports->fpr : "null");
       exit (1);
     }
-  if (result->imports->next && strcmp (fpr, result->imports->next->fpr))
+  if (result->imports->next
+  && (!result->imports->next->fpr || strcmp (fpr, result->imports->next->fpr)))
     {
       fprintf (stderr, "Unexpected fingerprint on second status %s\n",
-	       result->imports->next->fpr);
+	       result->imports->next->fpr ? result->imports->next->fpr : "null");
       exit (1);
     }
   if (result->imports->result != 0)
@@ -214,6 +215,7 @@
   gpgme_error_t err;
   gpgme_data_t in;
   gpgme_import_result_t result;
+  gpgme_key_t key;
   char *pubkey_1_asc = make_filename ("pubkey-1.asc");
   char *seckey_1_asc = make_filename ("seckey-1.asc");
 
@@ -225,6 +227,9 @@
   err = gpgme_new (&ctx);
   fail_if_err (err);
 
+  err = gpgme_set_ctx_flag (ctx, "key-origin", "wkd,https://openpgpkey.gnupg.org");
+  fail_if_err (err);
+
   err = gpgme_data_new_from_file (&in, pubkey_1_asc, 1);
   free (pubkey_1_asc);
   fail_if_err (err);
@@ -246,5 +251,24 @@
   gpgme_data_release (in);
 
   gpgme_release (ctx);
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+
+  err = gpgme_get_key (ctx, "0xADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", &key, 0);
+  fail_if_err (err);
+
+  if (!key)
+    {
+      fprintf (stderr, "Imported key not found\n");
+      exit (1);
+    }
+  if (key->origin != GPGME_KEYORG_WKD)
+    {
+      fprintf (stderr, "Key has unexpected origin: %d\n", key->origin);
+      exit (1);
+    }
+
+
   return 0;
 }

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/run-export.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-export.c Changed

@@ -59,6 +59,7 @@
          "  --ssh            export as ssh public key\n"
          "  --extern         send keys to the keyserver (TAKE CARE!)\n"
          "  --secret         export secret keys instead of public keys\n"
+         "  --secret-subkey  export secret subkeys instead of public keys\n"
          "  --raw            use PKCS#1 as secret key format\n"
          "  --pkcs12         use PKCS#12 as secret key format\n"
          , stderr);
@@ -128,6 +129,11 @@
           mode |= GPGME_EXPORT_MODE_SECRET;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--secret-subkey"))
+        {
+          mode |= GPGME_EXPORT_MODE_SECRET_SUBKEY;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--raw"))
         {
           mode |= GPGME_EXPORT_MODE_RAW;
@@ -168,6 +174,16 @@
       err = gpgme_op_export_ext (ctx, (const char**)argv, mode, out);
       fail_if_err (err);
     }
+  else if ((mode & GPGME_EXPORT_MODE_SECRET_SUBKEY))
+    {
+      keyarray0 = NULL;
+
+      printf ("exporting secret subkeys!\n");
+
+      gpgme_set_armor (ctx, 1);
+      err = gpgme_op_export_ext (ctx, (const char**)argv, mode, out);
+      fail_if_err (err);
+    }
   else
     {
       /* Lookup the keys as required by the export_keys function.  */

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/run-genkey.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-genkey.c Changed

@@ -131,15 +131,23 @@
 
 
 static unsigned long
-parse_expire_string (const char *string)
+parse_expire_string (const char *string, unsigned int *flags)
 {
-  unsigned long seconds;
+  unsigned long seconds = 0;
 
-  if (!string || !*string || !strcmp (string, "none")
-      || !strcmp (string, "never") || !strcmp (string, "-"))
-    seconds = 0;
+  if (!string || !*string || !strcmp (string, "-"))
+    ;
+  else if (!strcmp (string, "none") || !strcmp (string, "never"))
+    {
+      if (flags)
+        *flags |= GPGME_CREATE_NOEXPIRE;
+    }
   else if (strspn (string, "01234567890") == strlen (string))
-    seconds = strtoul (string, NULL, 10);
+    {
+      seconds = strtoul (string, NULL, 10);
+      if (!seconds && flags)
+        *flags |= GPGME_CREATE_NOEXPIRE;
+    }
   else
     {
       fprintf (stderr, PGM ": invalid value '%s'\n", string);
@@ -370,7 +378,7 @@
         }
       userid = argv0;
       argc--; argv++;
-      expire = parse_expire_string (argv0);
+      expire = parse_expire_string (argv0, NULL);
       argc--; argv++;
       if (argc > 1)
         {
@@ -414,7 +422,7 @@
       if (argc > 2)
         flags |= parse_usage_string (argv2);
       if (argc > 3)
-        expire = parse_expire_string (argv3);
+        expire = parse_expire_string (argv3, &flags);
     }
 
   init_gpgme (protocol);

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/run-import.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-import.c Changed

@@ -46,6 +46,7 @@
          "  --verbose        run in verbose mode\n"
          "  --openpgp        use the OpenPGP protocol (default)\n"
          "  --cms            use the CMS protocol\n"
+         "  --key-origin     use the specified key origin\n"
          "  --url            import from given URLs\n"
          "  -0               URLs are delimited by a nul\n"
          , stderr);
@@ -63,6 +64,8 @@
   gpgme_import_result_t impres;
   gpgme_data_t data;
   gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
+  char *import_filter = NULL;
+  char *key_origin = NULL;
 
   if (argc)
     { argc--; argv++; }
@@ -101,6 +104,22 @@
           protocol = GPGME_PROTOCOL_CMS;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--import-filter"))
+        {
+          argc--; argv++;
+          if (!argc)
+            show_usage (1);
+          import_filter = strdup (*argv);
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--key-origin"))
+        {
+          argc--; argv++;
+          if (!argc)
+            show_usage (1);
+          key_origin = strdup (*argv);
+          argc--; argv++;
+        }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
 
@@ -115,6 +134,17 @@
   fail_if_err (err);
   gpgme_set_protocol (ctx, protocol);
 
+  if (import_filter)
+    {
+      err = gpgme_set_ctx_flag (ctx, "import-filter", import_filter);
+      fail_if_err (err);
+    }
+  if (key_origin)
+    {
+      err = gpgme_set_ctx_flag (ctx, "key-origin", key_origin);
+      fail_if_err (err);
+    }
+
   for (; argc; argc--, argv++)
     {
       printf ("reading file `%s'\n", *argv);

_service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-receive-keys.c Added

@@ -0,0 +1,129 @@
+/* run-keylist.c  - Helper to show a key listing.
+ * Copyright (C) 2008, 2009 g10 Code GmbH
+ *
+ * This file is part of GPGME.
+ *
+ * GPGME is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * GPGME is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <https://gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+/* We need to include config.h so that we know whether we are building
+   with large file system (LFS) support. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include <gpgme.h>
+
+#define PGM "run-receive-keys"
+
+#include "run-support.h"
+
+
+static int verbose;
+
+
+static int
+show_usage (int ex)
+{
+  fputs ("usage: " PGM " options KEYIDs_or_FINGERPRINTs\n\n"
+         "Options:\n"
+         "  --verbose        run in verbose mode\n"
+         , stderr);
+  exit (ex);
+}
+
+
+int
+main (int argc, char **argv)
+{
+  int last_argc = -1;
+  gpgme_error_t err;
+  gpgme_ctx_t ctx;
+  const char *keyids100;
+  const char **keyid = NULL;
+  gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
+  gpgme_import_result_t impres;
+
+
+  if (argc)
+    { argc--; argv++; }
+
+  while (argc && last_argc != argc)
+    {
+      last_argc = argc;
+      if (!strcmp (*argv, "--"))
+        {
+          argc--; argv++;
+          break;
+        }
+      else if (!strcmp (*argv, "--help"))
+        show_usage (0);
+      else if (!strcmp (*argv, "--verbose"))
+        {
+          verbose = 1;
+          argc--; argv++;
+        }
+      else if (!strncmp (*argv, "--", 2))
+        show_usage (1);
+    }
+
+  if (!argc)
+    show_usage (1);
+  if (argc > 99) {
+    argc = 99;
+  }
+  for (keyid = keyids; argc; argc--, argv++, keyid++) {
+    *keyid = *argv;
+  }
+  *keyid = NULL;
+
+  init_gpgme (protocol);
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_protocol (ctx, protocol);
+
+  err = gpgme_op_receive_keys (ctx, keyids);
+  fail_if_err (err);
+  impres = gpgme_op_import_result (ctx);
+  if (!impres)
+    {
+      fprintf (stderr, PGM ": no import result returned\n");
+      exit (1);
+    }
+  print_import_result (impres);
+
+  if (verbose)
+    {
+      gpgme_data_t log;
+      char *buf;
+      size_t len;
+
+      gpgme_data_new (&log);
+      err = gpgme_op_getauditlog (ctx, log, GPGME_AUDITLOG_DIAG);
+      fail_if_err (err);
+      buf = gpgme_data_release_and_get_mem (log, &len);
+      printf ("\nDiagnostic output:\n%.*s\n", (int)len, buf);
+      free (buf);
+    }
+
+  gpgme_release (ctx);
+  return 0;
+}

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/run-swdb.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-swdb.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/run-threaded.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/run-threaded.c Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/start-stop-agent -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/start-stop-agent Changed

_service:tar_scm:gpgme-1.16.0.tar.bz2/tests/t-engine-info.c -> _service:tar_scm:gpgme-1.17.0.tar.bz2/tests/t-engine-info.c Changed