diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/encrypt-sign.c | 26 | ||||
| -rw-r--r-- | src/engine-gpg.c | 20 |
2 files changed, 37 insertions, 9 deletions
diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c index cb0ea619..4f484e90 100644 --- a/src/encrypt-sign.c +++ b/src/encrypt-sign.c @@ -47,19 +47,38 @@ encrypt_sign_status_handler (void *priv, gpgme_status_code_t code, char *args) static gpgme_error_t +encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args) +{ + gpgme_error_t err; + + err = _gpgme_progress_status_handler (priv, code, args); + if (!err) + err = _gpgme_sign_status_handler (priv, code, args); + if (!err) + err = _gpgme_passphrase_status_handler (priv, code, args); + return err; +} + + +static gpgme_error_t encrypt_sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_key_t recp[], gpgme_encrypt_flags_t flags, gpgme_data_t plain, gpgme_data_t cipher) { gpgme_error_t err; + int symmetric; err = _gpgme_op_reset (ctx, synchronous); if (err) return err; + symmetric = !recp; + if (!plain) return gpg_error (GPG_ERR_NO_DATA); - if (!cipher || !recp) + if (!cipher) + return gpg_error (GPG_ERR_INV_VALUE); + if (recp && !*recp) return gpg_error (GPG_ERR_INV_VALUE); err = _gpgme_op_encrypt_init_result (ctx); @@ -79,7 +98,10 @@ encrypt_sign_start (gpgme_ctx_t ctx, int synchronous, gpgme_key_t recp[], } _gpgme_engine_set_status_handler (ctx->engine, - encrypt_sign_status_handler, ctx); + symmetric + ? encrypt_sym_status_handler + : encrypt_sign_status_handler, + ctx); return _gpgme_engine_op_encrypt_sign (ctx->engine, recp, flags, plain, cipher, ctx->use_armor, diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 3f025030..65012fab 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -1700,23 +1700,29 @@ gpg_encrypt_sign (void *engine, gpgme_key_t recp[], { engine_gpg_t gpg = engine; gpgme_error_t err; + int symmetric = !recp; + + err = add_arg (gpg, symmetric ? "--symmetric" : "--encrypt"); - err = add_arg (gpg, "--encrypt"); if (!err) err = add_arg (gpg, "--sign"); if (!err && use_armor) err = add_arg (gpg, "--armor"); - /* If we know that all recipients are valid (full or ultimate trust) - we can suppress further checks. */ - if (!err && (flags & GPGME_ENCRYPT_ALWAYS_TRUST)) - err = add_arg (gpg, "--always-trust"); + if (!symmetric) + { + /* If we know that all recipients are valid (full or ultimate trust) + we can suppress further checks. */ + if (!err && (flags & GPGME_ENCRYPT_ALWAYS_TRUST)) + err = add_arg (gpg, "--always-trust"); - if (!err) - err = append_args_from_recipients (gpg, recp); + if (!err) + err = append_args_from_recipients (gpg, recp); + } if (!err) err = append_args_from_signers (gpg, ctx); + if (!err) err = append_args_from_sig_notations (gpg, ctx); |