diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/context.h | 6 | ||||
| -rw-r--r-- | src/engine-gpg.c | 22 | ||||
| -rw-r--r-- | src/gpgme.c | 16 |
3 files changed, 44 insertions, 0 deletions
diff --git a/src/context.h b/src/context.h index 93c4c2cc..25dfc792 100644 --- a/src/context.h +++ b/src/context.h @@ -118,6 +118,12 @@ struct gpgme_context * flag is cleared with each operation. */ unsigned int redraw_suggested : 1; + /* True if the option --include-key-block shall be passed to gpg. */ + unsigned int include_key_block : 1; + + /* True if the option --auto-key-import shall be passed to gpg. */ + unsigned int auto_key_import : 1; + /* True if the option --auto-key-retrieve shall be passed to gpg. */ unsigned int auto_key_retrieve : 1; diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 223404ed..c9928ed9 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -148,6 +148,8 @@ struct engine_gpg unsigned int no_symkey_cache : 1; unsigned int offline : 1; unsigned int ignore_mdc_error : 1; + unsigned int include_key_block : 1; + unsigned int auto_key_import : 1; } flags; /* NULL or the data object fed to --override_session_key-fd. */ @@ -686,6 +688,13 @@ gpg_set_engine_flags (void *engine, const gpgme_ctx_t ctx) gpg->flags.ignore_mdc_error = !!ctx->ignore_mdc_error; + if (have_gpg_version (gpg, "2.2.20")) + { + if (ctx->auto_key_import) + gpg->flags.auto_key_import = 1; + if (ctx->include_key_block) + gpg->flags.include_key_block = 1; + } } @@ -1703,6 +1712,9 @@ gpg_decrypt (void *engine, if (!err && auto_key_retrieve) err = add_arg (gpg, "--auto-key-retrieve"); + if (!err && gpg->flags.auto_key_import) + err = add_arg (gpg, "--auto-key-import"); + if (!err && override_session_key && *override_session_key) { if (have_gpg_version (gpg, "2.1.16")) @@ -2176,6 +2188,9 @@ gpg_encrypt (void *engine, gpgme_key_t recp[], const char *recpstring, && have_gpg_version (gpg, "2.1.14")) err = add_arg (gpg, "--mimemode"); + if (!err && gpg->flags.include_key_block) + err = add_arg (gpg, "--include-key-block"); + if (recp || recpstring) { /* If we know that all recipients are valid (full or ultimate trust) @@ -2251,6 +2266,9 @@ gpg_encrypt_sign (void *engine, gpgme_key_t recp[], && have_gpg_version (gpg, "2.1.14")) err = add_arg (gpg, "--mimemode"); + if (!err && gpg->flags.include_key_block) + err = add_arg (gpg, "--include-key-block"); + if (recp || recpstring) { /* If we know that all recipients are valid (full or ultimate trust) @@ -3243,6 +3261,8 @@ gpg_sign (void *engine, gpgme_data_t in, gpgme_data_t out, } } + if (!err && gpg->flags.include_key_block) + err = add_arg (gpg, "--include-key-block"); if (!err) err = append_args_from_signers (gpg, ctx); if (!err) @@ -3305,6 +3325,8 @@ gpg_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text, gpgme_error_t err; err = append_args_from_sender (gpg, ctx); + if (!err && gpg->flags.auto_key_import) + err = add_arg (gpg, "--auto-key-import"); if (!err && ctx->auto_key_retrieve) err = add_arg (gpg, "--auto-key-retrieve"); diff --git a/src/gpgme.c b/src/gpgme.c index 8f4d5f3e..8bc11d51 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -533,6 +533,14 @@ gpgme_set_ctx_flag (gpgme_ctx_t ctx, const char *name, const char *value) if (!ctx->override_session_key) err = gpg_error_from_syserror (); } + else if (!strcmp (name, "include-key-block")) + { + ctx->include_key_block = abool; + } + else if (!strcmp (name, "auto-key-import")) + { + ctx->auto_key_import = abool; + } else if (!strcmp (name, "auto-key-retrieve")) { ctx->auto_key_retrieve = abool; @@ -607,6 +615,14 @@ gpgme_get_ctx_flag (gpgme_ctx_t ctx, const char *name) { return ctx->override_session_key? ctx->override_session_key : ""; } + else if (!strcmp (name, "include-key-block")) + { + return ctx->include_key_block? "1":""; + } + else if (!strcmp (name, "auto-key-import")) + { + return ctx->auto_key_import? "1":""; + } else if (!strcmp (name, "auto-key-retrieve")) { return ctx->auto_key_retrieve? "1":""; |