f12433c1e4
* data.c (gpgme_data_read): For GPGME_DATA_TYPE_NONE, return EOF instead an error. The following changes make it possible to flush an inbound data pipe before invoking a command handler: * posix-io.c (_gpgme_io_select): Accept new argument NONBLOCK to _gpgme_io_select. Set timeout of 0 if this is set. * w32-io.c (_gpgme_io_select): Likewise. * io.h: Add new argument NONBLOCK to _gpgme_io_select prototype. * wait.c (do_select): Add new argument to _gpgme_io_select invocation. * rungpg.h (_gpgme_gpg_set_command_handler): Add new argument linked_data to prototype. * engine.h (_gpgme_engine_set_command_handler): Likewise. * engine.c (_gpgme_engine_set_command_handler): Likewise. * passphrase.c (_gpgme_passphrase_start): Pass NULL as linked_data argument to _gpgme_engine_set_command_handler. * rungpg.c (struct gpg_object_s): New members linked_data and linked_idx in CMD. (_gpgme_gpg_new): Initialize those new members. (_gpgme_gpg_set_command_handler): Accept new argument linked_data. (build_argv): Handle linked_data in the same hack as cb_data. (read_status): If linked_data is in use, flush the pipe before activating the command handler. * gpgme.h: Add prototypes for gpgme_op_edit_start and gpgme_op_edit. The next changes export the status codes to the user: * decrypt.c (_gpgme_decrypt_status_handler): Likewise, also prefix all STATUS_ with GPGME_. * delete.c (delete_status_handler): Likewise. * decrypt-verify.c (decrypt_verify_status_handler): Likewise. * encrypt.c (_gpgme_encrypt_status_handler): Likewise. (_gpgme_encrypt_sym_status_handler): Likewise. * encrypt-sign.c (encrypt_sign_status_handler): Likewise. * engine-gpgsm.c (parse_status): Likewise. (gpgsm_status_handler): Likewise. (gpgsm_set_recipients): Likewise. * export.c (export_status_handler): Likewise. * genkey.c (genkey_status_handler): Likewise. * import.c (append_xml_impinfo): Likewise. (import_status_handler): Likewise. * keylist.c (keylist_status_handler): Likewise. * passphrase.c (_gpgme_passphrase_status_handler): Likewise. (command_handler): Likewise. * progress.c (_gpgme_progress_status_handler): Likewise. * sign.c (_gpgme_sign_status_handler): Likewise. * trustlist.c (trustlist_status_handler): Likewise. * verify.c (_gpgme_verify_status_handler): Likewise. * gpgme.h (GpgmeEditCb): New type. * rungpg.h (GpgStatusCode): Rename and move to ... * gpgme.h (GpgmeStatusCode): ... this and here. * Makefile.am (status-table.h): Run mkstatus on gpgme.h, not rungpg.h. * mkstatus: Prefix STATUS with GPGME_. * rungpg.h (GpgStatusHandler, GpgCommandHandler): Change type accordingly. * ops.h (_gpgme_verify_status_handler, _gpgme_decrypt_status_handler, _gpgme_sign_status_handler, _gpgme_encrypt_status_handler, _gpgme_passphrase_status_handler, _gpgme_progress_status_handler): Likewise. * rungpg.c (struct gpg_object_s): Likewise for CMD.code. These changes add an edit operation to GPGME: * context.h (struct gpgme_context_s): New member RESULT.edit. * ops.h: Add prototype for _gpgme_release_edit_result and _gpgme_passphrase_command_handler. * passphrase.c (command_handler): Make non-static and rename to ... (_gpgme_passphrase_command_handler): ... this. (_gpgme_passphrase_start): Use new name for command handler. * types.h: Add EditResult type. * gpgme.c (_gpgme_release_result): Release EDIT result. * edit.c: New file. * Makefile.am (libgpgme_la_SOURCES): Add edit.c. (libgpgme_la_LDADD): Rename to libgpgme_la_LIBADD, and include assuan_libobjs. (assuan_libobjs): New variable, set this instead libgpgme_la_LIBADD. * engine.h (_gpgme_engine_op_edit): New prototype. * engine.c (_gpgme_engine_op_edit): New function. * rungpg.h (_gpgme_gpg_op_edit): New prototype. * rungpg.c (_gpgme_gpg_op_edit): New function.
153 lines
5.2 KiB
C
153 lines
5.2 KiB
C
/* ops.h - internal operations stuff
|
|
* Copyright (C) 2000 Werner Koch (dd9jn)
|
|
* Copyright (C) 2001, 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
|
|
*/
|
|
|
|
#ifndef OPS_H
|
|
#define OPS_H
|
|
|
|
#include "types.h"
|
|
#include "rungpg.h"
|
|
|
|
/* Support macros. */
|
|
|
|
#define test_and_allocate_result(ctx,field) \
|
|
do \
|
|
{ \
|
|
if (!ctx->result.field) \
|
|
{ \
|
|
ctx->result.field = xtrycalloc (1, sizeof *ctx->result.field); \
|
|
if (!ctx->result.field) \
|
|
{ \
|
|
ctx->error = mk_error (Out_Of_Core); \
|
|
return; \
|
|
} \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
/*-- gpgme.c --*/
|
|
void _gpgme_release_result ( GpgmeCtx c );
|
|
void _gpgme_set_op_info (GpgmeCtx c, GpgmeData info);
|
|
|
|
void _gpgme_op_event_cb (void *data, GpgmeEventIO type, void *type_data);
|
|
void _gpgme_op_event_cb_user (void *data, GpgmeEventIO type, void *type_data);
|
|
|
|
/*-- wait.c --*/
|
|
GpgmeError _gpgme_wait_one (GpgmeCtx ctx);
|
|
GpgmeError _gpgme_wait_on_condition (GpgmeCtx ctx, volatile int *cond);
|
|
|
|
/*-- recipient.c --*/
|
|
int _gpgme_recipients_all_valid ( const GpgmeRecipients rset );
|
|
|
|
|
|
/*-- data.c --*/
|
|
char * _gpgme_data_release_and_return_string ( GpgmeData dh );
|
|
GpgmeDataMode _gpgme_data_get_mode ( GpgmeData dh );
|
|
void _gpgme_data_set_mode ( GpgmeData dh, GpgmeDataMode mode );
|
|
char * _gpgme_data_get_as_string ( GpgmeData dh );
|
|
GpgmeError _gpgme_data_append ( GpgmeData dh,
|
|
const char *buffer, size_t length );
|
|
GpgmeError _gpgme_data_append_string ( GpgmeData dh, const char *s );
|
|
GpgmeError _gpgme_data_append_string_for_xml ( GpgmeData dh,
|
|
const char *s);
|
|
GpgmeError _gpgme_data_append_for_xml ( GpgmeData dh,
|
|
const char *buffer,
|
|
size_t len );
|
|
GpgmeError _gpgme_data_append_percentstring_for_xml ( GpgmeData dh,
|
|
const char *string );
|
|
|
|
GpgmeError _gpgme_data_unread (GpgmeData dh,
|
|
const char *buffer, size_t length );
|
|
|
|
void _gpgme_data_inbound_handler (void *opaque, int fd);
|
|
void _gpgme_data_outbound_handler (void *opaque, int fd);
|
|
|
|
/*-- key.c --*/
|
|
GpgmeError _gpgme_key_new ( GpgmeKey *r_key );
|
|
GpgmeError _gpgme_key_new_secret ( GpgmeKey *r_key );
|
|
|
|
/*-- op-support.c --*/
|
|
GpgmeError _gpgme_op_reset (GpgmeCtx ctx, int synchronous);
|
|
|
|
/*-- verify.c --*/
|
|
void _gpgme_release_verify_result (VerifyResult result);
|
|
GpgmeSigStat _gpgme_intersect_stati (VerifyResult result);
|
|
void _gpgme_verify_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
|
|
/*-- decrypt.c --*/
|
|
void _gpgme_release_decrypt_result (DecryptResult result);
|
|
void _gpgme_decrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
GpgmeError _gpgme_decrypt_start (GpgmeCtx ctx, int synchronous,
|
|
GpgmeData ciph, GpgmeData plain,
|
|
void *status_handler);
|
|
GpgmeError _gpgme_decrypt_result (GpgmeCtx ctx);
|
|
|
|
/*-- sign.c --*/
|
|
void _gpgme_release_sign_result ( SignResult res );
|
|
void _gpgme_sign_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
|
|
/*-- encrypt.c --*/
|
|
void _gpgme_release_encrypt_result ( EncryptResult res );
|
|
void _gpgme_encrypt_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
|
|
/*-- passphrase.c --*/
|
|
void _gpgme_release_passphrase_result (PassphraseResult result);
|
|
void _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
const char * _gpgme_passphrase_command_handler (void *opaque,
|
|
GpgmeStatusCode code,
|
|
const char *key);
|
|
GpgmeError _gpgme_passphrase_start (GpgmeCtx ctx);
|
|
|
|
/*-- progress.c --*/
|
|
void _gpgme_progress_status_handler (GpgmeCtx ctx, GpgmeStatusCode code,
|
|
char *args);
|
|
|
|
/*-- import.c --*/
|
|
void _gpgme_release_import_result (ImportResult res);
|
|
|
|
/*-- delete.c --*/
|
|
void _gpgme_release_delete_result (DeleteResult res);
|
|
|
|
/*-- genkey.c --*/
|
|
void _gpgme_release_genkey_result (GenKeyResult res);
|
|
|
|
/*-- keylist.c --*/
|
|
void _gpgme_release_keylist_result (KeylistResult res);
|
|
void _gpgme_op_keylist_event_cb (void *data, GpgmeEventIO type, void *type_data);
|
|
|
|
/*-- trustlist.c --*/
|
|
void _gpgme_op_trustlist_event_cb (void *data, GpgmeEventIO type, void *type_data);
|
|
|
|
/*-- edit.c --*/
|
|
void _gpgme_release_edit_result (EditResult res);
|
|
|
|
/*-- version.c --*/
|
|
const char *_gpgme_compare_versions (const char *my_version,
|
|
const char *req_version);
|
|
char *_gpgme_get_program_version (const char *const path);
|
|
|
|
|
|
#endif /* OPS_H */
|