2003-08-05 17:11:04 +00:00
|
|
|
|
/* call-scd.c - fork of the scdaemon to do SC operations
|
2011-12-14 15:42:28 +01:00
|
|
|
|
* Copyright (C) 2001, 2002, 2005, 2007, 2010,
|
|
|
|
|
* 2011 Free Software Foundation, Inc.
|
2013-08-26 17:29:54 +02:00
|
|
|
|
* Copyright (C) 2013 Werner Koch
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG 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
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <unistd.h>
|
2010-04-14 11:24:02 +00:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include <sys/stat.h>
|
2004-04-21 14:43:51 +00:00
|
|
|
|
#include <sys/types.h>
|
2004-12-13 15:49:56 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2004-04-21 14:43:51 +00:00
|
|
|
|
#include <sys/wait.h>
|
2004-12-13 15:49:56 +00:00
|
|
|
|
#endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#include <npth.h>
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
#include "agent.h"
|
|
|
|
|
#include <assuan.h>
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_OPEN_MAX
|
|
|
|
|
#define MAX_OPEN_FDS _POSIX_OPEN_MAX
|
|
|
|
|
#else
|
|
|
|
|
#define MAX_OPEN_FDS 20
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Definition of module local data of the CTRL structure. */
|
|
|
|
|
struct scd_local_s
|
|
|
|
|
{
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* We keep a list of all allocated context with a an achnor at
|
|
|
|
|
SCD_LOCAL_LIST (see below). */
|
|
|
|
|
struct scd_local_s *next_local;
|
|
|
|
|
|
|
|
|
|
/* We need to get back to the ctrl object actually referencing this
|
|
|
|
|
structure. This is really an awkward way of enumerint the lcoal
|
|
|
|
|
contects. A much cleaner way would be to keep a global list of
|
|
|
|
|
ctrl objects to enumerate them. */
|
|
|
|
|
ctrl_t ctrl_backlink;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
assuan_context_t ctx; /* NULL or session context for the SCdaemon
|
|
|
|
|
used with this connection. */
|
|
|
|
|
int locked; /* This flag is used to assert proper use of
|
|
|
|
|
start_scd and unlock_scd. */
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
/* Callback parameter for learn card */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
struct learn_parm_s
|
|
|
|
|
{
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void (*kpinfo_cb)(void*, const char *);
|
|
|
|
|
void *kpinfo_cb_arg;
|
|
|
|
|
void (*certinfo_cb)(void*, const char *);
|
|
|
|
|
void *certinfo_cb_arg;
|
|
|
|
|
void (*sinfo_cb)(void*, const char *, size_t, const char *);
|
|
|
|
|
void *sinfo_cb_arg;
|
|
|
|
|
};
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
struct inq_needpin_s
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t);
|
|
|
|
|
void *getpin_cb_arg;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
assuan_context_t passthru; /* If not NULL, pass unknown inquiries
|
|
|
|
|
up to the caller. */
|
2011-07-27 11:10:15 +02:00
|
|
|
|
int any_inq_seen;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* To keep track of all active SCD contexts, we keep a linked list
|
|
|
|
|
anchored at this variable. */
|
|
|
|
|
static struct scd_local_s *scd_local_list;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* A Mutex used inside the start_scd function. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
static npth_mutex_t start_scd_lock;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
/* A malloced string with the name of the socket to be used for
|
|
|
|
|
additional connections. May be NULL if not provided by
|
|
|
|
|
SCdaemon. */
|
|
|
|
|
static char *socket_name;
|
|
|
|
|
|
|
|
|
|
/* The context of the primary connection. This is also used as a flag
|
|
|
|
|
to indicate whether the scdaemon has been started. */
|
|
|
|
|
static assuan_context_t primary_scd_ctx;
|
|
|
|
|
|
|
|
|
|
/* To allow reuse of the primary connection, the following flag is set
|
|
|
|
|
to true if the primary context has been reset and is not in use by
|
|
|
|
|
any connection. */
|
|
|
|
|
static int primary_scd_ctx_reusable;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Local prototypes. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-12-19 17:44:20 +00:00
|
|
|
|
/* This function must be called once to initialize this module. This
|
|
|
|
|
has to be done before a second thread is spawned. We can't do the
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
static initialization because NPth emulation code might not be able
|
2005-04-11 16:09:18 +00:00
|
|
|
|
to do a static init; in particular, it is not possible for W32. */
|
2004-12-19 17:44:20 +00:00
|
|
|
|
void
|
|
|
|
|
initialize_module_call_scd (void)
|
|
|
|
|
{
|
|
|
|
|
static int initialized;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
int err;
|
2004-12-19 17:44:20 +00:00
|
|
|
|
|
|
|
|
|
if (!initialized)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_init (&start_scd_lock, NULL);
|
|
|
|
|
if (err)
|
|
|
|
|
log_fatal ("error initializing mutex: %s\n", strerror (err));
|
2004-12-19 17:44:20 +00:00
|
|
|
|
initialized = 1;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
2004-12-19 17:44:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-06-03 13:57:24 +00:00
|
|
|
|
/* This function may be called to print infromation pertaining to the
|
|
|
|
|
current state of this module to the log. */
|
|
|
|
|
void
|
|
|
|
|
agent_scd_dump_state (void)
|
|
|
|
|
{
|
|
|
|
|
log_info ("agent_scd_dump_state: primary_scd_ctx=%p pid=%ld reusable=%d\n",
|
2011-02-04 12:57:53 +01:00
|
|
|
|
primary_scd_ctx,
|
2005-06-03 13:57:24 +00:00
|
|
|
|
(long)assuan_get_pid (primary_scd_ctx),
|
|
|
|
|
primary_scd_ctx_reusable);
|
|
|
|
|
if (socket_name)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_info ("agent_scd_dump_state: socket='%s'\n", socket_name);
|
2005-06-03 13:57:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* The unlock_scd function shall be called after having accessed the
|
|
|
|
|
SCD. It is currently not very useful but gives an opportunity to
|
|
|
|
|
keep track of connections currently calling SCD. Note that the
|
|
|
|
|
"lock" operation is done by the start_scd() function which must be
|
|
|
|
|
called and error checked before any SCD operation. CTRL is the
|
|
|
|
|
usual connection context and RC the error code to be passed trhough
|
|
|
|
|
the function. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static int
|
2005-05-18 10:48:06 +00:00
|
|
|
|
unlock_scd (ctrl_t ctrl, int rc)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (ctrl->scd_local->locked != 1)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
log_error ("unlock_scd: invalid lock count (%d)\n",
|
|
|
|
|
ctrl->scd_local->locked);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!rc)
|
|
|
|
|
rc = gpg_error (GPG_ERR_INTERNAL);
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
ctrl->scd_local->locked = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-24 20:50:49 +00:00
|
|
|
|
/* To make sure we leave no secrets in our image after forking of the
|
|
|
|
|
scdaemon, we use this callback. */
|
|
|
|
|
static void
|
|
|
|
|
atfork_cb (void *opaque, int where)
|
|
|
|
|
{
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)opaque;
|
|
|
|
|
|
2004-01-24 20:50:49 +00:00
|
|
|
|
if (!where)
|
|
|
|
|
gcry_control (GCRYCTL_TERM_SECMEM);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Fork off the SCdaemon if this has not already been done. Lock the
|
|
|
|
|
daemon and make sure that a proper context has been setup in CTRL.
|
2006-09-07 15:13:33 +00:00
|
|
|
|
This function might also lock the daemon, which means that the
|
2015-11-16 12:41:46 +01:00
|
|
|
|
caller must call unlock_scd after this function has returned
|
2005-05-18 10:48:06 +00:00
|
|
|
|
success and the actual Assuan transaction been done. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
start_scd (ctrl_t ctrl)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
gpg_error_t err = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
const char *pgmname;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
assuan_context_t ctx = NULL;
|
2016-09-02 13:41:19 +09:00
|
|
|
|
const char *argv[5];
|
2014-03-07 09:46:44 +01:00
|
|
|
|
assuan_fd_t no_close_list[3];
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int i;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
int rc;
|
2016-09-02 13:41:19 +09:00
|
|
|
|
char *abs_homedir = NULL;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-04-20 19:19:24 +00:00
|
|
|
|
if (opt.disable_scdaemon)
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_SUPPORTED);
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* If this is the first call for this session, setup the local data
|
|
|
|
|
structure. */
|
|
|
|
|
if (!ctrl->scd_local)
|
|
|
|
|
{
|
|
|
|
|
ctrl->scd_local = xtrycalloc (1, sizeof *ctrl->scd_local);
|
|
|
|
|
if (!ctrl->scd_local)
|
2006-09-14 16:50:33 +00:00
|
|
|
|
return gpg_error_from_syserror ();
|
2006-02-09 18:29:31 +00:00
|
|
|
|
ctrl->scd_local->ctrl_backlink = ctrl;
|
|
|
|
|
ctrl->scd_local->next_local = scd_local_list;
|
|
|
|
|
scd_local_list = ctrl->scd_local;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Assert that the lock count is as expected. */
|
|
|
|
|
if (ctrl->scd_local->locked)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
log_error ("start_scd: invalid lock count (%d)\n",
|
|
|
|
|
ctrl->scd_local->locked);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return gpg_error (GPG_ERR_INTERNAL);
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
ctrl->scd_local->locked++;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (ctrl->scd_local->ctx)
|
2005-05-21 18:49:00 +00:00
|
|
|
|
return 0; /* Okay, the context is fine. We used to test for an
|
2006-02-09 18:29:31 +00:00
|
|
|
|
alive context here and do an disconnect. Now that we
|
2005-05-21 18:49:00 +00:00
|
|
|
|
have a ticker function to check for it, it is easier
|
|
|
|
|
not to check here but to let the connection run on an
|
|
|
|
|
error instead. */
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2005-05-21 18:49:00 +00:00
|
|
|
|
/* We need to protect the following code. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = npth_mutex_lock (&start_scd_lock);
|
|
|
|
|
if (rc)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("failed to acquire the start_scd lock: %s\n",
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
strerror (rc));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return gpg_error (GPG_ERR_INTERNAL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check whether the pipe server has already been started and in
|
|
|
|
|
this case either reuse a lingering pipe connection or establish a
|
|
|
|
|
new socket based one. */
|
|
|
|
|
if (primary_scd_ctx && primary_scd_ctx_reusable)
|
|
|
|
|
{
|
|
|
|
|
ctx = primary_scd_ctx;
|
|
|
|
|
primary_scd_ctx_reusable = 0;
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("new connection to SCdaemon established (reusing)\n");
|
|
|
|
|
goto leave;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't allocate assuan context: %s\n", gpg_strerror (rc));
|
|
|
|
|
err = rc;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (socket_name)
|
|
|
|
|
{
|
2009-11-05 12:06:45 +00:00
|
|
|
|
rc = assuan_socket_connect (ctx, socket_name, 0, 0);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("can't connect to socket '%s': %s\n",
|
2006-09-06 16:35:52 +00:00
|
|
|
|
socket_name, gpg_strerror (rc));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
err = gpg_error (GPG_ERR_NO_SCDAEMON);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("new connection to SCdaemon established\n");
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (primary_scd_ctx)
|
|
|
|
|
{
|
|
|
|
|
log_info ("SCdaemon is running but won't accept further connections\n");
|
|
|
|
|
err = gpg_error (GPG_ERR_NO_SCDAEMON);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Nope, it has not been started. Fire it up now. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("no running SCdaemon - starting it\n");
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (fflush (NULL))
|
|
|
|
|
{
|
2007-11-19 16:03:50 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
log_error ("error flushing pending output: %s\n", strerror (errno));
|
2007-11-19 16:03:50 +00:00
|
|
|
|
/* At least Windows XP fails here with EBADF. According to docs
|
|
|
|
|
and Wine an fflush(NULL) is the same as _flushall. However
|
|
|
|
|
the Wime implementaion does not flush stdin,stdout and stderr
|
|
|
|
|
- see above. Lets try to ignore the error. */
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2005-05-18 10:48:06 +00:00
|
|
|
|
goto leave;
|
2007-11-19 16:03:50 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!opt.scdaemon_program || !*opt.scdaemon_program)
|
2007-06-14 17:05:07 +00:00
|
|
|
|
opt.scdaemon_program = gnupg_module_name (GNUPG_MODULE_NAME_SCDAEMON);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if ( !(pgmname = strrchr (opt.scdaemon_program, '/')))
|
|
|
|
|
pgmname = opt.scdaemon_program;
|
|
|
|
|
else
|
|
|
|
|
pgmname++;
|
|
|
|
|
|
|
|
|
|
argv[0] = pgmname;
|
2005-05-20 20:39:36 +00:00
|
|
|
|
argv[1] = "--multi-server";
|
2016-09-02 13:41:19 +09:00
|
|
|
|
if (gnupg_default_homedir_p ())
|
|
|
|
|
argv[2] = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
abs_homedir = make_absfilename_try (gnupg_homedir (), NULL);
|
|
|
|
|
if (!abs_homedir)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error building filename: %s\n",
|
|
|
|
|
gpg_strerror (gpg_error_from_syserror ()));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
argv[2] = "--homedir";
|
|
|
|
|
argv[3] = abs_homedir;
|
|
|
|
|
argv[4] = NULL;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
i=0;
|
|
|
|
|
if (!opt.running_detached)
|
|
|
|
|
{
|
|
|
|
|
if (log_get_fd () != -1)
|
2009-12-08 04:43:15 +00:00
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2014-03-07 09:46:44 +01:00
|
|
|
|
no_close_list[i] = ASSUAN_INVALID_FD;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2015-10-02 12:21:31 +02:00
|
|
|
|
/* Connect to the scdaemon and perform initial handshaking. Use
|
|
|
|
|
detached flag so that under Windows SCDAEMON does not show up a
|
2007-11-19 16:03:50 +00:00
|
|
|
|
new window. */
|
2009-11-05 12:06:45 +00:00
|
|
|
|
rc = assuan_pipe_connect (ctx, opt.scdaemon_program, argv,
|
2015-10-02 12:21:31 +02:00
|
|
|
|
no_close_list, atfork_cb, NULL,
|
|
|
|
|
ASSUAN_PIPE_CONNECT_DETACHED);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't connect to the SCdaemon: %s\n",
|
2006-09-06 16:35:52 +00:00
|
|
|
|
gpg_strerror (rc));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
err = gpg_error (GPG_ERR_NO_SCDAEMON);
|
|
|
|
|
goto leave;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2004-04-21 14:43:51 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_debug ("first connection to SCdaemon established\n");
|
|
|
|
|
|
2008-10-15 13:23:10 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Get the name of the additional socket opened by scdaemon. */
|
|
|
|
|
{
|
|
|
|
|
membuf_t data;
|
|
|
|
|
unsigned char *databuf;
|
|
|
|
|
size_t datalen;
|
|
|
|
|
|
|
|
|
|
xfree (socket_name);
|
|
|
|
|
socket_name = NULL;
|
|
|
|
|
init_membuf (&data, 256);
|
|
|
|
|
assuan_transact (ctx, "GETINFO socket_name",
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data, NULL, NULL, NULL, NULL);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
databuf = get_membuf (&data, &datalen);
|
|
|
|
|
if (databuf && datalen)
|
|
|
|
|
{
|
|
|
|
|
socket_name = xtrymalloc (datalen + 1);
|
|
|
|
|
if (!socket_name)
|
|
|
|
|
log_error ("warning: can't store socket name: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
memcpy (socket_name, databuf, datalen);
|
|
|
|
|
socket_name[datalen] = 0;
|
2015-04-06 13:42:17 +02:00
|
|
|
|
if (DBG_IPC)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("additional connections at '%s'\n", socket_name);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
xfree (databuf);
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-14 11:24:02 +00:00
|
|
|
|
/* Tell the scdaemon we want him to send us an event signal. We
|
|
|
|
|
don't support this for W32CE. */
|
|
|
|
|
#ifndef HAVE_W32CE_SYSTEM
|
2010-11-11 15:07:37 +00:00
|
|
|
|
if (opt.sigusr2_enabled)
|
|
|
|
|
{
|
|
|
|
|
char buf[100];
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2011-02-04 12:57:53 +01:00
|
|
|
|
snprintf (buf, sizeof buf, "OPTION event-signal=%lx",
|
2010-11-11 15:07:37 +00:00
|
|
|
|
(unsigned long)get_agent_scd_notify_event ());
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#else
|
2010-11-11 15:07:37 +00:00
|
|
|
|
snprintf (buf, sizeof buf, "OPTION event-signal=%d", SIGUSR2);
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#endif
|
2010-11-11 15:07:37 +00:00
|
|
|
|
assuan_transact (ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
}
|
2010-04-14 11:24:02 +00:00
|
|
|
|
#endif /*HAVE_W32CE_SYSTEM*/
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
primary_scd_ctx = ctx;
|
|
|
|
|
primary_scd_ctx_reusable = 0;
|
|
|
|
|
|
|
|
|
|
leave:
|
2016-09-02 13:41:19 +09:00
|
|
|
|
xfree (abs_homedir);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
unlock_scd (ctrl, err);
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
if (ctx)
|
|
|
|
|
assuan_release (ctx);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ctrl->scd_local->ctx = ctx;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = npth_mutex_unlock (&start_scd_lock);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("failed to release the start_scd lock: %s\n", strerror (rc));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-03-03 09:02:58 +00:00
|
|
|
|
/* Check whether the SCdaemon is active. This is a fast check without
|
|
|
|
|
any locking and might give a wrong result if another thread is about
|
|
|
|
|
to start the daemon or the daemon is about to be stopped.. */
|
|
|
|
|
int
|
|
|
|
|
agent_scd_check_running (void)
|
|
|
|
|
{
|
|
|
|
|
return !!primary_scd_ctx;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-05-21 18:49:00 +00:00
|
|
|
|
/* Check whether the Scdaemon is still alive and clean it up if not. */
|
|
|
|
|
void
|
|
|
|
|
agent_scd_check_aliveness (void)
|
|
|
|
|
{
|
|
|
|
|
pid_t pid;
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2008-10-15 13:23:10 +00:00
|
|
|
|
DWORD rc;
|
|
|
|
|
#else
|
|
|
|
|
int rc;
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
struct timespec abstime;
|
|
|
|
|
int err;
|
2005-05-21 18:49:00 +00:00
|
|
|
|
|
2005-06-07 19:09:18 +00:00
|
|
|
|
if (!primary_scd_ctx)
|
|
|
|
|
return; /* No scdaemon running. */
|
2005-05-21 18:49:00 +00:00
|
|
|
|
|
2005-06-07 19:09:18 +00:00
|
|
|
|
/* This is not a critical function so we use a short timeout while
|
|
|
|
|
acquiring the lock. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += 1;
|
|
|
|
|
err = npth_mutex_timedlock (&start_scd_lock, &abstime);
|
|
|
|
|
if (err)
|
2005-05-21 18:49:00 +00:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (err == ETIMEDOUT)
|
2005-06-07 19:09:18 +00:00
|
|
|
|
{
|
|
|
|
|
if (opt.verbose > 1)
|
|
|
|
|
log_info ("failed to acquire the start_scd lock while"
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
" doing an aliveness check: %s\n", strerror (err));
|
2005-06-07 19:09:18 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
log_error ("failed to acquire the start_scd lock while"
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
" doing an aliveness check: %s\n", strerror (err));
|
2005-05-21 18:49:00 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-07 19:09:18 +00:00
|
|
|
|
if (primary_scd_ctx)
|
2005-05-21 18:49:00 +00:00
|
|
|
|
{
|
|
|
|
|
pid = assuan_get_pid (primary_scd_ctx);
|
2007-06-14 17:05:07 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2008-10-15 13:23:10 +00:00
|
|
|
|
/* If we have a PID we disconnect if either GetExitProcessCode
|
|
|
|
|
fails or if ir returns the exit code of the scdaemon. 259 is
|
|
|
|
|
the error code for STILL_ALIVE. */
|
2007-11-27 08:01:19 +00:00
|
|
|
|
if (pid != (pid_t)(void*)(-1) && pid
|
2008-10-15 13:23:10 +00:00
|
|
|
|
&& (!GetExitCodeProcess ((HANDLE)pid, &rc) || rc != 259))
|
2007-06-14 17:05:07 +00:00
|
|
|
|
#else
|
2005-05-21 18:49:00 +00:00
|
|
|
|
if (pid != (pid_t)(-1) && pid
|
|
|
|
|
&& ((rc=waitpid (pid, NULL, WNOHANG))==-1 || (rc == pid)) )
|
2007-11-27 08:01:19 +00:00
|
|
|
|
#endif
|
2005-05-21 18:49:00 +00:00
|
|
|
|
{
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* Okay, scdaemon died. Disconnect the primary connection
|
|
|
|
|
now but take care that it won't do another wait. Also
|
|
|
|
|
cleanup all other connections and release their
|
|
|
|
|
resources. The next use will start a new daemon then.
|
|
|
|
|
Due to the use of the START_SCD_LOCAL we are sure that
|
|
|
|
|
none of these context are actually in use. */
|
|
|
|
|
struct scd_local_s *sl;
|
|
|
|
|
|
2005-05-21 18:49:00 +00:00
|
|
|
|
assuan_set_flag (primary_scd_ctx, ASSUAN_NO_WAITPID, 1);
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
assuan_release (primary_scd_ctx);
|
2006-02-09 18:29:31 +00:00
|
|
|
|
|
|
|
|
|
for (sl=scd_local_list; sl; sl = sl->next_local)
|
|
|
|
|
{
|
|
|
|
|
if (sl->ctx)
|
|
|
|
|
{
|
|
|
|
|
if (sl->ctx != primary_scd_ctx)
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
assuan_release (sl->ctx);
|
2006-02-09 18:29:31 +00:00
|
|
|
|
sl->ctx = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-05-21 18:49:00 +00:00
|
|
|
|
primary_scd_ctx = NULL;
|
|
|
|
|
primary_scd_ctx_reusable = 0;
|
2006-02-09 18:29:31 +00:00
|
|
|
|
|
2005-05-21 18:49:00 +00:00
|
|
|
|
xfree (socket_name);
|
|
|
|
|
socket_name = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_unlock (&start_scd_lock);
|
|
|
|
|
if (err)
|
2005-05-21 18:49:00 +00:00
|
|
|
|
log_error ("failed to release the start_scd lock while"
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
" doing the aliveness check: %s\n", strerror (err));
|
2005-05-21 18:49:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
|
2005-06-03 13:57:24 +00:00
|
|
|
|
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* Reset the SCD if it has been used. Actually it is not a reset but
|
|
|
|
|
a cleanup of resources used by the current connection. */
|
2004-01-29 20:17:27 +00:00
|
|
|
|
int
|
|
|
|
|
agent_reset_scd (ctrl_t ctrl)
|
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (ctrl->scd_local)
|
2004-01-29 20:17:27 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (ctrl->scd_local->ctx)
|
|
|
|
|
{
|
2005-05-21 18:49:00 +00:00
|
|
|
|
/* We can't disconnect the primary context because libassuan
|
2005-05-18 10:48:06 +00:00
|
|
|
|
does a waitpid on it and thus the system would hang.
|
|
|
|
|
Instead we send a reset and keep that connection for
|
|
|
|
|
reuse. */
|
|
|
|
|
if (ctrl->scd_local->ctx == primary_scd_ctx)
|
|
|
|
|
{
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* Send a RESTART to the SCD. This is required for the
|
|
|
|
|
primary connection as a kind of virtual EOF; we don't
|
|
|
|
|
have another way to tell it that the next command
|
|
|
|
|
should be viewed as if a new connection has been
|
|
|
|
|
made. For the non-primary connections this is not
|
|
|
|
|
needed as we simply close the socket. We don't check
|
|
|
|
|
for an error here because the RESTART may fail for
|
|
|
|
|
example if the scdaemon has already been terminated.
|
|
|
|
|
Anyway, we need to set the reusable flag to make sure
|
|
|
|
|
that the aliveness check can clean it up. */
|
|
|
|
|
assuan_transact (primary_scd_ctx, "RESTART",
|
2005-05-21 18:49:00 +00:00
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
primary_scd_ctx_reusable = 1;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
assuan_release (ctrl->scd_local->ctx);
|
2006-02-09 18:29:31 +00:00
|
|
|
|
ctrl->scd_local->ctx = NULL;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* Remove the local context from our list and release it. */
|
|
|
|
|
if (!scd_local_list)
|
|
|
|
|
BUG ();
|
|
|
|
|
else if (scd_local_list == ctrl->scd_local)
|
|
|
|
|
scd_local_list = ctrl->scd_local->next_local;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct scd_local_s *sl;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2006-02-09 18:29:31 +00:00
|
|
|
|
for (sl=scd_local_list; sl->next_local; sl = sl->next_local)
|
|
|
|
|
if (sl->next_local == ctrl->scd_local)
|
|
|
|
|
break;
|
|
|
|
|
if (!sl->next_local)
|
|
|
|
|
BUG ();
|
|
|
|
|
sl->next_local = ctrl->scd_local->next_local;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
|
|
|
|
xfree (ctrl->scd_local);
|
|
|
|
|
ctrl->scd_local = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return 0;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
learn_status_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct learn_parm_s *parm = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
if (keywordlen == 8 && !memcmp (keyword, "CERTINFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
parm->certinfo_cb (parm->certinfo_cb_arg, line);
|
|
|
|
|
}
|
|
|
|
|
else if (keywordlen == 11 && !memcmp (keyword, "KEYPAIRINFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
parm->kpinfo_cb (parm->kpinfo_cb_arg, line);
|
|
|
|
|
}
|
|
|
|
|
else if (keywordlen && *line)
|
|
|
|
|
{
|
|
|
|
|
parm->sinfo_cb (parm->sinfo_cb_arg, keyword, keywordlen, line);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-22 18:08:28 +00:00
|
|
|
|
/* Perform the LEARN command and return a list of all private keys
|
2003-08-05 17:11:04 +00:00
|
|
|
|
stored on the card. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_learn (ctrl_t ctrl,
|
|
|
|
|
void (*kpinfo_cb)(void*, const char *),
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *kpinfo_cb_arg,
|
|
|
|
|
void (*certinfo_cb)(void*, const char *),
|
|
|
|
|
void *certinfo_cb_arg,
|
|
|
|
|
void (*sinfo_cb)(void*, const char *, size_t, const char *),
|
|
|
|
|
void *sinfo_cb_arg)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct learn_parm_s parm;
|
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.kpinfo_cb = kpinfo_cb;
|
|
|
|
|
parm.kpinfo_cb_arg = kpinfo_cb_arg;
|
|
|
|
|
parm.certinfo_cb = certinfo_cb;
|
|
|
|
|
parm.certinfo_cb_arg = certinfo_cb_arg;
|
|
|
|
|
parm.sinfo_cb = sinfo_cb;
|
|
|
|
|
parm.sinfo_cb_arg = sinfo_cb_arg;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, "LEARN --force",
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
learn_status_cb, &parm);
|
|
|
|
|
if (rc)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
get_serialno_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
char **serialno = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
const char *s;
|
|
|
|
|
int keywordlen, n;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (keywordlen == 8 && !memcmp (keyword, "SERIALNO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
if (*serialno)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_CONFLICT); /* Unexpected status line. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
for (n=0,s=line; hexdigitp (s); s++, n++)
|
|
|
|
|
;
|
|
|
|
|
if (!n || (n&1)|| !(spacep (s) || !*s) )
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*serialno = xtrymalloc (n+1);
|
|
|
|
|
if (!*serialno)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
memcpy (*serialno, line, n);
|
|
|
|
|
(*serialno)[n] = 0;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the serial number of the card or an appropriate error. The
|
|
|
|
|
serial number is returned as a hexstring. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_serialno (ctrl_t ctrl, char **r_serialno)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *serialno = NULL;
|
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, "SERIALNO",
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
get_serialno_cb, &serialno);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (serialno);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_serialno = serialno;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
/* Handle the NEEDPIN inquiry. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct inq_needpin_s *parm = opaque;
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
const char *s;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char *pin;
|
|
|
|
|
size_t pinlen;
|
|
|
|
|
int rc;
|
|
|
|
|
|
2011-07-27 11:10:15 +02:00
|
|
|
|
parm->any_inq_seen = 1;
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if ((s = has_leading_keyword (line, "NEEDPIN")))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
line = s;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
pinlen = 90;
|
|
|
|
|
pin = gcry_malloc_secure (pinlen);
|
|
|
|
|
if (!pin)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, line, pin, pinlen);
|
|
|
|
|
if (!rc)
|
|
|
|
|
rc = assuan_send_data (parm->ctx, pin, pinlen);
|
|
|
|
|
xfree (pin);
|
|
|
|
|
}
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
|
2005-11-28 11:52:25 +00:00
|
|
|
|
{
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, s, NULL, 1);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
}
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
else if ((s = has_leading_keyword (line, "DISMISSPINPADPROMPT")))
|
2006-11-20 16:49:41 +00:00
|
|
|
|
{
|
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, "", NULL, 0);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
2007-07-05 16:58:19 +00:00
|
|
|
|
else if (parm->passthru)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *value;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
int rest;
|
|
|
|
|
int needrest = !strncmp (line, "KEYDATA", 8);
|
|
|
|
|
|
|
|
|
|
/* Pass the inquiry up to our caller. We limit the maximum
|
|
|
|
|
amount to an arbitrary value. As we know that the KEYDATA
|
|
|
|
|
enquiry is pretty sensitive we disable logging then */
|
|
|
|
|
if ((rest = (needrest
|
|
|
|
|
&& !assuan_get_flag (parm->passthru, ASSUAN_CONFIDENTIAL))))
|
|
|
|
|
assuan_begin_confidential (parm->passthru);
|
|
|
|
|
rc = assuan_inquire (parm->passthru, line, &value, &valuelen, 8096);
|
|
|
|
|
if (rest)
|
|
|
|
|
assuan_end_confidential (parm->passthru);
|
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if ((rest = (needrest
|
2007-07-05 16:58:19 +00:00
|
|
|
|
&& !assuan_get_flag (parm->ctx, ASSUAN_CONFIDENTIAL))))
|
|
|
|
|
assuan_begin_confidential (parm->ctx);
|
|
|
|
|
rc = assuan_send_data (parm->ctx, value, valuelen);
|
|
|
|
|
if (rest)
|
|
|
|
|
assuan_end_confidential (parm->ctx);
|
|
|
|
|
xfree (value);
|
|
|
|
|
}
|
|
|
|
|
else
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("error forwarding inquiry '%s': %s\n",
|
2007-07-05 16:58:19 +00:00
|
|
|
|
line, gpg_strerror (rc));
|
|
|
|
|
}
|
2005-11-28 11:52:25 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("unsupported inquiry '%s'\n", line);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-03-02 15:35:10 +01:00
|
|
|
|
/* Helper returning a command option to describe the used hash
|
|
|
|
|
algorithm. See scd/command.c:cmd_pksign. */
|
|
|
|
|
static const char *
|
|
|
|
|
hash_algo_option (int algo)
|
|
|
|
|
{
|
|
|
|
|
switch (algo)
|
|
|
|
|
{
|
|
|
|
|
case GCRY_MD_MD5 : return "--hash=md5";
|
|
|
|
|
case GCRY_MD_RMD160: return "--hash=rmd160";
|
|
|
|
|
case GCRY_MD_SHA1 : return "--hash=sha1";
|
|
|
|
|
case GCRY_MD_SHA224: return "--hash=sha224";
|
|
|
|
|
case GCRY_MD_SHA256: return "--hash=sha256";
|
|
|
|
|
case GCRY_MD_SHA384: return "--hash=sha384";
|
|
|
|
|
case GCRY_MD_SHA512: return "--hash=sha512";
|
|
|
|
|
default: return "";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2012-01-15 12:37:33 +01:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
cancel_inquire (ctrl_t ctrl, gpg_error_t rc)
|
2012-01-14 09:57:31 -05:00
|
|
|
|
{
|
|
|
|
|
gpg_error_t oldrc = rc;
|
|
|
|
|
|
|
|
|
|
/* The inquire callback was called and transact returned a
|
|
|
|
|
cancel error. We assume that the inquired process sent a
|
|
|
|
|
CANCEL. The passthrough code is not able to pass on the
|
|
|
|
|
CANCEL and thus scdaemon would stuck on this. As a
|
|
|
|
|
workaround we send a CANCEL now. */
|
|
|
|
|
rc = assuan_write_line (ctrl->scd_local->ctx, "CAN");
|
|
|
|
|
if (!rc) {
|
|
|
|
|
char *line;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
rc = assuan_read_line (ctrl->scd_local->ctx, &line, &len);
|
|
|
|
|
if (!rc)
|
|
|
|
|
rc = oldrc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-02 15:35:10 +01:00
|
|
|
|
/* Create a signature using the current card. MDALGO is either 0 or
|
|
|
|
|
gives the digest algorithm. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_pksign (ctrl_t ctrl,
|
|
|
|
|
const char *keyid,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t),
|
|
|
|
|
void *getpin_cb_arg,
|
2011-03-02 15:35:10 +01:00
|
|
|
|
int mdalgo,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
const unsigned char *indata, size_t indatalen,
|
2005-06-16 08:12:03 +00:00
|
|
|
|
unsigned char **r_buf, size_t *r_buflen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2014-12-02 14:13:53 +01:00
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
struct inq_needpin_s inqparm;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (indatalen*2 + 50 > DIM(line))
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_GENERAL));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2014-12-02 14:13:53 +01:00
|
|
|
|
bin2hex (indata, indatalen, stpcpy (line, "SETDATA "));
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
inqparm.ctx = ctrl->scd_local->ctx;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = 0;
|
2011-07-27 11:10:15 +02:00
|
|
|
|
inqparm.any_inq_seen = 0;
|
2011-03-02 15:35:10 +01:00
|
|
|
|
if (ctrl->use_auth_call)
|
|
|
|
|
snprintf (line, sizeof line, "PKAUTH %s", keyid);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, sizeof line, "PKSIGN %s %s",
|
|
|
|
|
hash_algo_option (mdalgo), keyid);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin, &inqparm,
|
|
|
|
|
NULL, NULL);
|
2012-01-25 18:14:51 -05:00
|
|
|
|
if (inqparm.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED ||
|
|
|
|
|
gpg_err_code(rc) == GPG_ERR_ASS_CANCELED))
|
2012-01-14 09:57:31 -05:00
|
|
|
|
rc = cancel_inquire (ctrl, rc);
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2013-02-28 11:17:47 +09:00
|
|
|
|
size_t len;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2013-02-28 11:17:47 +09:00
|
|
|
|
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-08-26 17:29:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check whether there is any padding info from scdaemon. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
padding_info_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
int *r_padding = opaque;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if ((s=has_leading_keyword (line, "PADDING")))
|
|
|
|
|
{
|
|
|
|
|
*r_padding = atoi (s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Decipher INDATA using the current card. Note that the returned
|
|
|
|
|
value is not an s-expression but the raw data as returned by
|
|
|
|
|
scdaemon. The padding information is stored at R_PADDING with -1
|
|
|
|
|
for not known. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_pkdecrypt (ctrl_t ctrl,
|
|
|
|
|
const char *keyid,
|
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t),
|
|
|
|
|
void *getpin_cb_arg,
|
|
|
|
|
const unsigned char *indata, size_t indatalen,
|
2013-08-26 17:29:54 +02:00
|
|
|
|
char **r_buf, size_t *r_buflen, int *r_padding)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc, i;
|
|
|
|
|
char *p, line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
struct inq_needpin_s inqparm;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2013-08-26 17:29:54 +02:00
|
|
|
|
*r_padding = -1; /* Unknown. */
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
/* FIXME: use secure memory where appropriate */
|
|
|
|
|
|
2012-11-06 12:02:25 +01:00
|
|
|
|
for (len = 0; len < indatalen;)
|
|
|
|
|
{
|
|
|
|
|
p = stpcpy (line, "SETDATA ");
|
|
|
|
|
if (len)
|
|
|
|
|
p = stpcpy (p, "--append ");
|
|
|
|
|
for (i=0; len < indatalen && (i*2 < DIM(line)-50); i++, len++)
|
|
|
|
|
{
|
|
|
|
|
sprintf (p, "%02X", indata[len]);
|
|
|
|
|
p += 2;
|
|
|
|
|
}
|
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
return unlock_scd (ctrl, rc);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
inqparm.ctx = ctrl->scd_local->ctx;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = 0;
|
2011-07-27 11:10:15 +02:00
|
|
|
|
inqparm.any_inq_seen = 0;
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "PKDECRYPT %s", keyid);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin, &inqparm,
|
2013-08-26 17:29:54 +02:00
|
|
|
|
padding_info_cb, r_padding);
|
2012-01-25 18:14:51 -05:00
|
|
|
|
if (inqparm.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED ||
|
|
|
|
|
gpg_err_code(rc) == GPG_ERR_ASS_CANCELED))
|
2012-01-14 09:57:31 -05:00
|
|
|
|
rc = cancel_inquire (ctrl, rc);
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
|
|
|
|
if (!*r_buf)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a certificate with ID into R_BUF and R_BUFLEN. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_readcert (ctrl_t ctrl,
|
|
|
|
|
const char *id, char **r_buf, size_t *r_buflen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "READCERT %s", id);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL,
|
|
|
|
|
NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
|
|
|
|
if (!*r_buf)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a key with ID and return it in an allocate buffer pointed to
|
|
|
|
|
by r_BUF as a valid S-expression. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_readkey (ctrl_t ctrl, const char *id, unsigned char **r_buf)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t len, buflen;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "READKEY %s", id);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL,
|
|
|
|
|
NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, &buflen);
|
|
|
|
|
if (!*r_buf)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
if (!gcry_sexp_canon_len (*r_buf, buflen, NULL, NULL))
|
|
|
|
|
{
|
|
|
|
|
xfree (*r_buf); *r_buf = NULL;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_INV_VALUE));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-06 14:00:05 +09:00
|
|
|
|
struct writekey_parm_s
|
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t);
|
|
|
|
|
void *getpin_cb_arg;
|
|
|
|
|
assuan_context_t passthru;
|
|
|
|
|
int any_inq_seen;
|
|
|
|
|
/**/
|
|
|
|
|
const unsigned char *keydata;
|
|
|
|
|
size_t keydatalen;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Handle a KEYDATA inquiry. Note, we only send the data,
|
|
|
|
|
assuan_transact takes care of flushing and writing the end */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
inq_writekey_parms (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct writekey_parm_s *parm = opaque;
|
|
|
|
|
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if (has_leading_keyword (line, "KEYDATA"))
|
2013-02-06 14:00:05 +09:00
|
|
|
|
return assuan_send_data (parm->ctx, parm->keydata, parm->keydatalen);
|
|
|
|
|
else
|
|
|
|
|
return inq_needpin (opaque, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
agent_card_writekey (ctrl_t ctrl, int force, const char *serialno,
|
|
|
|
|
const char *id, const char *keydata, size_t keydatalen,
|
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t),
|
|
|
|
|
void *getpin_cb_arg)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
struct writekey_parm_s parms;
|
|
|
|
|
|
|
|
|
|
(void)serialno;
|
|
|
|
|
rc = start_scd (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "WRITEKEY %s%s", force ? "--force " : "", id);
|
2013-02-06 14:00:05 +09:00
|
|
|
|
parms.ctx = ctrl->scd_local->ctx;
|
|
|
|
|
parms.getpin_cb = getpin_cb;
|
|
|
|
|
parms.getpin_cb_arg = getpin_cb_arg;
|
|
|
|
|
parms.passthru = 0;
|
|
|
|
|
parms.any_inq_seen = 0;
|
|
|
|
|
parms.keydata = keydata;
|
|
|
|
|
parms.keydatalen = keydatalen;
|
|
|
|
|
|
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, line, NULL, NULL,
|
|
|
|
|
inq_writekey_parms, &parms, NULL, NULL);
|
|
|
|
|
if (parms.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED ||
|
|
|
|
|
gpg_err_code(rc) == GPG_ERR_ASS_CANCELED))
|
|
|
|
|
rc = cancel_inquire (ctrl, rc);
|
|
|
|
|
return unlock_scd (ctrl, rc);
|
|
|
|
|
}
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
/* Type used with the card_getattr_cb. */
|
|
|
|
|
struct card_getattr_parm_s {
|
|
|
|
|
const char *keyword; /* Keyword to look for. */
|
|
|
|
|
size_t keywordlen; /* strlen of KEYWORD. */
|
|
|
|
|
char *data; /* Malloced and unescaped data. */
|
|
|
|
|
int error; /* ERRNO value or 0 on success. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Callback function for agent_card_getattr. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-02-24 21:40:48 +00:00
|
|
|
|
card_getattr_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct card_getattr_parm_s *parm = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
if (parm->data)
|
|
|
|
|
return 0; /* We want only the first occurrence. */
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (keywordlen == parm->keywordlen
|
|
|
|
|
&& !memcmp (keyword, parm->keyword, keywordlen))
|
|
|
|
|
{
|
2009-04-01 10:51:53 +00:00
|
|
|
|
parm->data = percent_plus_unescape ((const unsigned char*)line, 0xff);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!parm->data)
|
|
|
|
|
parm->error = errno;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Call the agent to retrieve a single line data object. On success
|
|
|
|
|
the object is malloced and stored at RESULT; it is guaranteed that
|
|
|
|
|
NULL is never stored in this case. On error an error code is
|
|
|
|
|
returned and NULL stored at RESULT. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
agent_card_getattr (ctrl_t ctrl, const char *name, char **result)
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
struct card_getattr_parm_s parm;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
*result = NULL;
|
|
|
|
|
|
|
|
|
|
if (!*name)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.keyword = name;
|
|
|
|
|
parm.keywordlen = strlen (name);
|
|
|
|
|
|
|
|
|
|
/* We assume that NAME does not need escaping. */
|
|
|
|
|
if (8 + strlen (name) > DIM(line)-1)
|
|
|
|
|
return gpg_error (GPG_ERR_TOO_LARGE);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
stpcpy (stpcpy (line, "GETATTR "), name);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
err = start_scd (ctrl);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
err = assuan_transact (ctrl->scd_local->ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
card_getattr_cb, &parm);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err && parm.error)
|
|
|
|
|
err = gpg_error_from_errno (parm.error);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err && !parm.data)
|
|
|
|
|
err = gpg_error (GPG_ERR_NO_DATA);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err)
|
|
|
|
|
*result = parm.data;
|
|
|
|
|
else
|
|
|
|
|
xfree (parm.data);
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, err);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_status_thru (void *opaque, const char *line)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char keyword[200];
|
|
|
|
|
int i;
|
|
|
|
|
|
2011-12-14 15:42:28 +01:00
|
|
|
|
if (line[0] == '#' && (!line[1] || spacep (line+1)))
|
|
|
|
|
{
|
|
|
|
|
/* We are called in convey comments mode. Now, if we see a
|
|
|
|
|
comment marker as keyword we forward the line verbatim to the
|
|
|
|
|
the caller. This way the comment lines from scdaemon won't
|
|
|
|
|
appear as status lines with keyword '#'. */
|
|
|
|
|
assuan_write_line (ctx, line);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (i=0; *line && !spacep (line) && i < DIM(keyword)-1; line++, i++)
|
|
|
|
|
keyword[i] = *line;
|
|
|
|
|
keyword[i] = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2011-12-14 15:42:28 +01:00
|
|
|
|
/* Truncate any remaining keyword stuff. */
|
|
|
|
|
for (; *line && !spacep (line); line++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
assuan_write_status (ctx, keyword, line);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* 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 <assuan.h> 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 <assuan.h> 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 <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> 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 <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> 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 <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> 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 <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_data_thru (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
assuan_send_data (ctx, buffer, length);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Send the line CMDLINE with command for the SCDdaemon to it and send
|
|
|
|
|
all status messages back. This command is used as a general quoting
|
2007-07-05 16:58:19 +00:00
|
|
|
|
mechanism to pass everything verbatim to SCDAEMON. The PIN
|
|
|
|
|
inquiry is handled inside gpg-agent. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_scd (ctrl_t ctrl, const char *cmdline,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int (*getpin_cb)(void *, const char *, char*, size_t),
|
|
|
|
|
void *getpin_cb_arg, void *assuan_context)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct inq_needpin_s inqparm;
|
2010-08-11 13:11:04 +00:00
|
|
|
|
int saveflag;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
inqparm.ctx = ctrl->scd_local->ctx;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = assuan_context;
|
2011-07-27 11:10:15 +02:00
|
|
|
|
inqparm.any_inq_seen = 0;
|
2010-08-11 13:11:04 +00:00
|
|
|
|
saveflag = assuan_get_flag (ctrl->scd_local->ctx, ASSUAN_CONVEY_COMMENTS);
|
|
|
|
|
assuan_set_flag (ctrl->scd_local->ctx, ASSUAN_CONVEY_COMMENTS, 1);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
rc = assuan_transact (ctrl->scd_local->ctx, cmdline,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_data_thru, assuan_context,
|
|
|
|
|
inq_needpin, &inqparm,
|
|
|
|
|
pass_status_thru, assuan_context);
|
2011-07-27 11:10:15 +02:00
|
|
|
|
if (inqparm.any_inq_seen && gpg_err_code(rc) == GPG_ERR_ASS_CANCELED)
|
2012-01-14 09:57:31 -05:00
|
|
|
|
rc = cancel_inquire (ctrl, rc);
|
2011-07-09 08:25:22 -04:00
|
|
|
|
|
2010-08-11 13:11:04 +00:00
|
|
|
|
assuan_set_flag (ctrl->scd_local->ctx, ASSUAN_CONVEY_COMMENTS, saveflag);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|