a1f76b3b54
* src/gpgme.h.in (gpgme_op_encrypt_ext_start) New. (gpgme_op_encrypt_ext): New. (gpgme_op_encrypt_sign_ext_start): New. (gpgme_op_encrypt_sign_ext): New. * src/libgpgme.vers, tests/run-encrypt.c: Add them. * src/encrypt.c (encrypt_start): Add arg recpstring. (gpgme_op_encrypt): Factor code out to ... (gpgme_op_encrypt_ext): new function with new arg recpstring. (gpgme_op_encrypt_start): Factor code out to ... (gpgme_op_encrypt_ext_start): new function with new arg recpstring. * src/encrypt-sign.c (encrypt_sign_start): Add arg recpstring. (gpgme_op_encrypt_sign): Factor code out to ... (gpgme_op_encrypt_sign_ext): new function with new arg recpstring. (gpgme_op_encrypt_sign_start): Factor code out to ... (gpgme_op_encrypt_sign_ext_start): new function with new arg recpstring. * src/engine-backend.h (struct engine_ops): Change fields encrypt and encrypt_sign. * src/engine.c (_gpgme_engine_op_encrypt): Add arg recpstring and pass to engine. (_gpgme_engine_op_encrypt_sign): Ditto. * src/engine-gpg.c (append_args_from_recipients_string): New. (gpg_encrypt): Add arg recpstring and call new function as needed. (gpg_encrypt_sign): Ditto. * src/engine-gpgsm.c (set_recipients_from_string): New. (gpgsm_encrypt): Add arg recpstring and call new function as needed. * src/engine-uiserver.c (set_recipients_from_string): New. (uiserver_encrypt): Add arg recpstring and call new function as needed. * tests/run-encrypt.c (xstrdup): New. (main): Add option --keystring. * src/gpgme-json.c (get_keys): Simplify. (op_encrypt): Modify to make use of the extended encrypt function. -- This new feature can be used to avoid the need for a key lookup and thus several extra calls to the backend. Note that run-test uses a semicolon as delimiter because that make testing the feature on the command line much easier. Signed-off-by: Werner Koch <wk@gnupg.org>
219 lines
6.1 KiB
C
219 lines
6.1 KiB
C
/* encrypt-sign.c - encrypt and verify functions
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003, 2004 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, write to the Free Software
|
||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||
02111-1307, USA. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <errno.h>
|
||
|
||
#include "gpgme.h"
|
||
#include "debug.h"
|
||
#include "context.h"
|
||
#include "ops.h"
|
||
|
||
|
||
static gpgme_error_t
|
||
encrypt_sign_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_encrypt_status_handler (priv, code, args);
|
||
if (!err)
|
||
err = _gpgme_sign_status_handler (priv, code, args);
|
||
return err;
|
||
}
|
||
|
||
|
||
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[],
|
||
const char *recpstring,
|
||
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 && !recpstring) || (flags & GPGME_ENCRYPT_SYMMETRIC);
|
||
|
||
if (!plain)
|
||
return gpg_error (GPG_ERR_NO_DATA);
|
||
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);
|
||
if (err)
|
||
return err;
|
||
|
||
err = _gpgme_op_sign_init_result (ctx);
|
||
if (err)
|
||
return err;
|
||
|
||
if (ctx->passphrase_cb)
|
||
{
|
||
err = _gpgme_engine_set_command_handler
|
||
(ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL);
|
||
if (err)
|
||
return err;
|
||
}
|
||
|
||
_gpgme_engine_set_status_handler (ctx->engine,
|
||
symmetric
|
||
? encrypt_sym_status_handler
|
||
: encrypt_sign_status_handler,
|
||
ctx);
|
||
|
||
return _gpgme_engine_op_encrypt_sign (ctx->engine, recp, recpstring,
|
||
flags, plain,
|
||
cipher, ctx->use_armor,
|
||
ctx /* FIXME */);
|
||
}
|
||
|
||
|
||
/* Old version of gpgme_op_encrypt_sign_ext_start w/o RECPSTRING. */
|
||
gpgme_error_t
|
||
gpgme_op_encrypt_sign_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
|
||
gpgme_encrypt_flags_t flags,
|
||
gpgme_data_t plain, gpgme_data_t cipher)
|
||
{
|
||
return gpgme_op_encrypt_sign_ext_start (ctx, recp, NULL,
|
||
flags, plain, cipher);
|
||
}
|
||
|
||
|
||
/* Old version of gpgme_op_encrypt_sign_ext w/o RECPSTRING. */
|
||
gpgme_error_t
|
||
gpgme_op_encrypt_sign (gpgme_ctx_t ctx, gpgme_key_t recp[],
|
||
gpgme_encrypt_flags_t flags,
|
||
gpgme_data_t plain, gpgme_data_t cipher)
|
||
{
|
||
return gpgme_op_encrypt_sign_ext (ctx, recp, NULL, flags, plain, cipher);
|
||
}
|
||
|
||
|
||
/* Encrypt plaintext PLAIN within CTX for the recipients RECP and
|
||
* store the resulting ciphertext in CIPHER. Also sign the ciphertext
|
||
* with the signers in CTX. */
|
||
gpgme_error_t
|
||
gpgme_op_encrypt_sign_ext (gpgme_ctx_t ctx, gpgme_key_t recp[],
|
||
const char *recpstring,
|
||
gpgme_encrypt_flags_t flags,
|
||
gpgme_data_t plain, gpgme_data_t cipher)
|
||
{
|
||
gpgme_error_t err;
|
||
|
||
TRACE_BEG3 (DEBUG_CTX, "gpgme_op_encrypt_sign", ctx,
|
||
"flags=0x%x, plain=%p, cipher=%p", flags, plain, cipher);
|
||
|
||
if (!ctx)
|
||
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
|
||
|
||
if (_gpgme_debug_trace () && (recp || recpstring))
|
||
{
|
||
if (recp)
|
||
{
|
||
int i = 0;
|
||
|
||
while (recp[i])
|
||
{
|
||
TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
|
||
(recp[i]->subkeys && recp[i]->subkeys->fpr) ?
|
||
recp[i]->subkeys->fpr : "invalid");
|
||
i++;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
TRACE_LOG1 ("recipients = '%s'", recpstring);
|
||
}
|
||
}
|
||
|
||
err = encrypt_sign_start (ctx, 1, recp, recpstring, flags, plain, cipher);
|
||
if (!err)
|
||
err = _gpgme_wait_one (ctx);
|
||
return TRACE_ERR (err);
|
||
}
|
||
|
||
|
||
/* Encrypt plaintext PLAIN within CTX for the recipients RECP and
|
||
store the resulting ciphertext in CIPHER. Also sign the ciphertext
|
||
with the signers in CTX. */
|
||
gpgme_error_t
|
||
gpgme_op_encrypt_sign_ext_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
|
||
const char *recpstring,
|
||
gpgme_encrypt_flags_t flags,
|
||
gpgme_data_t plain, gpgme_data_t cipher)
|
||
{
|
||
gpgme_error_t err;
|
||
|
||
TRACE_BEG3 (DEBUG_CTX, "gpgme_op_encrypt_sign_start", ctx,
|
||
"flags=0x%x, plain=%p, cipher=%p", flags, plain, cipher);
|
||
|
||
if (!ctx)
|
||
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
|
||
|
||
if (_gpgme_debug_trace () && (recp || recpstring))
|
||
{
|
||
if (recp)
|
||
{
|
||
int i = 0;
|
||
|
||
while (recp[i])
|
||
{
|
||
TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
|
||
(recp[i]->subkeys && recp[i]->subkeys->fpr) ?
|
||
recp[i]->subkeys->fpr : "invalid");
|
||
i++;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
TRACE_LOG1 ("recipients = '%s'", recpstring);
|
||
}
|
||
}
|
||
|
||
err = encrypt_sign_start (ctx, 0, recp, recpstring, flags, plain, cipher);
|
||
return err;
|
||
}
|