
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.
151 lines
5.1 KiB
C
151 lines
5.1 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 and conversion.c --*/
|
|
char * _gpgme_data_release_and_return_string ( GpgmeData dh );
|
|
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 */
|