From 9e1e6554834d0e803dd0889deaef4f11047c7e47 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 20 Mar 2018 10:34:56 +0100 Subject: [PATCH] core: Fix ABI regression in recent commit. * src/gpgme.h.in (_gpgme_op_import_result): Move new field 'skipped_v3_keys' to the end. -- The ABI break has not made it into a release. Also document the new field. Fixes-commit: a630a1e3e74c926163864b013cb164b4cd1866fc Signed-off-by: Werner Koch --- doc/gpgme.texi | 6 ++++++ src/gpgme.h.in | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/gpgme.texi b/doc/gpgme.texi index cd7bb4ba..37cf16ac 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -4811,6 +4811,12 @@ The number of keys not imported. @item gpgme_import_status_t imports A list of gpgme_import_status_t objects which contain more information about the keys for which an import was attempted. + +@item int skipped_v3_keys +For security reasons modern versions of GnuPG do not anymore support +v3 keys (created with PGP 2.x) and ignores them on import. This +counter provides the number of such skipped v3 keys. + @end table @end deftp diff --git a/src/gpgme.h.in b/src/gpgme.h.in index 73f2c94c..e3198798 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -1637,11 +1637,11 @@ struct _gpgme_op_import_result /* Number of keys not imported. */ int not_imported; - /* Number of v3 keys skipped. */ - int skipped_v3_keys; - /* List of keys for which an import was attempted. */ gpgme_import_status_t imports; + + /* Number of v3 keys skipped. */ + int skipped_v3_keys; }; typedef struct _gpgme_op_import_result *gpgme_import_result_t;