From 3974488cd1fbe8471ec06b6ed057e56a446616b8 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 23 Sep 2009 00:01:25 +0000 Subject: 2009-09-23 Marcus Brinkmann * configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION): Update to new API (2, 1.1.0). agent/ 2009-09-23 Marcus Brinkmann * gpg-agent.c (parse_rereadable_options): Don't set global assuan log file (there ain't one anymore). (main): Update to new API. (check_own_socket_pid_cb): Return gpg_error_t instead of int. (check_own_socket_thread, check_for_running_agent): Create assuan context before connecting to server. * command.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (write_and_clear_outbuf): Use gpg_error_t instead of assuan_error_t. (cmd_geteventcounter, cmd_istrusted, cmd_listtrusted) (cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc) (cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey) (cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase) (cmd_get_confirmation, cmd_learn, cmd_passwd) (cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval) (cmd_updatestartuptty, cmd_killagent, cmd_reloadagent) (cmd_getinfo, option_handler): Return gpg_error_t instead of int. (post_cmd_notify): Change type of ERR to gpg_error_t from int. (io_monitor): Add hook argument. Use symbols for constants. (register_commands): Change return type of HANDLER to gpg_error_t. (start_command_handler): Allocate assuan context before starting server. * call-pinentry.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (unlock_pinentry): Call assuan_release instead of assuan_disconnect. (getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int. (start_pinentry): Allocate assuan context before connecting to server. * call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb) (membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru) (pass_data_thru): Change return type to gpg_error_t. (start_scd): Allocate assuan context before connecting to server. common/ 2009-09-23 Marcus Brinkmann * asshelp.c (start_new_gpg_agent): Allocate assuan context before starting server. g10/ 2009-09-23 Marcus Brinkmann * call-agent.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb) (learn_status_cb, inq_writecert_parms, inq_writekey_parms) (scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of int. * gpg.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (main): Update to new Assuan API. * server.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (option_handler, cmd_recipient, cmd_signer, cmd_encrypt) (cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export) (cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys) (cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t instead of int. (register_commands): Allocate assuan context before starting server. (gpg_server): Allocate assuan_context before starting server. scd/ 2009-09-23 Marcus Brinkmann * command.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert) (cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt) (cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey) (cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock) (cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu) (cmd_killscd): Return gpg_error_t instead of int. (scd_command_handler): Allocate assuan context before starting server. * scdaemon.c (main): Update to new Assuan API. sm/ 2009-09-23 Marcus Brinkmann * gpgsm.c (main): Update to new assuan API. * server.c: Include "gpgsm.h" before due to check for GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h. (option_handler, cmd_recipient, cmd_signer, cmd_encrypt) (cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export) (cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys) (cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey) (cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int. (register_commands): Same for member HANDLER in table. (gpgsm_server): Allocate assuan context before starting server. * sm/call-dirmngr.c: * call-dirmngr.c (prepare_dirmngr): Check for CTX and error before setting LDAPSERVER. (start_dirmngr_ext): Allocate assuan context before starting server. (inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb) (run_command_cb, run_command_inq_cb, run_command_status_cb): Return gpg_error_t instead of int. tools/ 2009-09-23 Marcus Brinkmann * gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response) (main): Update to new Assuan API. --- g10/server.c | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to 'g10/server.c') diff --git a/g10/server.c b/g10/server.c index d0e801bd5..cc502e8e3 100644 --- a/g10/server.c +++ b/g10/server.c @@ -26,9 +26,9 @@ #include #include -#include #include "gpg.h" +#include #include "util.h" #include "i18n.h" #include "options.h" @@ -64,7 +64,7 @@ close_message_fd (ctrl_t ctrl) /* Called by libassuan for Assuan options. See the Assuan manual for details. */ -static int +static gpg_error_t option_handler (assuan_context_t ctx, const char *key, const char *value) { /* ctrl_t ctrl = assuan_get_pointer (ctx); */ @@ -168,7 +168,7 @@ output_notify (assuan_context_t ctx, const char *line) encrypt at all if not all recipients are valid, the client has to take care of this. All RECIPIENT commands are cumulative until a RESET or an successful ENCRYPT command. */ -static int +static gpg_error_t cmd_recipient (assuan_context_t ctx, char *line) { (void)ctx; @@ -193,7 +193,7 @@ cmd_recipient (assuan_context_t ctx, char *line) Note that this command returns an INV_RECP status which is a bit strange, but they are very similar. */ -static int +static gpg_error_t cmd_signer (assuan_context_t ctx, char *line) { (void)ctx; @@ -216,7 +216,7 @@ cmd_signer (assuan_context_t ctx, char *line) This command should in general not fail, as all necessary checks have been done while setting the recipients. The input and output pipes are closed. */ -static int +static gpg_error_t cmd_encrypt (assuan_context_t ctx, char *line) { (void)ctx; @@ -230,7 +230,7 @@ cmd_encrypt (assuan_context_t ctx, char *line) This performs the decrypt operation after doing some checks on the internal state (e.g. that only needed data has been set). */ -static int +static gpg_error_t cmd_decrypt (assuan_context_t ctx, char *line) { (void)ctx; @@ -249,7 +249,7 @@ cmd_decrypt (assuan_context_t ctx, char *line) If the signature is a detached one, the server will inquire about the signed material and the client must provide it. */ -static int +static gpg_error_t cmd_verify (assuan_context_t ctx, char *line) { int rc; @@ -296,7 +296,7 @@ cmd_verify (assuan_context_t ctx, char *line) Sign the data set with the INPUT command and write it to the sink set by OUTPUT. With "--detached" specified, a detached signature is created. */ -static int +static gpg_error_t cmd_sign (assuan_context_t ctx, char *line) { (void)ctx; @@ -310,7 +310,7 @@ cmd_sign (assuan_context_t ctx, char *line) Import keys as read from the input-fd, return status message for each imported one. The import checks the validity of the key. */ -static int +static gpg_error_t cmd_import (assuan_context_t ctx, char *line) { (void)ctx; @@ -330,7 +330,7 @@ cmd_import (assuan_context_t ctx, char *line) Recall that in general the output format is set with the OUTPUT command. */ -static int +static gpg_error_t cmd_export (assuan_context_t ctx, char *line) { (void)ctx; @@ -344,7 +344,7 @@ cmd_export (assuan_context_t ctx, char *line) Fixme */ -static int +static gpg_error_t cmd_delkeys (assuan_context_t ctx, char *line) { (void)ctx; @@ -358,7 +358,7 @@ cmd_delkeys (assuan_context_t ctx, char *line) Set the file descriptor to read a message which is used with detached signatures. */ -static int +static gpg_error_t cmd_message (assuan_context_t ctx, char *line) { int rc; @@ -381,7 +381,7 @@ cmd_message (assuan_context_t ctx, char *line) fixme */ -static int +static gpg_error_t do_listkeys (assuan_context_t ctx, char *line, int mode) { (void)ctx; @@ -392,14 +392,14 @@ do_listkeys (assuan_context_t ctx, char *line, int mode) } -static int +static gpg_error_t cmd_listkeys (assuan_context_t ctx, char *line) { return do_listkeys (ctx, line, 3); } -static int +static gpg_error_t cmd_listsecretkeys (assuan_context_t ctx, char *line) { return do_listkeys (ctx, line, 2); @@ -412,7 +412,7 @@ cmd_listsecretkeys (assuan_context_t ctx, char *line) Read the parameters in native format from the input fd and create a new OpenPGP key. */ -static int +static gpg_error_t cmd_genkey (assuan_context_t ctx, char *line) { (void)ctx; @@ -430,7 +430,7 @@ cmd_genkey (assuan_context_t ctx, char *line) pid - Return the process id of the server. */ -static int +static gpg_error_t cmd_getinfo (assuan_context_t ctx, char *line) { int rc; @@ -461,7 +461,7 @@ register_commands (assuan_context_t ctx) static struct { const char *name; - int (*handler)(assuan_context_t, char *line); + gpg_error_t (*handler)(assuan_context_t, char *line); } table[] = { { "RECIPIENT", cmd_recipient }, { "SIGNER", cmd_signer }, @@ -502,7 +502,7 @@ gpg_server (ctrl_t ctrl) { int rc; int filedes[2]; - assuan_context_t ctx; + assuan_context_t ctx = NULL; static const char hello[] = ("GNU Privacy Guard's OpenPGP server " VERSION " ready"); @@ -511,7 +511,15 @@ gpg_server (ctrl_t ctrl) called with a socketpair and ignore FILEDES in this case. */ filedes[0] = 0; filedes[1] = 1; - rc = assuan_init_pipe_server (&ctx, filedes); + rc = assuan_new (&ctx); + if (rc) + { + log_error ("failed to allocate the assuan context: %s\n", + gpg_strerror (rc)); + goto leave; + } + + rc = assuan_init_pipe_server (ctx, filedes); if (rc) { log_error ("failed to initialize the server: %s\n", gpg_strerror (rc)); @@ -590,7 +598,7 @@ gpg_server (ctrl_t ctrl) leave: xfree (ctrl->server_local); ctrl->server_local = NULL; - assuan_deinit_server (ctx); + assuan_release (ctx); return rc; } -- cgit v1.2.3