
2002-10-08 Marcus Brinkmann <marcus@g10code.de> New data object component: * gpgme.h (GpgmeDataReadCb, GpgmeDataWriteCb, GpgmeDataSeekCb, GpgmeDataReleaseCb): New types. (struct GpgmeDataCbs): New structure. (gpgme_data_read): Changed prototype to match that of read() closely. (gpgme_data_write): Similar for write(). (gpgme_data_seek, gpgme_data_new_from_cbs, gpgme_data_new_from_fd, gpgme_data_new_from_stream): New prototypes. (gpgme_data_get_type, gpgme_check_engine): Prototype removed. * Makefile.am (libgpgme_la_SOURCES): Add data.h, data-fd.c, data-stream.c, data-mem.c, data-user.c and data-compat.c. * data.c: Reimplemented from scratch. * (data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c, data-user.c): New file. * context.h (struct gpgme_data_s): Removed. * conversion.c: Include <errno.h> and <sys/types.h>. (_gpgme_data_append): New function. * data.c (_gpgme_data_append_string): Move to ... * conversion.c (_gpgme_data_append_string): ... here. * data.c (_gpgme_data_append_for_xml): Move to ... * conversion.c (_gpgme_data_append_for_xml): ... here. * data.c (_gpgme_data_append_string_for_xml): Move to ... * conversion.c (_gpgme_data_append_string_for_xml): ... here. * data.c (_gpgme_data_append_percentstring_for_xml): Move to ... * conversion.c (_gpgme_data_append_percentstring_for_xml): ... here. * ops.h (_gpgme_data_get_mode, _gpgme_data_set_mode): Prototype removed. * types.h (GpgmeDataMode): Type removed. * decrypt.c (_gpgme_decrypt_start): Don't check data type or mode. * edit.c (_gpgme_op_edit_start): Likewise. * encrypt.c (_gpgme_op_encrypt_start): Likewise. * encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise. * encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise. * export.c (_gpgme_op_export_start): Likewise. * genkey.c (_gpgme_op_genkey_start): Likewise. * import.c (_gpgme_op_import_start): Likewise. * sign.c (_gpgme_op_sign_start): Likewise. * verify.c (_gpgme_op_verify_start): Likewise. * encrypt.c (gpgme_op_encrypt): Remove hack that returns invalid no recipient if no data was returned. * encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns no recipient if no data was returned. * encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns no recipient if no data was returned. * engine.c (_gpgme_engine_op_verify): Add new argument to differentiate detached from normal signatures. * engine.h (_gpgme_engine_op_verify): Likewise for prototype. * engine-gpgsm.c (_gpgme_gpgsm_op_verify): Likewise. Don't check mode of data argument. * engine-gpgsm.h (_gpgme_gpgsm_op_verify): Likewise for prototype. * gpgme.h (gpgme_op_verify_start): Likewise for prototype. (gpgme_op_verify): Likewise for prototype. * rungpg.c (_gpgme_gpg_op_verify): Likewise. * rungpg.h (_gpgme_gpg_op_verify): Likewise for prototype. * verify.c (_gpgme_op_verify_start): Likewise. (gpgme_op_verify_start): Likewise. (gpgme_op_verify): Likewise. * rungpg.c (struct arg_and_data_s): New member INBOUND to hold direction of data object. (_gpgme_gpg_add_data): Add new argument INBOUND. Use it to determine direction of data object. (_gpgme_gpg_add_pm_data, _gpgme_gpg_set_command_handler, _gpgme_gpg_op_decrypt, _gpgme_gpg_op_edit, _gpgme_gpg_op_encrypt, _gpgme_gpg_op_encrypt_sign, _gpgme_gpg_op_export, _gpgme_gpg_op_genkey, _gpgme_gpg_op_import, _gpgme_gpg_op_sign, _gpgme_gpg_op_verify): Add new argument to _gpgme_gpg_add_data invocation. (build_argv): Use new member INBOUND to determine direction of file descriptor. Don't check the data type. * rungpg.h (_gpgme_gpg_add_data): Add new argument to prototype. * gpgme.c (gpgme_get_op_info): Don't call _gpgme_data_get_as_string if CTX->op_info is NULL. * version.c (gpgme_check_engine): Function removed. tests/ 2002-10-09 Marcus Brinkmann <marcus@g10code.de> * gpg/t-decrypt.c (print_data): Update to new gpgme_data_read interface, and use gpgme_engine_check_version instead gpgme_check_version. * gpg/t-decrypt-verify.c (print_data): Likewise. * gpg/t-edit.c (main): Likewise. * gpg/t-encrypt.c (print_data): Likewise. * gpg/t-encrypt-sign.c (print_data): Likewise. * gpg/t-encrypt-sym.c (print_data): Likewise. * gpg/t-eventloop.c (print_data): Likewise. * gpg/t-export.c (print_data): Likewise. * gpg/t-sign.c (print_data): Likewise. * gpg/t-signers.c (print_data): Likewise. * gpgsm/t-decrypt.c (print_data): Likewise. * gpgsm/t-encrypt.c (print_data): Likewise. * gpgsm/t-export.c (print_data): Likewise. * gpgsm/t-sign.c (print_data): Likewise. * gpg/t-verify.c (main): Likewise for gpgme_op_verify. * gpgsm/t-verify.c (main): Likewise for gpgme_op_verify. * t-data.c (read_once_test): Likewise. (write_test): Update for new behaviour of data objects. (main): Remove type test.
158 lines
3.6 KiB
C
158 lines
3.6 KiB
C
/* edit.c - key edit functions
|
|
* Copyright (C) 2002 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 General Public License as published by
|
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU 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
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
#include "context.h"
|
|
#include "ops.h"
|
|
|
|
|
|
struct edit_result_s
|
|
{
|
|
GpgmeEditCb fnc;
|
|
void *fnc_value;
|
|
};
|
|
|
|
void
|
|
_gpgme_release_edit_result (EditResult result)
|
|
{
|
|
if (!result)
|
|
return;
|
|
xfree (result);
|
|
}
|
|
|
|
void
|
|
_gpgme_edit_status_handler (GpgmeCtx ctx, GpgmeStatusCode status, char *args)
|
|
{
|
|
_gpgme_passphrase_status_handler (ctx, status, args);
|
|
|
|
if (ctx->error)
|
|
return;
|
|
|
|
ctx->error = (*ctx->result.edit->fnc) (ctx->result.edit->fnc_value, status, args, NULL);
|
|
}
|
|
|
|
static const char *
|
|
command_handler (void *opaque, GpgmeStatusCode status, const char *args)
|
|
{
|
|
GpgmeCtx ctx = opaque;
|
|
const char *result;
|
|
|
|
result = _gpgme_passphrase_command_handler (ctx, status, args);
|
|
|
|
if (!result)
|
|
ctx->error = (*ctx->result.edit->fnc) (ctx->result.edit->fnc_value, status, args, &result);
|
|
|
|
return result;
|
|
}
|
|
|
|
static GpgmeError
|
|
_gpgme_op_edit_start (GpgmeCtx ctx, int synchronous,
|
|
GpgmeKey key,
|
|
GpgmeEditCb fnc, void *fnc_value,
|
|
GpgmeData out)
|
|
{
|
|
GpgmeError err = 0;
|
|
|
|
if (!fnc)
|
|
return mk_error (Invalid_Value);
|
|
|
|
err = _gpgme_op_reset (ctx, synchronous);
|
|
if (err)
|
|
goto leave;
|
|
|
|
assert (!ctx->result.edit);
|
|
ctx->result.edit = xtrymalloc (sizeof *ctx->result.edit);
|
|
if (!ctx->result.edit)
|
|
{
|
|
err = mk_error (Out_Of_Core);
|
|
goto leave;
|
|
}
|
|
ctx->result.edit->fnc = fnc;
|
|
ctx->result.edit->fnc_value = fnc_value;
|
|
|
|
/* Check the supplied data. */
|
|
if (!out)
|
|
{
|
|
err = mk_error (Invalid_Value);
|
|
goto leave;
|
|
}
|
|
|
|
err = _gpgme_engine_set_command_handler (ctx->engine, command_handler,
|
|
ctx, out);
|
|
if (err)
|
|
goto leave;
|
|
|
|
_gpgme_engine_set_status_handler (ctx->engine, _gpgme_edit_status_handler,
|
|
ctx);
|
|
|
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
|
|
|
_gpgme_engine_op_edit (ctx->engine, key, out, ctx);
|
|
|
|
/* And kick off the process. */
|
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
|
|
|
leave:
|
|
if (err)
|
|
{
|
|
ctx->pending = 0;
|
|
_gpgme_engine_release (ctx->engine);
|
|
ctx->engine = NULL;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
GpgmeError
|
|
gpgme_op_edit_start (GpgmeCtx ctx,
|
|
GpgmeKey key,
|
|
GpgmeEditCb fnc, void *fnc_value,
|
|
GpgmeData out)
|
|
{
|
|
return _gpgme_op_edit_start (ctx, 0, key, fnc, fnc_value, out);
|
|
}
|
|
|
|
/**
|
|
* gpgme_op_edit:
|
|
* @ctx: The context
|
|
* @key: The key to be edited.
|
|
* @fnc: An edit callback handler.
|
|
* @fnc_value: To be passed to @fnc as first arg.
|
|
* @out: The output.
|
|
*
|
|
* Return value: 0 on success or an error code.
|
|
**/
|
|
GpgmeError
|
|
gpgme_op_edit (GpgmeCtx ctx,
|
|
GpgmeKey key,
|
|
GpgmeEditCb fnc, void *fnc_value,
|
|
GpgmeData out)
|
|
{
|
|
GpgmeError err = _gpgme_op_edit_start (ctx, 1, key, fnc, fnc_value, out);
|
|
if (!err)
|
|
err = _gpgme_wait_one (ctx);
|
|
return err;
|
|
}
|