From 3b9815bd8ad723445128ae99883be0072ae389a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
Date: Wed, 12 Jun 2024 10:45:11 +0200
Subject: core: Allow setting import options when importing keys

* src/context.h (struct gpgme_context): New field import_options.
* src/engine-backend.h (struct engine_ops): Add arg import_options to
field 'import'.
* src/engine-gpg.c (gpg_import): Add arg import_options and pass option
--import-options with argument value to gpg.
* src/engine-gpgsm.c (gpgsm_import): Add dummy arg import_options.
* src/engine.c (_gpgme_engine_op_import): Add arg import_options and
pass option to import function of engine.
* src/engine.h (_gpgme_engine_op_import): Add arg import_options.
* src/gpgme.c (gpgme_release): Free 'import_options'.
(gpgme_set_ctx_flag, gpgme_get_ctx_flag): New flag "import-options".
* src/import.c (_gpgme_op_import_start, _gpgme_op_import_keys_start,
_gpgme_op_receive_keys_start): Pass import options stored in context to
_gpgme_engine_op_import.

* tests/run-import.c (show_usage, main): Add option --import-options.
--

This makes the --import-options option available in the GPGME API for
key imports.

GnuPG-bug-id: 7152
---
 src/engine-gpg.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/engine-gpg.c')

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index fd7064b5..376dad0a 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -3075,7 +3075,7 @@ string_from_data (gpgme_data_t data, int delim,
 static gpgme_error_t
 gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
             const char *keyids[], const char *import_filter,
-            const char *key_origin)
+            const char *import_options, const char *key_origin)
 {
   engine_gpg_t gpg = engine;
   gpgme_error_t err;
@@ -3090,6 +3090,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
   if (keyids)
     {
       err = add_arg (gpg, "--recv-keys");
+      if (!err && import_options)
+        {
+          err = add_arg (gpg, "--import-options");
+          if (!err)
+            err = add_arg (gpg, import_options);
+        }
       if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
         {
           err = add_arg (gpg, "--import-filter");
@@ -3104,6 +3110,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
   else if (keyarray)
     {
       err = add_arg (gpg, "--recv-keys");
+      if (!err && import_options)
+        {
+          err = add_arg (gpg, "--import-options");
+          if (!err)
+            err = add_arg (gpg, import_options);
+        }
       if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
         {
           err = add_arg (gpg, "--import-filter");
@@ -3141,6 +3153,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
          should use an option to gpg to modify such commands (ala
          --multifile).  */
       err = add_arg (gpg, "--fetch-keys");
+      if (!err && import_options)
+        {
+          err = add_arg (gpg, "--import-options");
+          if (!err)
+            err = add_arg (gpg, import_options);
+        }
       if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
         {
           err = add_arg (gpg, "--import-filter");
@@ -3165,6 +3183,12 @@ gpg_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray,
   else
     {
       err = add_arg (gpg, "--import");
+      if (!err && import_options)
+        {
+          err = add_arg (gpg, "--import-options");
+          if (!err)
+            err = add_arg (gpg, import_options);
+        }
       if (!err && import_filter && have_gpg_version (gpg, "2.1.14"))
         {
           err = add_arg (gpg, "--import-filter");
-- 
cgit v1.2.3