
* 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.
164 lines
4.1 KiB
C
164 lines
4.1 KiB
C
/* context.h
|
|
* 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 CONTEXT_H
|
|
#define CONTEXT_H
|
|
|
|
#include "gpgme.h"
|
|
#include "types.h"
|
|
#include "engine.h"
|
|
#include "wait.h"
|
|
|
|
struct key_queue_item_s
|
|
{
|
|
struct key_queue_item_s *next;
|
|
GpgmeKey key;
|
|
};
|
|
|
|
struct trust_queue_item_s
|
|
{
|
|
struct trust_queue_item_s *next;
|
|
GpgmeTrustItem item;
|
|
};
|
|
|
|
|
|
/* Currently we need it at several places, so we put the definition
|
|
* into this header file */
|
|
struct gpgme_context_s
|
|
{
|
|
int initialized;
|
|
/* A gpg request is still pending. */
|
|
int pending;
|
|
|
|
int use_cms;
|
|
|
|
/* At some points we need to remember an error which we can't report
|
|
immediately. */
|
|
GpgmeError error;
|
|
/* Cancel operation requested. */
|
|
int cancel;
|
|
|
|
/* The running engine process. */
|
|
EngineObject engine;
|
|
|
|
/* Level of verbosity to use. */
|
|
int verbosity;
|
|
int use_armor;
|
|
int use_textmode;
|
|
int keylist_mode;
|
|
int include_certs;
|
|
|
|
/* The number of keys in signers. */
|
|
int signers_len;
|
|
/* Size of the following array. */
|
|
int signers_size;
|
|
GpgmeKey *signers;
|
|
|
|
struct
|
|
{
|
|
VerifyResult verify;
|
|
DecryptResult decrypt;
|
|
SignResult sign;
|
|
EncryptResult encrypt;
|
|
PassphraseResult passphrase;
|
|
ImportResult import;
|
|
DeleteResult delete;
|
|
GenKeyResult genkey;
|
|
KeylistResult keylist;
|
|
EditResult edit;
|
|
} result;
|
|
|
|
/* Last signature notation. */
|
|
GpgmeData notation;
|
|
/* Last operation info. */
|
|
GpgmeData op_info;
|
|
|
|
/* Used by keylist.c. */
|
|
GpgmeKey tmp_key;
|
|
/* Something new is available. */
|
|
volatile int key_cond;
|
|
struct key_queue_item_s *key_queue;
|
|
struct trust_queue_item_s *trust_queue;
|
|
|
|
GpgmePassphraseCb passphrase_cb;
|
|
void *passphrase_cb_value;
|
|
|
|
GpgmeProgressCb progress_cb;
|
|
void *progress_cb_value;
|
|
|
|
/* A list of file descriptors in active use by the current
|
|
(synchronous) operation. */
|
|
struct fd_table fdt;
|
|
struct GpgmeIOCbs io_cbs;
|
|
|
|
GpgmeData help_data_1;
|
|
};
|
|
|
|
|
|
struct gpgme_data_s {
|
|
size_t len;
|
|
const char *data;
|
|
GpgmeDataType type;
|
|
GpgmeDataMode mode;
|
|
GpgmeDataEncoding encoding;
|
|
|
|
int (*read_cb)( void *, char *, size_t, size_t *);
|
|
void *read_cb_value;
|
|
int read_cb_eof;
|
|
|
|
size_t readpos;
|
|
size_t writepos;
|
|
size_t private_len;
|
|
char *private_buffer;
|
|
};
|
|
|
|
struct user_id_s {
|
|
struct user_id_s *next;
|
|
unsigned int revoked:1;
|
|
unsigned int invalid:1;
|
|
GpgmeValidity validity;
|
|
const char *name_part; /* all 3 point into strings behind name */
|
|
const char *email_part; /* or to read-only strings */
|
|
const char *comment_part;
|
|
char name[1];
|
|
};
|
|
|
|
struct gpgme_recipients_s {
|
|
struct user_id_s *list;
|
|
int checked; /* wether the recipients are all valid */
|
|
};
|
|
|
|
|
|
#define fail_on_pending_request(c) \
|
|
do { \
|
|
if (!(c)) return GPGME_Invalid_Value; \
|
|
if ((c)->pending) return GPGME_Busy; \
|
|
} while (0)
|
|
|
|
#define wait_on_request_or_fail(c) \
|
|
do { \
|
|
if (!(c)) return GPGME_Invalid_Value;\
|
|
if (!(c)->pending) return GPGME_No_Request; \
|
|
gpgme_wait ((c), 1); \
|
|
} while (0)
|
|
|
|
#endif /* CONTEXT_H */
|