2003-08-05 19:11:04 +02:00
|
|
|
|
/* command.c - SCdaemon command handler
|
2007-07-05 18:58:19 +02:00
|
|
|
|
* Copyright (C) 2001, 2002, 2003, 2004, 2005,
|
2009-03-18 12:18:56 +01:00
|
|
|
|
* 2007, 2008, 2009 Free Software Foundation, Inc.
|
2003-08-05 19:11:04 +02: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 21:49:40 +02:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 19:11:04 +02: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
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <unistd.h>
|
2004-04-21 16:44:09 +02:00
|
|
|
|
#include <signal.h>
|
2005-04-14 19:25:43 +02:00
|
|
|
|
#ifdef USE_GNU_PTH
|
|
|
|
|
# include <pth.h>
|
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
#include "scdaemon.h"
|
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 02:01:25 +02:00
|
|
|
|
#include <assuan.h>
|
2003-11-12 16:17:44 +01:00
|
|
|
|
#include <ksba.h>
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include "app-common.h"
|
2004-01-27 17:40:42 +01:00
|
|
|
|
#include "apdu.h" /* Required for apdu_*_reader (). */
|
2006-09-07 17:13:33 +02:00
|
|
|
|
#include "exechelp.h"
|
2007-04-03 18:57:37 +02:00
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
#include "ccid-driver.h"
|
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-21 16:44:09 +02:00
|
|
|
|
/* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#define MAXLEN_PIN 100
|
|
|
|
|
|
2005-05-20 22:39:36 +02:00
|
|
|
|
/* Maximum allowed size of key data as used in inquiries. */
|
|
|
|
|
#define MAXLEN_KEYDATA 4096
|
|
|
|
|
|
2008-09-23 11:57:45 +02:00
|
|
|
|
/* Maximum allowed size of certificate data as used in inquiries. */
|
|
|
|
|
#define MAXLEN_CERTDATA 16384
|
|
|
|
|
|
2004-04-21 16:44:09 +02:00
|
|
|
|
|
2006-09-06 18:35:52 +02:00
|
|
|
|
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
2009-07-16 17:54:59 +02:00
|
|
|
|
/* Macro to flag a removed card. ENODEV is also tested to catch teh
|
|
|
|
|
case of a removed reader. */
|
2005-02-24 18:36:11 +01:00
|
|
|
|
#define TEST_CARD_REMOVAL(c,r) \
|
|
|
|
|
do { \
|
|
|
|
|
int _r = (r); \
|
|
|
|
|
if (gpg_err_code (_r) == GPG_ERR_CARD_NOT_PRESENT \
|
2009-07-16 17:54:59 +02:00
|
|
|
|
|| gpg_err_code (_r) == GPG_ERR_CARD_REMOVED \
|
|
|
|
|
|| gpg_err_code (_r) == GPG_ERR_ENODEV ) \
|
2005-04-14 19:25:43 +02:00
|
|
|
|
update_card_removed ((c)->reader_slot, 1); \
|
2005-02-24 18:36:11 +01:00
|
|
|
|
} while (0)
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
#define IS_LOCKED(c) \
|
|
|
|
|
(locked_session && locked_session != (c)->server_local \
|
|
|
|
|
&& (c)->reader_slot != -1 && locked_session->ctrl_backlink \
|
|
|
|
|
&& (c)->reader_slot == locked_session->ctrl_backlink->reader_slot)
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* This structure is used to keep track of open readers (slots). */
|
|
|
|
|
struct slot_status_s
|
|
|
|
|
{
|
|
|
|
|
int valid; /* True if the other objects are valid. */
|
|
|
|
|
int slot; /* Slot number of the reader or -1 if not open. */
|
|
|
|
|
|
|
|
|
|
int reset_failed; /* A reset failed. */
|
|
|
|
|
|
|
|
|
|
int any; /* Flag indicating whether any status check has been
|
|
|
|
|
done. This is set once to indicate that the status
|
|
|
|
|
tracking for the slot has been initialized. */
|
|
|
|
|
unsigned int status; /* Last status of the slot. */
|
2008-11-03 20:09:34 +01:00
|
|
|
|
unsigned int changed; /* Last change counter of the slot. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* Data used to associate an Assuan context with local server data.
|
|
|
|
|
This object describes the local properties of one session. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
struct server_local_s
|
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* We keep a list of all active sessions with the anchor at
|
|
|
|
|
SESSION_LIST (see below). This field is used for linking. */
|
|
|
|
|
struct server_local_s *next_session;
|
|
|
|
|
|
|
|
|
|
/* This object is usually assigned to a CTRL object (which is
|
2005-06-07 21:09:18 +02:00
|
|
|
|
globally visible). While enumerating all sessions we sometimes
|
2005-04-14 19:25:43 +02:00
|
|
|
|
need to access data of the CTRL object; thus we keep a
|
|
|
|
|
backpointer here. */
|
|
|
|
|
ctrl_t ctrl_backlink;
|
|
|
|
|
|
|
|
|
|
/* The Assuan context used by this session/server. */
|
2005-02-24 18:36:11 +01:00
|
|
|
|
assuan_context_t assuan_ctx;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2008-10-14 20:18:21 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
unsigned long event_signal; /* Or 0 if not used. */
|
|
|
|
|
#else
|
|
|
|
|
int event_signal; /* Or 0 if not used. */
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* True if the card has been removed and a reset is required to
|
|
|
|
|
continue operation. */
|
|
|
|
|
int card_removed;
|
2008-11-11 09:22:06 +01:00
|
|
|
|
|
2009-03-24 12:40:57 +01:00
|
|
|
|
/* Flag indicating that the application context needs to be released
|
|
|
|
|
at the next opportunity. */
|
|
|
|
|
int app_ctx_marked_for_release;
|
|
|
|
|
|
2008-11-11 09:22:06 +01:00
|
|
|
|
/* A disconnect command has been sent. */
|
|
|
|
|
int disconnect_allowed;
|
2009-02-27 15:36:59 +01:00
|
|
|
|
|
|
|
|
|
/* If set to true we will be terminate ourself at the end of the
|
|
|
|
|
this session. */
|
|
|
|
|
int stopme;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2006-09-02 16:47:47 +02:00
|
|
|
|
/* The table with information on all used slots. FIXME: This is a
|
|
|
|
|
different slot number than the one used by the APDU layer, and
|
|
|
|
|
should be renamed. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
static struct slot_status_s slot_table[10];
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* To keep track of all running sessions, we link all active server
|
|
|
|
|
contexts and the anchor in this variable. */
|
|
|
|
|
static struct server_local_s *session_list;
|
|
|
|
|
|
|
|
|
|
/* If a session has been locked we store a link to its server object
|
|
|
|
|
in this variable. */
|
|
|
|
|
static struct server_local_s *locked_session;
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* While doing a reset we need to make sure that the ticker does not
|
|
|
|
|
call scd_update_reader_status_file while we are using it. */
|
2007-06-14 19:05:07 +02:00
|
|
|
|
static pth_mutex_t status_file_update_lock;
|
2006-03-01 12:05:47 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-- Local prototypes --*/
|
2008-11-03 20:09:34 +01:00
|
|
|
|
static void update_reader_status_file (int set_card_removed_flag);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-06-14 19:05:07 +02: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
|
|
|
|
|
static initialization because Pth emulation code might not be able
|
|
|
|
|
to do a static init; in particular, it is not possible for W32. */
|
|
|
|
|
void
|
|
|
|
|
initialize_module_command (void)
|
|
|
|
|
{
|
|
|
|
|
static int initialized;
|
|
|
|
|
|
|
|
|
|
if (!initialized)
|
|
|
|
|
{
|
|
|
|
|
if (pth_mutex_init (&status_file_update_lock))
|
|
|
|
|
initialized = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* Update the CARD_REMOVED element of all sessions using the reader
|
2009-03-24 12:40:57 +01:00
|
|
|
|
given by SLOT to VALUE. */
|
2005-04-14 19:25:43 +02:00
|
|
|
|
static void
|
|
|
|
|
update_card_removed (int slot, int value)
|
|
|
|
|
{
|
|
|
|
|
struct server_local_s *sl;
|
|
|
|
|
|
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
|
|
|
|
if (sl->ctrl_backlink
|
|
|
|
|
&& sl->ctrl_backlink->reader_slot == slot)
|
2006-03-01 12:05:47 +01:00
|
|
|
|
{
|
|
|
|
|
sl->card_removed = value;
|
|
|
|
|
}
|
2008-10-14 20:18:21 +02:00
|
|
|
|
/* Let the card application layer know about the removal. */
|
2006-02-09 19:29:31 +01:00
|
|
|
|
if (value)
|
2008-11-03 20:09:34 +01:00
|
|
|
|
application_notify_card_reset (slot);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-03-18 12:18:56 +01:00
|
|
|
|
/* Check whether the option NAME appears in LINE. Returns 1 or 0. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static int
|
|
|
|
|
has_option (const char *line, const char *name)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int n = strlen (name);
|
|
|
|
|
|
|
|
|
|
s = strstr (line, name);
|
|
|
|
|
return (s && (s == line || spacep (s-1)) && (!s[n] || spacep (s+n)));
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-05 18:58:19 +02:00
|
|
|
|
/* Same as has_option but does only test for the name of the option
|
|
|
|
|
and ignores an argument, i.e. with NAME being "--hash" it would
|
|
|
|
|
return a pointer for "--hash" as well as for "--hash=foo". If
|
2009-05-13 19:12:00 +02:00
|
|
|
|
there is no such option NULL is returned. The pointer returned
|
2007-07-05 18:58:19 +02:00
|
|
|
|
points right behind the option name, this may be an equal sign, Nul
|
|
|
|
|
or a space. */
|
|
|
|
|
static const char *
|
|
|
|
|
has_option_name (const char *line, const char *name)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int n = strlen (name);
|
|
|
|
|
|
|
|
|
|
s = strstr (line, name);
|
|
|
|
|
return (s && (s == line || spacep (s-1))
|
|
|
|
|
&& (!s[n] || spacep (s+n) || s[n] == '=')) ? (s+n) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Skip over options. It is assumed that leading spaces have been
|
|
|
|
|
removed (this is the case for lines passed to a handler from
|
|
|
|
|
assuan). Blanks after the options are also removed. */
|
|
|
|
|
static char *
|
|
|
|
|
skip_options (char *line)
|
|
|
|
|
{
|
|
|
|
|
while ( *line == '-' && line[1] == '-' )
|
|
|
|
|
{
|
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
}
|
|
|
|
|
return line;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2006-04-11 15:53:21 +02:00
|
|
|
|
/* Convert the STRING into a newly allocated buffer while translating
|
|
|
|
|
the hex numbers. Stops at the first invalid character. Blanks and
|
|
|
|
|
colons are allowed to separate the hex digits. Returns NULL on
|
|
|
|
|
error or a newly malloced buffer and its length in LENGTH. */
|
|
|
|
|
static unsigned char *
|
|
|
|
|
hex_to_buffer (const char *string, size_t *r_length)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
const char *s;
|
|
|
|
|
size_t n;
|
|
|
|
|
|
|
|
|
|
buffer = xtrymalloc (strlen (string)+1);
|
|
|
|
|
if (!buffer)
|
|
|
|
|
return NULL;
|
|
|
|
|
for (s=string, n=0; *s; s++)
|
|
|
|
|
{
|
|
|
|
|
if (spacep (s) || *s == ':')
|
|
|
|
|
continue;
|
|
|
|
|
if (hexdigitp (s) && hexdigitp (s+1))
|
|
|
|
|
{
|
|
|
|
|
buffer[n++] = xtoi_2 (s);
|
|
|
|
|
s++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
*r_length = n;
|
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* Reset the card and free the application context. With SEND_RESET
|
2008-11-03 20:09:34 +01:00
|
|
|
|
set to true actually send a RESET to the reader; this is the normal
|
|
|
|
|
way of calling the function. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void
|
2006-03-01 12:05:47 +01:00
|
|
|
|
do_reset (ctrl_t ctrl, int send_reset)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
int slot = ctrl->reader_slot;
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!(slot == -1 || (slot >= 0 && slot < DIM(slot_table))))
|
|
|
|
|
BUG ();
|
|
|
|
|
|
2009-03-24 12:40:57 +01:00
|
|
|
|
/* If there is an active application, release it. Tell all other
|
|
|
|
|
sessions using the same application to release the
|
|
|
|
|
application. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (ctrl->app_ctx)
|
|
|
|
|
{
|
2004-01-29 21:17:51 +01:00
|
|
|
|
release_application (ctrl->app_ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
ctrl->app_ctx = NULL;
|
2009-03-24 12:40:57 +01:00
|
|
|
|
if (send_reset)
|
|
|
|
|
{
|
|
|
|
|
struct server_local_s *sl;
|
|
|
|
|
|
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
|
|
|
|
if (sl->ctrl_backlink
|
|
|
|
|
&& sl->ctrl_backlink->reader_slot == slot)
|
|
|
|
|
{
|
|
|
|
|
sl->app_ctx_marked_for_release = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-04-20 16:17:10 +02:00
|
|
|
|
}
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2008-11-03 20:09:34 +01:00
|
|
|
|
/* If we want a real reset for the card, send the reset APDU and
|
|
|
|
|
tell the application layer about it. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (slot != -1 && send_reset && !IS_LOCKED (ctrl) )
|
|
|
|
|
{
|
|
|
|
|
if (apdu_reset (slot))
|
2004-04-20 16:17:10 +02:00
|
|
|
|
{
|
2006-03-01 12:05:47 +01:00
|
|
|
|
slot_table[slot].reset_failed = 1;
|
2004-04-20 16:17:10 +02:00
|
|
|
|
}
|
2008-11-03 20:09:34 +01:00
|
|
|
|
application_notify_card_reset (slot);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2006-03-01 12:05:47 +01:00
|
|
|
|
|
|
|
|
|
/* If we hold a lock, unlock now. */
|
|
|
|
|
if (locked_session && ctrl->server_local == locked_session)
|
|
|
|
|
{
|
|
|
|
|
locked_session = NULL;
|
|
|
|
|
log_info ("implicitly unlocking due to RESET\n");
|
|
|
|
|
}
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2008-11-03 20:09:34 +01:00
|
|
|
|
/* Reset the card removed flag for the current reader. We need to
|
|
|
|
|
take the lock here so that the ticker thread won't concurrently
|
|
|
|
|
try to update the file. Calling update_reader_status_file is
|
|
|
|
|
required to get hold of the new status of the card in the slot
|
|
|
|
|
table. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!pth_mutex_acquire (&status_file_update_lock, 0, NULL))
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to acquire status_fle_update lock\n");
|
2006-08-30 17:57:17 +02:00
|
|
|
|
ctrl->reader_slot = -1;
|
2006-03-01 12:05:47 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
2008-11-03 20:09:34 +01:00
|
|
|
|
update_reader_status_file (0); /* Update slot status table. */
|
|
|
|
|
update_card_removed (slot, 0); /* Clear card_removed flag. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!pth_mutex_release (&status_file_update_lock))
|
|
|
|
|
log_error ("failed to release status_file_update lock\n");
|
2006-08-30 17:57:17 +02:00
|
|
|
|
|
2008-11-03 20:09:34 +01:00
|
|
|
|
/* Do this last, so that the update_card_removed above does its job. */
|
2006-08-30 17:57:17 +02:00
|
|
|
|
ctrl->reader_slot = -1;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 16:17:10 +02:00
|
|
|
|
|
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
2009-11-02 18:47:11 +01:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
reset_notify (assuan_context_t ctx, char *line)
|
2004-04-20 16:17:10 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2004-04-20 16:17:10 +02:00
|
|
|
|
|
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
2009-11-02 18:47:11 +01:00
|
|
|
|
(void) line;
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
do_reset (ctrl, 1);
|
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
2009-11-02 18:47:11 +01:00
|
|
|
|
return 0;
|
2004-04-20 16:17:10 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02: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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
option_handler (assuan_context_t ctx, const char *key, const char *value)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2004-04-21 16:44:09 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
if (!strcmp (key, "event-signal"))
|
|
|
|
|
{
|
|
|
|
|
/* A value of 0 is allowed to reset the event signal. */
|
2008-10-14 20:18:21 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
if (!*value)
|
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
|
|
|
|
ctrl->server_local->event_signal = strtoul (value, NULL, 16);
|
|
|
|
|
#else
|
2004-04-21 16:44:09 +02:00
|
|
|
|
int i = *value? atoi (value) : -1;
|
|
|
|
|
if (i < 0)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
2004-04-21 16:44:09 +02:00
|
|
|
|
ctrl->server_local->event_signal = i;
|
2008-10-14 20:18:21 +02:00
|
|
|
|
#endif
|
2004-04-21 16:44:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* Return the slot of the current reader or open the reader if no
|
|
|
|
|
other sessions are using a reader. Note, that we currently support
|
|
|
|
|
only one reader but most of the code (except for this function)
|
|
|
|
|
should be able to cope with several readers. */
|
|
|
|
|
static int
|
|
|
|
|
get_reader_slot (void)
|
|
|
|
|
{
|
2006-03-01 12:05:47 +01:00
|
|
|
|
struct slot_status_s *ss;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
ss = &slot_table[0]; /* One reader for now. */
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* Initialize the item if needed. */
|
|
|
|
|
if (!ss->valid)
|
|
|
|
|
{
|
|
|
|
|
ss->slot = -1;
|
|
|
|
|
ss->valid = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try to open the reader. */
|
|
|
|
|
if (ss->slot == -1)
|
|
|
|
|
ss->slot = apdu_open_reader (opt.reader_port);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2006-09-02 16:47:47 +02:00
|
|
|
|
/* Return the slot_table index. */
|
|
|
|
|
return 0;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* If the card has not yet been opened, do it. Note that this
|
|
|
|
|
function returns an Assuan error, so don't map the error a second
|
2006-09-01 15:57:33 +02:00
|
|
|
|
time. */
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2004-04-20 16:17:10 +02:00
|
|
|
|
open_card (ctrl_t ctrl, const char *apptype)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-02-24 18:36:11 +01:00
|
|
|
|
gpg_error_t err;
|
2004-01-27 17:40:42 +01:00
|
|
|
|
int slot;
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
/* If we ever got a card not present error code, return that. Only
|
|
|
|
|
the SERIALNO command and a reset are able to clear from that
|
|
|
|
|
state. */
|
|
|
|
|
if (ctrl->server_local->card_removed)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return gpg_error (GPG_ERR_CARD_REMOVED);
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2009-03-24 12:40:57 +01:00
|
|
|
|
/* If the application has been marked for release do it now. We
|
|
|
|
|
can't do it immediately in do_reset because the application may
|
|
|
|
|
still be in use. */
|
|
|
|
|
if (ctrl->server_local->app_ctx_marked_for_release)
|
2006-02-09 19:29:31 +01:00
|
|
|
|
{
|
2009-03-24 12:40:57 +01:00
|
|
|
|
ctrl->server_local->app_ctx_marked_for_release = 0;
|
|
|
|
|
release_application (ctrl->app_ctx);
|
|
|
|
|
ctrl->app_ctx = NULL;
|
2006-02-09 19:29:31 +01:00
|
|
|
|
}
|
2005-06-03 15:57:24 +02:00
|
|
|
|
|
2009-03-24 12:40:57 +01:00
|
|
|
|
/* If we are already initialized for one specific application we
|
|
|
|
|
need to check that the client didn't requested a specific
|
|
|
|
|
application different from the one in use before we continue. */
|
|
|
|
|
if (ctrl->app_ctx)
|
|
|
|
|
return check_application_conflict (ctrl, apptype);
|
|
|
|
|
|
|
|
|
|
/* Setup the slot and select the application. */
|
2004-04-20 16:17:10 +02:00
|
|
|
|
if (ctrl->reader_slot != -1)
|
|
|
|
|
slot = ctrl->reader_slot;
|
|
|
|
|
else
|
2005-04-14 19:25:43 +02:00
|
|
|
|
slot = get_reader_slot ();
|
2004-04-20 16:17:10 +02:00
|
|
|
|
ctrl->reader_slot = slot;
|
2005-02-24 18:36:11 +01:00
|
|
|
|
if (slot == -1)
|
|
|
|
|
err = gpg_error (GPG_ERR_CARD);
|
|
|
|
|
else
|
2008-10-14 20:18:21 +02:00
|
|
|
|
{
|
|
|
|
|
/* Fixme: We should move the apdu_connect call to
|
|
|
|
|
select_application. */
|
2008-11-11 09:22:06 +01:00
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
ctrl->server_local->disconnect_allowed = 0;
|
|
|
|
|
sw = apdu_connect (slot);
|
2008-10-14 20:18:21 +02:00
|
|
|
|
if (sw && sw != SW_HOST_ALREADY_CONNECTED)
|
2008-10-21 15:53:08 +02:00
|
|
|
|
{
|
|
|
|
|
if (sw == SW_HOST_NO_CARD)
|
|
|
|
|
err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
|
|
|
|
|
else
|
|
|
|
|
err = gpg_error (GPG_ERR_CARD);
|
|
|
|
|
}
|
2008-10-14 20:18:21 +02:00
|
|
|
|
else
|
|
|
|
|
err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
|
|
|
|
|
}
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, err);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return err;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_serialno[] =
|
|
|
|
|
"SERIALNO [<apptype>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Return the serial number of the card using a status reponse. This\n"
|
|
|
|
|
"function should be used to check for the presence of a card.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If APPTYPE is given, an application of that type is selected and an\n"
|
|
|
|
|
"error is returned if the application is not supported or available.\n"
|
|
|
|
|
"The default is to auto-select the application using a hardwired\n"
|
|
|
|
|
"preference system. Note, that a future extension to this function\n"
|
|
|
|
|
"may allow to specify a list and order of applications to try.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This function is special in that it can be used to reset the card.\n"
|
|
|
|
|
"Most other functions will return an error when a card change has\n"
|
|
|
|
|
"been detected and the use of this function is therefore required.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Background: We want to keep the client clear of handling card\n"
|
|
|
|
|
"changes between operations; i.e. the client can assume that all\n"
|
|
|
|
|
"operations are done on the same card unless he calls this function.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-02-24 22:40:48 +01:00
|
|
|
|
cmd_serialno (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-02-24 18:36:11 +01:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc = 0;
|
|
|
|
|
char *serial_and_stamp;
|
|
|
|
|
char *serial;
|
|
|
|
|
time_t stamp;
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
/* Clear the remove flag so that the open_card is able to reread it. */
|
2005-02-24 22:40:48 +01:00
|
|
|
|
if (ctrl->server_local->card_removed)
|
2005-04-14 19:25:43 +02:00
|
|
|
|
{
|
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2006-03-01 12:05:47 +01:00
|
|
|
|
do_reset (ctrl, 1);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, *line? line:NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
2005-04-27 14:09:21 +02:00
|
|
|
|
rc = app_get_serial_and_stamp (ctrl->app_ctx, &serial, &stamp);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2005-04-27 14:09:21 +02:00
|
|
|
|
|
2008-10-29 09:45:13 +01:00
|
|
|
|
rc = estream_asprintf (&serial_and_stamp, "%s %lu",
|
|
|
|
|
serial, (unsigned long)stamp);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
xfree (serial);
|
|
|
|
|
if (rc < 0)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
rc = 0;
|
|
|
|
|
assuan_write_status (ctx, "SERIALNO", serial_and_stamp);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
xfree (serial_and_stamp);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_learn[] =
|
|
|
|
|
"LEARN [--force] [--keypairinfo]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Learn all useful information of the currently inserted card. When\n"
|
|
|
|
|
"used without the force options, the command might do an INQUIRE\n"
|
|
|
|
|
"like this:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" INQUIRE KNOWNCARDP <hexstring_with_serialNumber> <timestamp>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The client should just send an \"END\" if the processing should go on\n"
|
|
|
|
|
"or a \"CANCEL\" to force the function to terminate with a Cancel\n"
|
|
|
|
|
"error message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"With the option --keypairinfo only KEYPARIINFO lstatus lines are\n"
|
|
|
|
|
"returned.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The response of this command is a list of status lines formatted as\n"
|
|
|
|
|
"this:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S APPTYPE <apptype>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This returns the type of the application, currently the strings:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" P15 = PKCS-15 structure used\n"
|
|
|
|
|
" DINSIG = DIN SIG\n"
|
|
|
|
|
" OPENPGP = OpenPGP card\n"
|
|
|
|
|
" NKS = NetKey card\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"are implemented. These strings are aliases for the AID\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S KEYPAIRINFO <hexstring_with_keygrip> <hexstring_with_id>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If there is no certificate yet stored on the card a single 'X' is\n"
|
|
|
|
|
"returned as the keygrip. In addition to the keypair info, information\n"
|
|
|
|
|
"about all certificates stored on the card is also returned:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S CERTINFO <certtype> <hexstring_with_id>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Where CERTTYPE is a number indicating the type of certificate:\n"
|
|
|
|
|
" 0 := Unknown\n"
|
|
|
|
|
" 100 := Regular X.509 cert\n"
|
|
|
|
|
" 101 := Trusted X.509 cert\n"
|
|
|
|
|
" 102 := Useful X.509 cert\n"
|
|
|
|
|
" 110 := Root CA cert in a special format (e.g. DINSIG)\n"
|
|
|
|
|
" 111 := Root CA cert as standard X509 cert.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"For certain cards, more information will be returned:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S KEY-FPR <no> <hexstring>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"For OpenPGP cards this returns the stored fingerprints of the\n"
|
|
|
|
|
"keys. This can be used check whether a key is available on the\n"
|
|
|
|
|
"card. NO may be 1, 2 or 3.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S CA-FPR <no> <hexstring>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Similar to above, these are the fingerprints of keys assumed to be\n"
|
|
|
|
|
"ultimately trusted.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S DISP-NAME <name_of_card_holder>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The name of the card holder as stored on the card; percent\n"
|
|
|
|
|
"escaping takes place, spaces are encoded as '+'\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S PUBKEY-URL <url>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The URL to be used for locating the entire public key.\n"
|
|
|
|
|
" \n"
|
|
|
|
|
"Note, that this function may even be used on a locked card.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_learn (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc = 0;
|
2009-03-18 12:18:56 +01:00
|
|
|
|
int only_keypairinfo = has_option (line, "--keypairinfo");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
/* Unless the force option is used we try a shortcut by identifying
|
|
|
|
|
the card using a serial number and inquiring the client with
|
|
|
|
|
that. The client may choose to cancel the operation if he already
|
|
|
|
|
knows about this card */
|
2009-03-18 12:18:56 +01:00
|
|
|
|
if (!only_keypairinfo)
|
|
|
|
|
{
|
|
|
|
|
char *serial_and_stamp;
|
|
|
|
|
char *serial;
|
|
|
|
|
time_t stamp;
|
|
|
|
|
|
|
|
|
|
rc = app_get_serial_and_stamp (ctrl->app_ctx, &serial, &stamp);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
rc = estream_asprintf (&serial_and_stamp, "%s %lu",
|
|
|
|
|
serial, (unsigned long)stamp);
|
|
|
|
|
xfree (serial);
|
|
|
|
|
if (rc < 0)
|
|
|
|
|
return out_of_core ();
|
|
|
|
|
rc = 0;
|
|
|
|
|
assuan_write_status (ctx, "SERIALNO", serial_and_stamp);
|
|
|
|
|
|
|
|
|
|
if (!has_option (line, "--force"))
|
|
|
|
|
{
|
|
|
|
|
char *command;
|
|
|
|
|
|
|
|
|
|
rc = estream_asprintf (&command, "KNOWNCARDP %s", serial_and_stamp);
|
|
|
|
|
if (rc < 0)
|
|
|
|
|
{
|
|
|
|
|
xfree (serial_and_stamp);
|
|
|
|
|
return out_of_core ();
|
|
|
|
|
}
|
|
|
|
|
rc = 0;
|
|
|
|
|
rc = assuan_inquire (ctx, command, NULL, NULL, 0);
|
|
|
|
|
xfree (command);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
if (gpg_err_code (rc) != GPG_ERR_ASS_CANCELED)
|
|
|
|
|
log_error ("inquire KNOWNCARDP failed: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
xfree (serial_and_stamp);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
/* Not canceled, so we have to proceeed. */
|
|
|
|
|
}
|
|
|
|
|
xfree (serial_and_stamp);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-27 14:09:21 +02:00
|
|
|
|
/* Let the application print out its collection of useful status
|
2004-01-27 17:40:42 +01:00
|
|
|
|
information. */
|
2005-04-27 14:09:21 +02:00
|
|
|
|
if (!rc)
|
2009-03-18 12:18:56 +01:00
|
|
|
|
rc = app_write_learn_status (ctrl->app_ctx, ctrl, only_keypairinfo);
|
2004-01-27 17:40:42 +01:00
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_readcert[] =
|
|
|
|
|
"READCERT <hexified_certid>|<keyid>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Note, that this function may even be used on a locked card.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_readcert (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *cert;
|
|
|
|
|
size_t ncert;
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
line = xstrdup (line); /* Need a copy of the line. */
|
2005-04-27 14:09:21 +02:00
|
|
|
|
rc = app_readcert (ctrl->app_ctx, line, &cert, &ncert);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
|
2004-01-27 17:40:42 +01:00
|
|
|
|
xfree (line);
|
|
|
|
|
line = NULL;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, cert, ncert);
|
|
|
|
|
xfree (cert);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_readkey[] =
|
|
|
|
|
"READKEY <keyid>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Return the public key for the given cert or key ID as a standard\n"
|
|
|
|
|
"S-expression.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Note, that this function may even be used on a locked card.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-02-22 18:29:07 +01:00
|
|
|
|
cmd_readkey (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-02-22 18:29:07 +01:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *cert = NULL;
|
|
|
|
|
size_t ncert, n;
|
2003-12-17 13:27:51 +01:00
|
|
|
|
ksba_cert_t kc = NULL;
|
|
|
|
|
ksba_sexp_t p;
|
2005-04-27 14:09:21 +02:00
|
|
|
|
unsigned char *pk;
|
|
|
|
|
size_t pklen;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
line = xstrdup (line); /* Need a copy of the line. */
|
2005-04-27 14:09:21 +02:00
|
|
|
|
/* If the application supports the READKEY function we use that.
|
|
|
|
|
Otherwise we use the old way by extracting it from the
|
|
|
|
|
certificate. */
|
|
|
|
|
rc = app_readkey (ctrl->app_ctx, line, &pk, &pklen);
|
|
|
|
|
if (!rc)
|
|
|
|
|
{ /* Yeah, got that key - send it back. */
|
|
|
|
|
rc = assuan_send_data (ctx, pk, pklen);
|
|
|
|
|
xfree (pk);
|
|
|
|
|
xfree (line);
|
|
|
|
|
line = NULL;
|
|
|
|
|
goto leave;
|
2004-01-27 17:40:42 +01:00
|
|
|
|
}
|
2005-04-27 14:09:21 +02:00
|
|
|
|
|
|
|
|
|
if (gpg_err_code (rc) != GPG_ERR_UNSUPPORTED_OPERATION)
|
|
|
|
|
log_error ("app_readkey failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
2004-01-27 17:40:42 +01:00
|
|
|
|
{
|
2005-04-27 14:09:21 +02:00
|
|
|
|
rc = app_readcert (ctrl->app_ctx, line, &cert, &ncert);
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if (rc)
|
2005-04-27 14:09:21 +02:00
|
|
|
|
log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2004-01-27 17:40:42 +01:00
|
|
|
|
xfree (line);
|
|
|
|
|
line = NULL;
|
|
|
|
|
if (rc)
|
|
|
|
|
goto leave;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2003-11-12 16:17:44 +01:00
|
|
|
|
rc = ksba_cert_new (&kc);
|
|
|
|
|
if (rc)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
xfree (cert);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
rc = ksba_cert_init_from_mem (kc, cert, ncert);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2003-11-12 16:17:44 +01:00
|
|
|
|
log_error ("failed to parse the certificate: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = ksba_cert_get_public_key (kc);
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_PUBKEY);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = gcry_sexp_canon_len (p, 0, NULL, NULL);
|
|
|
|
|
rc = assuan_send_data (ctx, p, n);
|
|
|
|
|
xfree (p);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
ksba_cert_release (kc);
|
|
|
|
|
xfree (cert);
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_setdata[] =
|
|
|
|
|
"SETDATA <hexstring> \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The client should use this command to tell us the data he want to sign.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_setdata (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int n;
|
|
|
|
|
char *p;
|
|
|
|
|
unsigned char *buf;
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if (locked_session && locked_session != ctrl->server_local)
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
|
|
|
|
/* Parse the hexstring. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
for (p=line,n=0; hexdigitp (p); p++, n++)
|
|
|
|
|
;
|
|
|
|
|
if (*p)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "invalid hexstring");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!n)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no data given");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if ((n&1))
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "odd number of digits");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
n /= 2;
|
|
|
|
|
buf = xtrymalloc (n);
|
|
|
|
|
if (!buf)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2009-10-28 13:02:15 +01:00
|
|
|
|
xfree (ctrl->in_data.value);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
ctrl->in_data.value = buf;
|
|
|
|
|
ctrl->in_data.valuelen = n;
|
|
|
|
|
for (p=line, n=0; n < ctrl->in_data.valuelen; p += 2, n++)
|
|
|
|
|
buf[n] = xtoi_2 (p);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
static gpg_error_t
|
2003-08-05 19:11:04 +02:00
|
|
|
|
pin_cb (void *opaque, const char *info, char **retstr)
|
|
|
|
|
{
|
2005-04-11 18:20:10 +02:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
char *command;
|
|
|
|
|
int rc;
|
2003-11-12 16:17:44 +01:00
|
|
|
|
unsigned char *value;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
size_t valuelen;
|
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (!retstr)
|
|
|
|
|
{
|
|
|
|
|
/* We prompt for keypad entry. To make sure that the popup has
|
|
|
|
|
been show we use an inquire and not just a status message.
|
|
|
|
|
We ignore any value returned. */
|
|
|
|
|
if (info)
|
|
|
|
|
{
|
|
|
|
|
log_debug ("prompting for keypad entry '%s'\n", info);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
rc = estream_asprintf (&command, "POPUPKEYPADPROMPT %s", info);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (rc < 0)
|
|
|
|
|
return gpg_error (gpg_err_code_from_errno (errno));
|
|
|
|
|
rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
xfree (command);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_debug ("dismiss keypad entry prompt\n");
|
|
|
|
|
rc = assuan_inquire (ctx, "DISMISSKEYPADPROMPT",
|
|
|
|
|
&value, &valuelen, MAXLEN_PIN);
|
|
|
|
|
}
|
|
|
|
|
if (!rc)
|
|
|
|
|
xfree (value);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*retstr = NULL;
|
|
|
|
|
log_debug ("asking for PIN '%s'\n", info);
|
|
|
|
|
|
2008-08-31 13:55:09 +02:00
|
|
|
|
rc = estream_asprintf (&command, "NEEDPIN %s", info);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc < 0)
|
2004-03-16 11:49:37 +01:00
|
|
|
|
return gpg_error (gpg_err_code_from_errno (errno));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-27 14:09:21 +02:00
|
|
|
|
/* Fixme: Write an inquire function which returns the result in
|
2005-09-06 20:42:13 +02:00
|
|
|
|
secure memory and check all further handling of the PIN. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
xfree (command);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (!valuelen || value[valuelen-1])
|
|
|
|
|
{
|
|
|
|
|
/* We require that the returned value is an UTF-8 string */
|
|
|
|
|
xfree (value);
|
|
|
|
|
return gpg_error (GPG_ERR_INV_RESPONSE);
|
|
|
|
|
}
|
2005-06-16 10:12:03 +02:00
|
|
|
|
*retstr = (char*)value;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_pksign[] =
|
|
|
|
|
"PKSIGN [--hash=[rmd160|sha{1,224,256,384,512}|md5]] <hexified_id>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The --hash option is optional; the default is SHA1.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_pksign (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
2006-03-21 13:48:51 +01:00
|
|
|
|
int hash_algo;
|
|
|
|
|
|
|
|
|
|
if (has_option (line, "--hash=rmd160"))
|
|
|
|
|
hash_algo = GCRY_MD_RMD160;
|
|
|
|
|
else if (has_option (line, "--hash=sha1"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA1;
|
2009-03-26 20:27:04 +01:00
|
|
|
|
else if (has_option (line, "--hash=sha224"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA224;
|
|
|
|
|
else if (has_option (line, "--hash=sha256"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA256;
|
|
|
|
|
else if (has_option (line, "--hash=sha384"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA384;
|
|
|
|
|
else if (has_option (line, "--hash=sha512"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA512;
|
2006-03-21 13:48:51 +01:00
|
|
|
|
else if (has_option (line, "--hash=md5"))
|
|
|
|
|
hash_algo = GCRY_MD_MD5;
|
|
|
|
|
else if (!strstr (line, "--"))
|
|
|
|
|
hash_algo = GCRY_MD_SHA1;
|
|
|
|
|
else
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "invalid hash algorithm");
|
2008-09-23 11:57:45 +02:00
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
/* We have to use a copy of the key ID because the function may use
|
|
|
|
|
the pin_cb which in turn uses the assuan line buffer and thus
|
|
|
|
|
overwriting the original line with the keyid */
|
2003-08-25 11:58:02 +02:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-27 14:09:21 +02:00
|
|
|
|
rc = app_sign (ctrl->app_ctx,
|
2006-03-21 13:48:51 +01:00
|
|
|
|
keyidstr, hash_algo,
|
2005-04-27 14:09:21 +02:00
|
|
|
|
pin_cb, ctx,
|
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen);
|
|
|
|
|
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 14:46:06 +02:00
|
|
|
|
log_error ("app_sign failed: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_pkauth[] =
|
|
|
|
|
"PKAUTH <hexified_id>";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_pkauth (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
2006-03-21 13:48:51 +01:00
|
|
|
|
/* We have to use a copy of the key ID because the function may use
|
2003-08-05 19:11:04 +02:00
|
|
|
|
the pin_cb which in turn uses the assuan line buffer and thus
|
|
|
|
|
overwriting the original line with the keyid */
|
2003-08-25 11:58:02 +02:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
rc = app_auth (ctrl->app_ctx,
|
|
|
|
|
keyidstr,
|
|
|
|
|
pin_cb, ctx,
|
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen);
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 14:46:06 +02:00
|
|
|
|
log_error ("app_auth failed: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_pkdecrypt[] =
|
|
|
|
|
"PKDECRYPT <hexified_id>";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_pkdecrypt (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
2003-08-25 11:58:02 +02:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2005-04-27 14:09:21 +02:00
|
|
|
|
rc = app_decipher (ctrl->app_ctx,
|
|
|
|
|
keyidstr,
|
|
|
|
|
pin_cb, ctx,
|
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen);
|
|
|
|
|
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 14:46:06 +02:00
|
|
|
|
log_error ("app_decipher failed: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_getattr[] =
|
|
|
|
|
"GETATTR <name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This command is used to retrieve data from a smartcard. The\n"
|
|
|
|
|
"allowed names depend on the currently selected smartcard\n"
|
|
|
|
|
"application. NAME must be percent and '+' escaped. The value is\n"
|
|
|
|
|
"returned through status message, see the LEARN command for details.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"However, the current implementation assumes that Name is not escaped;\n"
|
|
|
|
|
"this works as long as noone uses arbitrary escaping. \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Note, that this function may even be used on a locked card.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_getattr (assuan_context_t ctx, char *line)
|
2003-09-30 19:35:05 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-09-30 19:35:05 +02:00
|
|
|
|
int rc;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
const char *keyword;
|
2003-09-30 19:35:05 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-09-30 19:35:05 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
keyword = line;
|
|
|
|
|
for (; *line && !spacep (line); line++)
|
|
|
|
|
;
|
|
|
|
|
if (*line)
|
|
|
|
|
*line++ = 0;
|
|
|
|
|
|
|
|
|
|
/* (We ignore any garbage for now.) */
|
|
|
|
|
|
2006-10-02 13:54:35 +02:00
|
|
|
|
/* FIXME: Applications should not return sensitive data if the card
|
2005-04-11 18:20:10 +02:00
|
|
|
|
is locked. */
|
2003-09-30 19:35:05 +02:00
|
|
|
|
rc = app_getattr (ctrl->app_ctx, ctrl, keyword);
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-09-30 19:35:05 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_setattr[] =
|
|
|
|
|
"SETATTR <name> <value> \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This command is used to store data on a a smartcard. The allowed\n"
|
|
|
|
|
"names and values are depend on the currently selected smartcard\n"
|
|
|
|
|
"application. NAME and VALUE must be percent and '+' escaped.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"However, the current implementation assumes that NAME is not\n"
|
|
|
|
|
"escaped; this works as long as noone uses arbitrary escaping.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"A PIN will be requested for most NAMEs. See the corresponding\n"
|
|
|
|
|
"setattr function of the actually used application (app-*.c) for\n"
|
|
|
|
|
"details.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_setattr (assuan_context_t ctx, char *orig_line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
char *keyword;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
size_t nbytes;
|
2003-08-25 11:58:02 +02:00
|
|
|
|
char *line, *linebuf;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
2003-08-25 11:58:02 +02:00
|
|
|
|
/* We need to use a copy of LINE, because PIN_CB uses the same
|
|
|
|
|
context and thus reuses the Assuan provided LINE. */
|
|
|
|
|
line = linebuf = xtrystrdup (orig_line);
|
|
|
|
|
if (!line)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-25 11:58:02 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
keyword = line;
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
if (*line)
|
|
|
|
|
*line++ = 0;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
2009-04-01 12:51:53 +02:00
|
|
|
|
nbytes = percent_plus_unescape_inplace (line, 0);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-06-16 10:12:03 +02:00
|
|
|
|
rc = app_setattr (ctrl->app_ctx, keyword, pin_cb, ctx,
|
|
|
|
|
(const unsigned char*)line, nbytes);
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (linebuf);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-20 22:39:36 +02:00
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_writecert[] =
|
|
|
|
|
"WRITECERT <hexified_certid>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This command is used to store a certifciate on a smartcard. The\n"
|
|
|
|
|
"allowed certids depend on the currently selected smartcard\n"
|
|
|
|
|
"application. The actual certifciate is requested using the inquiry\n"
|
|
|
|
|
"\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"In almost all cases a a PIN will be requested. See the related\n"
|
|
|
|
|
"writecert function of the actually used application (app-*.c) for\n"
|
|
|
|
|
"details.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2008-09-23 11:57:45 +02:00
|
|
|
|
cmd_writecert (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc;
|
|
|
|
|
char *certid;
|
|
|
|
|
unsigned char *certdata;
|
|
|
|
|
size_t certdatalen;
|
|
|
|
|
|
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no certid given");
|
|
|
|
|
certid = line;
|
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
certid = xtrystrdup (certid);
|
|
|
|
|
if (!certid)
|
|
|
|
|
return out_of_core ();
|
|
|
|
|
|
|
|
|
|
/* Now get the actual keydata. */
|
|
|
|
|
rc = assuan_inquire (ctx, "CERTDATA",
|
|
|
|
|
&certdata, &certdatalen, MAXLEN_CERTDATA);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (certid);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write the certificate to the card. */
|
|
|
|
|
rc = app_writecert (ctrl->app_ctx, ctrl, certid,
|
|
|
|
|
pin_cb, ctx, certdata, certdatalen);
|
|
|
|
|
xfree (certid);
|
|
|
|
|
xfree (certdata);
|
|
|
|
|
|
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_writekey[] =
|
|
|
|
|
"WRITEKEY [--force] <keyid> \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This command is used to store a secret key on a a smartcard. The\n"
|
|
|
|
|
"allowed keyids depend on the currently selected smartcard\n"
|
|
|
|
|
"application. The actual keydata is requested using the inquiry\n"
|
|
|
|
|
"\"KEYDATA\" and need to be provided without any protection. With\n"
|
|
|
|
|
"--force set an existing key under this KEYID will get overwritten.\n"
|
|
|
|
|
"The keydata is expected to be the usual canonical encoded\n"
|
|
|
|
|
"S-expression.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"A PIN will be requested for most NAMEs. See the corresponding\n"
|
|
|
|
|
"writekey function of the actually used application (app-*.c) for\n"
|
|
|
|
|
"details.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-05-20 22:39:36 +02:00
|
|
|
|
cmd_writekey (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc;
|
|
|
|
|
char *keyid;
|
|
|
|
|
int force = has_option (line, "--force");
|
|
|
|
|
unsigned char *keydata;
|
|
|
|
|
size_t keydatalen;
|
|
|
|
|
|
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
|
|
|
|
|
2008-09-23 11:57:45 +02:00
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2005-05-20 22:39:36 +02:00
|
|
|
|
if (!*line)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no keyid given");
|
2005-05-20 22:39:36 +02:00
|
|
|
|
keyid = line;
|
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
keyid = xtrystrdup (keyid);
|
|
|
|
|
if (!keyid)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2005-05-20 22:39:36 +02:00
|
|
|
|
|
|
|
|
|
/* Now get the actual keydata. */
|
2007-07-05 18:58:19 +02:00
|
|
|
|
assuan_begin_confidential (ctx);
|
2005-05-20 22:39:36 +02:00
|
|
|
|
rc = assuan_inquire (ctx, "KEYDATA", &keydata, &keydatalen, MAXLEN_KEYDATA);
|
2007-07-05 18:58:19 +02:00
|
|
|
|
assuan_end_confidential (ctx);
|
2005-05-20 22:39:36 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (keyid);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write the key to the card. */
|
|
|
|
|
rc = app_writekey (ctrl->app_ctx, ctrl, keyid, force? 1:0,
|
|
|
|
|
pin_cb, ctx, keydata, keydatalen);
|
|
|
|
|
xfree (keyid);
|
|
|
|
|
xfree (keydata);
|
|
|
|
|
|
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2005-05-20 22:39:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_genkey[] =
|
|
|
|
|
"GENKEY [--force] [--timestamp=<isodate>] <no>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Generate a key on-card identified by NO, which is application\n"
|
|
|
|
|
"specific. Return values are application specific. For OpenPGP\n"
|
|
|
|
|
"cards 2 status lines are returned:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" S KEY-FPR <hexstring>\n"
|
|
|
|
|
" S KEY-CREATED-AT <seconds_since_epoch>\n"
|
|
|
|
|
" S KEY-DATA [p|n] <hexdata>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"--force is required to overwrite an already existing key. The\n"
|
|
|
|
|
"KEY-CREATED-AT is required for further processing because it is\n"
|
|
|
|
|
"part of the hashed key material for the fingerprint.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If --timestamp is given an OpenPGP key will be created using this\n"
|
|
|
|
|
"value. The value needs to be in ISO Format; e.g.\n"
|
|
|
|
|
"\"--timestamp=20030316T120000\" and after 1970-01-01 00:00:00.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"The public part of the key can also later be retrieved using the\n"
|
|
|
|
|
"READKEY command.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_genkey (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
char *keyno;
|
2007-07-05 18:58:19 +02:00
|
|
|
|
int force;
|
|
|
|
|
const char *s;
|
|
|
|
|
time_t timestamp;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2007-07-05 18:58:19 +02:00
|
|
|
|
force = has_option (line, "--force");
|
|
|
|
|
|
|
|
|
|
if ((s=has_option_name (line, "--timestamp")))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2007-07-05 18:58:19 +02:00
|
|
|
|
if (*s != '=')
|
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
|
|
|
|
|
timestamp = isotime2epoch (s+1);
|
|
|
|
|
if (timestamp < 1)
|
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "invalid time value");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2007-07-05 18:58:19 +02:00
|
|
|
|
else
|
|
|
|
|
timestamp = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!*line)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
keyno = line;
|
2003-10-25 16:22:42 +02:00
|
|
|
|
while (*line && !spacep (line))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
2003-08-25 11:58:02 +02:00
|
|
|
|
keyno = xtrystrdup (keyno);
|
|
|
|
|
if (!keyno)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2007-07-05 18:58:19 +02:00
|
|
|
|
rc = app_genkey (ctrl->app_ctx, ctrl, keyno, force? 1:0,
|
|
|
|
|
timestamp, pin_cb, ctx);
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (keyno);
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_random[] =
|
|
|
|
|
"RANDOM <nbytes>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Get NBYTES of random from the card and send them back as data.\n"
|
|
|
|
|
"This usually involves EEPROM write on the card and thus excessive\n"
|
|
|
|
|
"use of this command may destroy the card.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Note, that this function may be even be used on a locked card.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_random (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
size_t nbytes;
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
2009-11-04 13:22:09 +01:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER,
|
|
|
|
|
"number of requested bytes missing");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
nbytes = strtoul (line, NULL, 0);
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
buffer = xtrymalloc (nbytes);
|
|
|
|
|
if (!buffer)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
rc = app_get_challenge (ctrl->app_ctx, nbytes, buffer);
|
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, buffer, nbytes);
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_passwd[] =
|
|
|
|
|
"PASSWD [--reset] [--nullpin] <chvno>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Change the PIN or, if --reset is given, reset the retry counter of\n"
|
|
|
|
|
"the card holder verfication vector CHVNO. The option --nullpin is\n"
|
|
|
|
|
"used for TCOS cards to set the initial PIN. The format of CHVNO\n"
|
|
|
|
|
"depends on the card application.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_passwd (assuan_context_t ctx, char *line)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int rc;
|
|
|
|
|
char *chvnostr;
|
2008-06-24 18:00:29 +02:00
|
|
|
|
unsigned int flags = 0;
|
|
|
|
|
|
|
|
|
|
if (has_option (line, "--reset"))
|
|
|
|
|
flags |= APP_CHANGE_FLAG_RESET;
|
|
|
|
|
if (has_option (line, "--nullpin"))
|
|
|
|
|
flags |= APP_CHANGE_FLAG_NULLPIN;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2008-09-23 11:57:45 +02:00
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!*line)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no CHV number given");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
chvnostr = line;
|
2003-10-25 16:22:42 +02:00
|
|
|
|
while (*line && !spacep (line))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
2003-08-25 11:58:02 +02:00
|
|
|
|
|
|
|
|
|
chvnostr = xtrystrdup (chvnostr);
|
|
|
|
|
if (!chvnostr)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2008-06-24 18:00:29 +02:00
|
|
|
|
rc = app_change_pin (ctrl->app_ctx, ctrl, chvnostr, flags, pin_cb, ctx);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("command passwd failed: %s\n", gpg_strerror (rc));
|
2003-08-25 11:58:02 +02:00
|
|
|
|
xfree (chvnostr);
|
2005-02-24 18:36:11 +01:00
|
|
|
|
|
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_checkpin[] =
|
|
|
|
|
"CHECKPIN <idstr>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Perform a VERIFY operation without doing anything else. This may\n"
|
|
|
|
|
"be used to initialize a the PIN cache earlier to long lasting\n"
|
|
|
|
|
"operations. Its use is highly application dependent.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"For OpenPGP:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Perform a simple verify operation for CHV1 and CHV2, so that\n"
|
|
|
|
|
" further operations won't ask for CHV2 and it is possible to do a\n"
|
|
|
|
|
" cheap check on the PIN: If there is something wrong with the PIN\n"
|
|
|
|
|
" entry system, only the regular CHV will get blocked and not the\n"
|
|
|
|
|
" dangerous CHV3. IDSTR is the usual card's serial number in hex\n"
|
|
|
|
|
" notation; an optional fingerprint part will get ignored. There\n"
|
|
|
|
|
" is however a special mode if the IDSTR is sffixed with the\n"
|
|
|
|
|
" literal string \"[CHV3]\": In this case the Admin PIN is checked\n"
|
|
|
|
|
" if and only if the retry counter is still at 3.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"For Netkey:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Any of the valid PIN Ids may be used. These are the strings:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" PW1.CH - Global password 1\n"
|
|
|
|
|
" PW2.CH - Global password 2\n"
|
|
|
|
|
" PW1.CH.SIG - SigG password 1\n"
|
|
|
|
|
" PW2.CH.SIG - SigG password 2\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" For a definitive list, see the implementation in app-nks.c.\n"
|
|
|
|
|
" Note that we call a PW2.* PIN a \"PUK\" despite that since TCOS\n"
|
|
|
|
|
" 3.0 they are technically alternative PINs used to mutally\n"
|
|
|
|
|
" unblock each other.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-11 18:20:10 +02:00
|
|
|
|
cmd_checkpin (assuan_context_t ctx, char *line)
|
2003-10-21 19:12:50 +02:00
|
|
|
|
{
|
2005-04-14 19:25:43 +02:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-10-21 19:12:50 +02:00
|
|
|
|
int rc;
|
2009-03-05 20:19:37 +01:00
|
|
|
|
char *idstr;
|
2003-10-21 19:12:50 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 11:33:07 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 18:20:10 +02:00
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
2003-10-21 19:12:50 +02:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!ctrl->app_ctx)
|
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
/* We have to use a copy of the key ID because the function may use
|
|
|
|
|
the pin_cb which in turn uses the assuan line buffer and thus
|
|
|
|
|
overwriting the original line with the keyid. */
|
2009-03-05 20:19:37 +01:00
|
|
|
|
idstr = xtrystrdup (line);
|
|
|
|
|
if (!idstr)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return out_of_core ();
|
2003-10-21 19:12:50 +02:00
|
|
|
|
|
2009-03-05 20:19:37 +01:00
|
|
|
|
rc = app_check_pin (ctrl->app_ctx, idstr, pin_cb, ctx);
|
|
|
|
|
xfree (idstr);
|
2003-10-21 19:12:50 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("app_check_pin failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2003-10-21 19:12:50 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_lock[] =
|
|
|
|
|
"LOCK [--wait]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Grant exclusive card access to this session. Note that there is\n"
|
|
|
|
|
"no lock counter used and a second lock from the same session will\n"
|
|
|
|
|
"be ignored. A single unlock (or RESET) unlocks the session.\n"
|
|
|
|
|
"Return GPG_ERR_LOCKED if another session has locked the reader.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If the option --wait is given the command will wait until a\n"
|
|
|
|
|
"lock has been released.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-14 19:25:43 +02:00
|
|
|
|
cmd_lock (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
|
|
retry:
|
|
|
|
|
if (locked_session)
|
|
|
|
|
{
|
|
|
|
|
if (locked_session != ctrl->server_local)
|
2005-04-21 11:33:07 +02:00
|
|
|
|
rc = gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
locked_session = ctrl->server_local;
|
|
|
|
|
|
|
|
|
|
#ifdef USE_GNU_PTH
|
|
|
|
|
if (rc && has_option (line, "--wait"))
|
|
|
|
|
{
|
2006-02-09 19:29:31 +01:00
|
|
|
|
rc = 0;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
pth_sleep (1); /* Better implement an event mechanism. However,
|
|
|
|
|
for card operations this should be
|
|
|
|
|
sufficient. */
|
2006-02-09 19:29:31 +01:00
|
|
|
|
/* FIXME: Need to check that the connection is still alive.
|
|
|
|
|
This can be done by issuing status messages. */
|
2005-04-14 19:25:43 +02:00
|
|
|
|
goto retry;
|
|
|
|
|
}
|
|
|
|
|
#endif /*USE_GNU_PTH*/
|
|
|
|
|
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("cmd_lock failed: %s\n", gpg_strerror (rc));
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_unlock[] =
|
|
|
|
|
"UNLOCK\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Release exclusive card access.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-04-14 19:25:43 +02:00
|
|
|
|
cmd_unlock (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
if (locked_session)
|
|
|
|
|
{
|
|
|
|
|
if (locked_session != ctrl->server_local)
|
2005-04-21 11:33:07 +02:00
|
|
|
|
rc = gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
else
|
|
|
|
|
locked_session = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NOT_LOCKED);
|
|
|
|
|
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("cmd_unlock failed: %s\n", gpg_strerror (rc));
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_getinfo[] =
|
|
|
|
|
"GETINFO <what>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Multi purpose command to return certain information. \n"
|
|
|
|
|
"Supported values of WHAT are:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"version - Return the version of the program.\n"
|
|
|
|
|
"pid - Return the process id of the server.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"socket_name - Return the name of the socket.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"status - Return the status of the current slot (in the future, may\n"
|
|
|
|
|
"also return the status of all slots). The status is a list of\n"
|
|
|
|
|
"one-character flags. The following flags are currently defined:\n"
|
|
|
|
|
" 'u' Usable card present. This is the normal state during operation.\n"
|
|
|
|
|
" 'r' Card removed. A reset is necessary.\n"
|
|
|
|
|
"These flags are exclusive.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"reader_list - Return a list of detected card readers. Does\n"
|
|
|
|
|
" currently only work with the internal CCID driver.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"deny_admin - Returns OK if admin commands are not allowed or\n"
|
|
|
|
|
" GPG_ERR_GENERAL if admin commands are allowed.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"app_list - Return a list of supported applications. One\n"
|
|
|
|
|
" application per line, fields delimited by colons,\n"
|
|
|
|
|
" first field is the name.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2005-05-18 12:48:06 +02:00
|
|
|
|
cmd_getinfo (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2007-07-04 11:34:28 +02:00
|
|
|
|
if (!strcmp (line, "version"))
|
|
|
|
|
{
|
|
|
|
|
const char *s = VERSION;
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
}
|
2007-10-02 18:30:58 +02:00
|
|
|
|
else if (!strcmp (line, "pid"))
|
|
|
|
|
{
|
|
|
|
|
char numbuf[50];
|
|
|
|
|
|
|
|
|
|
snprintf (numbuf, sizeof numbuf, "%lu", (unsigned long)getpid ());
|
|
|
|
|
rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
|
|
|
|
|
}
|
2007-07-04 11:34:28 +02:00
|
|
|
|
else if (!strcmp (line, "socket_name"))
|
2005-05-18 12:48:06 +02:00
|
|
|
|
{
|
|
|
|
|
const char *s = scd_get_socket_name ();
|
|
|
|
|
|
|
|
|
|
if (s)
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_DATA);
|
|
|
|
|
}
|
2006-09-01 15:57:33 +02:00
|
|
|
|
else if (!strcmp (line, "status"))
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int slot = ctrl->reader_slot;
|
|
|
|
|
char flag = 'r';
|
|
|
|
|
|
|
|
|
|
if (!ctrl->server_local->card_removed && slot != -1)
|
|
|
|
|
{
|
|
|
|
|
struct slot_status_s *ss;
|
|
|
|
|
|
|
|
|
|
if (!(slot >= 0 && slot < DIM(slot_table)))
|
|
|
|
|
BUG ();
|
|
|
|
|
|
|
|
|
|
ss = &slot_table[slot];
|
|
|
|
|
|
|
|
|
|
if (!ss->valid)
|
|
|
|
|
BUG ();
|
|
|
|
|
|
|
|
|
|
if (ss->any && (ss->status & 1))
|
|
|
|
|
flag = 'u';
|
|
|
|
|
}
|
|
|
|
|
rc = assuan_send_data (ctx, &flag, 1);
|
|
|
|
|
}
|
2007-04-03 18:57:37 +02:00
|
|
|
|
else if (!strcmp (line, "reader_list"))
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
char *s = ccid_get_reader_list ();
|
|
|
|
|
#else
|
|
|
|
|
char *s = NULL;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (s)
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_DATA);
|
|
|
|
|
xfree (s);
|
|
|
|
|
}
|
2009-02-12 18:45:40 +01:00
|
|
|
|
else if (!strcmp (line, "deny_admin"))
|
|
|
|
|
rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
|
2009-02-27 15:36:59 +01:00
|
|
|
|
else if (!strcmp (line, "app_list"))
|
|
|
|
|
{
|
|
|
|
|
char *s = get_supported_applications ();
|
|
|
|
|
if (s)
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
else
|
|
|
|
|
rc = 0;
|
|
|
|
|
xfree (s);
|
|
|
|
|
}
|
2005-05-18 12:48:06 +02:00
|
|
|
|
else
|
2006-09-06 18:35:52 +02:00
|
|
|
|
rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
|
2005-05-18 12:48:06 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_restart[] =
|
|
|
|
|
"RESTART\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Restart the current connection; this is a kind of warm reset. It\n"
|
|
|
|
|
"deletes the context used by this connection but does not send a\n"
|
|
|
|
|
"RESET to the card. Thus the card itself won't get reset. \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"This is used by gpg-agent to reuse a primary pipe connection and\n"
|
|
|
|
|
"may be used by clients to backup from a conflict in the serial\n"
|
|
|
|
|
"command; i.e. to select another application.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2006-02-09 19:29:31 +01:00
|
|
|
|
cmd_restart (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2006-02-09 19:29:31 +01:00
|
|
|
|
if (ctrl->app_ctx)
|
|
|
|
|
{
|
|
|
|
|
release_application (ctrl->app_ctx);
|
|
|
|
|
ctrl->app_ctx = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (locked_session && ctrl->server_local == locked_session)
|
|
|
|
|
{
|
|
|
|
|
locked_session = NULL;
|
|
|
|
|
log_info ("implicitly unlocking due to RESTART\n");
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_disconnect[] =
|
|
|
|
|
"DISCONNECT\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Disconnect the card if it is not any longer used by other\n"
|
|
|
|
|
"connections and the backend supports a disconnect operation.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2008-10-17 21:18:46 +02:00
|
|
|
|
cmd_disconnect (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
2008-11-11 09:22:06 +01:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)line;
|
2008-11-11 09:22:06 +01:00
|
|
|
|
|
|
|
|
|
ctrl->server_local->disconnect_allowed = 1;
|
|
|
|
|
return 0;
|
2008-10-17 21:18:46 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_apdu[] =
|
|
|
|
|
"APDU [--atr] [--more] [--exlen[=N]] [hexstring]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Send an APDU to the current reader. This command bypasses the high\n"
|
|
|
|
|
"level functions and sends the data directly to the card. HEXSTRING\n"
|
|
|
|
|
"is expected to be a proper APDU. If HEXSTRING is not given no\n"
|
|
|
|
|
"commands are set to the card but the command will implictly check\n"
|
|
|
|
|
"whether the card is ready for use. \n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Using the option \"--atr\" returns the ATR of the card as a status\n"
|
|
|
|
|
"message before any data like this:\n"
|
|
|
|
|
" S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Using the option --more handles the card status word MORE_DATA\n"
|
|
|
|
|
"(61xx) and concatenates all reponses to one block.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Using the option \"--exlen\" the returned APDU may use extended\n"
|
|
|
|
|
"length up to N bytes. If N is not given a default value is used\n"
|
|
|
|
|
"(currently 4096).";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2006-04-11 15:53:21 +02:00
|
|
|
|
cmd_apdu (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *apdu;
|
|
|
|
|
size_t apdulen;
|
|
|
|
|
int with_atr;
|
|
|
|
|
int handle_more;
|
2009-05-13 19:12:00 +02:00
|
|
|
|
const char *s;
|
|
|
|
|
size_t exlen;
|
2006-04-11 15:53:21 +02:00
|
|
|
|
|
|
|
|
|
with_atr = has_option (line, "--atr");
|
|
|
|
|
handle_more = has_option (line, "--more");
|
|
|
|
|
|
2009-05-13 19:12:00 +02:00
|
|
|
|
if ((s=has_option_name (line, "--exlen")))
|
|
|
|
|
{
|
|
|
|
|
if (*s == '=')
|
|
|
|
|
exlen = strtoul (s+1, NULL, 0);
|
|
|
|
|
else
|
|
|
|
|
exlen = 4096;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
exlen = 0;
|
|
|
|
|
|
2008-09-23 11:57:45 +02:00
|
|
|
|
line = skip_options (line);
|
2006-04-11 15:53:21 +02:00
|
|
|
|
|
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
|
|
|
|
|
|
|
|
|
if ((rc = open_card (ctrl, NULL)))
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (with_atr)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *atr;
|
|
|
|
|
size_t atrlen;
|
|
|
|
|
char hexbuf[400];
|
|
|
|
|
|
|
|
|
|
atr = apdu_get_atr (ctrl->reader_slot, &atrlen);
|
|
|
|
|
if (!atr || atrlen > sizeof hexbuf - 2 )
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error (GPG_ERR_INV_CARD);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2008-11-03 11:54:18 +01:00
|
|
|
|
bin2hex (atr, atrlen, hexbuf);
|
2006-04-11 15:53:21 +02:00
|
|
|
|
xfree (atr);
|
|
|
|
|
send_status_info (ctrl, "CARD-ATR", hexbuf, strlen (hexbuf), NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
apdu = hex_to_buffer (line, &apdulen);
|
|
|
|
|
if (!apdu)
|
|
|
|
|
{
|
2006-09-14 18:50:33 +02:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2006-04-11 15:53:21 +02:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (apdulen)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *result = NULL;
|
|
|
|
|
size_t resultlen;
|
|
|
|
|
|
2009-05-13 19:12:00 +02:00
|
|
|
|
rc = apdu_send_direct (ctrl->reader_slot, exlen,
|
|
|
|
|
apdu, apdulen, handle_more,
|
2006-04-11 15:53:21 +02:00
|
|
|
|
&result, &resultlen);
|
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, result, resultlen);
|
|
|
|
|
xfree (result);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
xfree (apdu);
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
TEST_CARD_REMOVAL (ctrl, rc);
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return rc;
|
2006-04-11 15:53:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 13:22:09 +01:00
|
|
|
|
static const char hlp_killscd[] =
|
|
|
|
|
"KILLSCD\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Commit suicide.";
|
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 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2009-02-27 15:36:59 +01:00
|
|
|
|
cmd_killscd (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
(void)line;
|
|
|
|
|
|
|
|
|
|
ctrl->server_local->stopme = 1;
|
|
|
|
|
return gpg_error (GPG_ERR_EOF);
|
|
|
|
|
}
|
2006-04-11 15:53:21 +02:00
|
|
|
|
|
2003-10-21 19:12:50 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/* Tell the assuan library about our commands */
|
|
|
|
|
static int
|
2005-04-14 19:25:43 +02:00
|
|
|
|
register_commands (assuan_context_t ctx)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
static struct {
|
|
|
|
|
const char *name;
|
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
2009-11-02 18:47:11 +01:00
|
|
|
|
assuan_handler_t handler;
|
2009-11-04 13:22:09 +01:00
|
|
|
|
const char * const help;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
} table[] = {
|
2009-11-04 13:22:09 +01:00
|
|
|
|
{ "SERIALNO", cmd_serialno, hlp_serialno },
|
|
|
|
|
{ "LEARN", cmd_learn, hlp_learn },
|
|
|
|
|
{ "READCERT", cmd_readcert, hlp_readcert },
|
|
|
|
|
{ "READKEY", cmd_readkey, hlp_readkey },
|
|
|
|
|
{ "SETDATA", cmd_setdata, hlp_setdata },
|
|
|
|
|
{ "PKSIGN", cmd_pksign, hlp_pksign },
|
|
|
|
|
{ "PKAUTH", cmd_pkauth, hlp_pkauth },
|
|
|
|
|
{ "PKDECRYPT", cmd_pkdecrypt,hlp_pkdecrypt },
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ "INPUT", NULL },
|
|
|
|
|
{ "OUTPUT", NULL },
|
2009-11-04 13:22:09 +01:00
|
|
|
|
{ "GETATTR", cmd_getattr, hlp_getattr },
|
|
|
|
|
{ "SETATTR", cmd_setattr, hlp_setattr },
|
|
|
|
|
{ "WRITECERT", cmd_writecert,hlp_writecert },
|
|
|
|
|
{ "WRITEKEY", cmd_writekey, hlp_writekey },
|
|
|
|
|
{ "GENKEY", cmd_genkey, hlp_genkey },
|
|
|
|
|
{ "RANDOM", cmd_random, hlp_random },
|
|
|
|
|
{ "PASSWD", cmd_passwd, hlp_passwd },
|
|
|
|
|
{ "CHECKPIN", cmd_checkpin, hlp_checkpin },
|
|
|
|
|
{ "LOCK", cmd_lock, hlp_lock },
|
|
|
|
|
{ "UNLOCK", cmd_unlock, hlp_unlock },
|
|
|
|
|
{ "GETINFO", cmd_getinfo, hlp_getinfo },
|
|
|
|
|
{ "RESTART", cmd_restart, hlp_restart },
|
|
|
|
|
{ "DISCONNECT", cmd_disconnect,hlp_disconnect },
|
|
|
|
|
{ "APDU", cmd_apdu, hlp_apdu },
|
|
|
|
|
{ "KILLSCD", cmd_killscd, hlp_killscd },
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
|
|
|
|
int i, rc;
|
|
|
|
|
|
|
|
|
|
for (i=0; table[i].name; i++)
|
|
|
|
|
{
|
2009-11-04 13:22:09 +01:00
|
|
|
|
rc = assuan_register_command (ctx, table[i].name, table[i].handler,
|
|
|
|
|
table[i].help);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
assuan_set_hello_line (ctx, "GNU Privacy Guard's Smartcard server ready");
|
|
|
|
|
|
|
|
|
|
assuan_register_reset_notify (ctx, reset_notify);
|
|
|
|
|
assuan_register_option_handler (ctx, option_handler);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
/* Startup the server. If FD is given as -1 this is simple pipe
|
2008-10-15 15:23:10 +02:00
|
|
|
|
server, otherwise it is a regular server. Returns true if there
|
|
|
|
|
are no more active asessions. */
|
|
|
|
|
int
|
2006-11-20 17:49:41 +01:00
|
|
|
|
scd_command_handler (ctrl_t ctrl, int fd)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
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 02:01:25 +02:00
|
|
|
|
assuan_context_t ctx = NULL;
|
2009-03-03 13:02:42 +01:00
|
|
|
|
int stopme;
|
2003-08-05 19:11:04 +02: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 02:01:25 +02:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to allocate assuan context: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
if (fd == -1)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2009-11-25 18:58:26 +01:00
|
|
|
|
assuan_fd_t filedes[2];
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2009-11-25 18:58:26 +01:00
|
|
|
|
filedes[0] = assuan_fdopen (0);
|
|
|
|
|
filedes[1] = assuan_fdopen (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 02:01:25 +02:00
|
|
|
|
rc = assuan_init_pipe_server (ctx, filedes);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2009-11-05 13:06:45 +01:00
|
|
|
|
rc = assuan_init_socket_server (ctx, INT2FD(fd),
|
|
|
|
|
ASSUAN_SOCKET_SERVER_ACCEPTED);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to initialize the server: %s\n",
|
2006-09-06 18:35:52 +02:00
|
|
|
|
gpg_strerror(rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
rc = register_commands (ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to register commands with Assuan: %s\n",
|
2006-09-06 18:35:52 +02:00
|
|
|
|
gpg_strerror(rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
2006-11-23 11:35:31 +01:00
|
|
|
|
assuan_set_pointer (ctx, ctrl);
|
2005-04-14 19:25:43 +02:00
|
|
|
|
|
|
|
|
|
/* Allocate and initialize the server object. Put it into the list
|
|
|
|
|
of active sessions. */
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl->server_local = xcalloc (1, sizeof *ctrl->server_local);
|
|
|
|
|
ctrl->server_local->next_session = session_list;
|
|
|
|
|
session_list = ctrl->server_local;
|
|
|
|
|
ctrl->server_local->ctrl_backlink = ctrl;
|
|
|
|
|
ctrl->server_local->assuan_ctx = ctx;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (DBG_ASSUAN)
|
|
|
|
|
assuan_set_log_stream (ctx, log_get_stream ());
|
|
|
|
|
|
2004-04-20 16:17:10 +02:00
|
|
|
|
/* We open the reader right at startup so that the ticker is able to
|
|
|
|
|
update the status file. */
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (ctrl->reader_slot == -1)
|
2005-04-14 19:25:43 +02:00
|
|
|
|
{
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl->reader_slot = get_reader_slot ();
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
2004-04-20 16:17:10 +02:00
|
|
|
|
|
|
|
|
|
/* Command processing loop. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_accept (ctx);
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (rc)
|
|
|
|
|
{
|
2006-09-06 18:35:52 +02:00
|
|
|
|
log_info ("Assuan accept problem: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = assuan_process (ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2006-09-06 18:35:52 +02:00
|
|
|
|
log_info ("Assuan processing failed: %s\n", gpg_strerror (rc));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-04-21 16:44:09 +02:00
|
|
|
|
|
2008-11-03 20:09:34 +01:00
|
|
|
|
/* Cleanup. We don't send an explicit reset to the card. */
|
2006-11-20 17:49:41 +01:00
|
|
|
|
do_reset (ctrl, 0);
|
2004-04-21 16:44:09 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* Release the server object. */
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (session_list == ctrl->server_local)
|
|
|
|
|
session_list = ctrl->server_local->next_session;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct server_local_s *sl;
|
|
|
|
|
|
|
|
|
|
for (sl=session_list; sl->next_session; sl = sl->next_session)
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (sl->next_session == ctrl->server_local)
|
2005-04-14 19:25:43 +02:00
|
|
|
|
break;
|
|
|
|
|
if (!sl->next_session)
|
|
|
|
|
BUG ();
|
2006-11-20 17:49:41 +01:00
|
|
|
|
sl->next_session = ctrl->server_local->next_session;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
}
|
2009-03-03 13:02:42 +01:00
|
|
|
|
stopme = ctrl->server_local->stopme;
|
2006-11-20 17:49:41 +01:00
|
|
|
|
xfree (ctrl->server_local);
|
|
|
|
|
ctrl->server_local = NULL;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-14 19:25:43 +02:00
|
|
|
|
/* Release the Assuan context. */
|
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 02:01:25 +02:00
|
|
|
|
assuan_release (ctx);
|
2008-10-15 15:23:10 +02:00
|
|
|
|
|
2009-03-03 13:02:42 +01:00
|
|
|
|
if (stopme)
|
2009-02-27 15:36:59 +01:00
|
|
|
|
scd_exit (0);
|
|
|
|
|
|
2008-10-15 15:23:10 +02:00
|
|
|
|
/* If there are no more sessions return true. */
|
|
|
|
|
return !session_list;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Send a line with status information via assuan and escape all given
|
|
|
|
|
buffers. The variable elements are pairs of (char *, size_t),
|
|
|
|
|
terminated with a (NULL, 0). */
|
|
|
|
|
void
|
2005-04-14 19:25:43 +02:00
|
|
|
|
send_status_info (ctrl_t ctrl, const char *keyword, ...)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
va_list arg_ptr;
|
|
|
|
|
const unsigned char *value;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
char buf[950], *p;
|
|
|
|
|
size_t n;
|
2005-04-14 19:25:43 +02:00
|
|
|
|
assuan_context_t ctx = ctrl->server_local->assuan_ctx;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
va_start (arg_ptr, keyword);
|
|
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
n = 0;
|
|
|
|
|
while ( (value = va_arg (arg_ptr, const unsigned char *)) )
|
|
|
|
|
{
|
|
|
|
|
valuelen = va_arg (arg_ptr, size_t);
|
|
|
|
|
if (!valuelen)
|
|
|
|
|
continue; /* empty buffer */
|
|
|
|
|
if (n)
|
|
|
|
|
{
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
for ( ; valuelen && n < DIM (buf)-2; n++, valuelen--, value++)
|
|
|
|
|
{
|
|
|
|
|
if (*value < ' ' || *value == '+')
|
|
|
|
|
{
|
|
|
|
|
sprintf (p, "%%%02X", *value);
|
|
|
|
|
p += 3;
|
|
|
|
|
}
|
|
|
|
|
else if (*value == ' ')
|
|
|
|
|
*p++ = '+';
|
|
|
|
|
else
|
|
|
|
|
*p++ = *value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*p = 0;
|
|
|
|
|
assuan_write_status (ctx, keyword, buf);
|
|
|
|
|
|
|
|
|
|
va_end (arg_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 16:17:10 +02:00
|
|
|
|
|
2009-03-10 17:10:35 +01:00
|
|
|
|
/* Send a ready formatted status line via assuan. */
|
|
|
|
|
void
|
|
|
|
|
send_status_direct (ctrl_t ctrl, const char *keyword, const char *args)
|
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx = ctrl->server_local->assuan_ctx;
|
|
|
|
|
|
|
|
|
|
if (strchr (args, '\n'))
|
|
|
|
|
log_error ("error: LF detected in status line - not sending\n");
|
|
|
|
|
else
|
|
|
|
|
assuan_write_status (ctx, keyword, args);
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-18 17:34:28 +01:00
|
|
|
|
|
|
|
|
|
/* Helper to send the clients a status change notification. */
|
|
|
|
|
static void
|
|
|
|
|
send_client_notifications (void)
|
|
|
|
|
{
|
|
|
|
|
struct {
|
|
|
|
|
pid_t pid;
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
HANDLE handle;
|
|
|
|
|
#else
|
|
|
|
|
int signo;
|
|
|
|
|
#endif
|
|
|
|
|
} killed[50];
|
|
|
|
|
int killidx = 0;
|
|
|
|
|
int kidx;
|
|
|
|
|
struct server_local_s *sl;
|
|
|
|
|
|
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
|
|
|
|
{
|
|
|
|
|
if (sl->event_signal && sl->assuan_ctx)
|
|
|
|
|
{
|
|
|
|
|
pid_t pid = assuan_get_pid (sl->assuan_ctx);
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
HANDLE handle = (void *)sl->event_signal;
|
|
|
|
|
|
|
|
|
|
for (kidx=0; kidx < killidx; kidx++)
|
|
|
|
|
if (killed[kidx].pid == pid
|
|
|
|
|
&& killed[kidx].handle == handle)
|
|
|
|
|
break;
|
|
|
|
|
if (kidx < killidx)
|
|
|
|
|
log_info ("event %lx (%p) already triggered for client %d\n",
|
|
|
|
|
sl->event_signal, handle, (int)pid);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_info ("triggering event %lx (%p) for client %d\n",
|
|
|
|
|
sl->event_signal, handle, (int)pid);
|
|
|
|
|
if (!SetEvent (handle))
|
|
|
|
|
log_error ("SetEvent(%lx) failed: %s\n",
|
|
|
|
|
sl->event_signal, w32_strerror (-1));
|
|
|
|
|
if (killidx < DIM (killed))
|
|
|
|
|
{
|
|
|
|
|
killed[killidx].pid = pid;
|
|
|
|
|
killed[killidx].handle = handle;
|
|
|
|
|
killidx++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
|
|
|
|
int signo = sl->event_signal;
|
|
|
|
|
|
|
|
|
|
if (pid != (pid_t)(-1) && pid && signo > 0)
|
|
|
|
|
{
|
|
|
|
|
for (kidx=0; kidx < killidx; kidx++)
|
|
|
|
|
if (killed[kidx].pid == pid
|
|
|
|
|
&& killed[kidx].signo == signo)
|
|
|
|
|
break;
|
|
|
|
|
if (kidx < killidx)
|
|
|
|
|
log_info ("signal %d already sent to client %d\n",
|
|
|
|
|
signo, (int)pid);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_info ("sending signal %d to client %d\n",
|
|
|
|
|
signo, (int)pid);
|
|
|
|
|
kill (pid, signo);
|
|
|
|
|
if (killidx < DIM (killed))
|
|
|
|
|
{
|
|
|
|
|
killed[killidx].pid = pid;
|
|
|
|
|
killed[killidx].signo = signo;
|
|
|
|
|
killidx++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-01-12 11:08:55 +01:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2008-12-18 17:34:28 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* This is the core of scd_update_reader_status_file but the caller
|
2008-11-03 20:09:34 +01:00
|
|
|
|
needs to take care of the locking. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
static void
|
2008-11-03 20:09:34 +01:00
|
|
|
|
update_reader_status_file (int set_card_removed_flag)
|
2004-04-20 16:17:10 +02:00
|
|
|
|
{
|
2006-03-01 12:05:47 +01:00
|
|
|
|
int idx;
|
2004-04-20 16:17:10 +02:00
|
|
|
|
unsigned int status, changed;
|
|
|
|
|
|
2008-10-14 20:18:21 +02:00
|
|
|
|
/* Make sure that the reader has been opened. Like get_reader_slot,
|
|
|
|
|
this part of the code assumes that there is only one reader. */
|
|
|
|
|
if (!slot_table[0].valid)
|
|
|
|
|
(void)get_reader_slot ();
|
|
|
|
|
|
2005-02-24 18:36:11 +01:00
|
|
|
|
/* Note, that we only try to get the status, because it does not
|
2004-04-20 16:17:10 +02:00
|
|
|
|
make sense to wait here for a operation to complete. If we are
|
2005-02-24 18:36:11 +01:00
|
|
|
|
busy working with a card, delays in the status file update should
|
|
|
|
|
be acceptable. */
|
2006-03-01 12:05:47 +01:00
|
|
|
|
for (idx=0; idx < DIM(slot_table); idx++)
|
|
|
|
|
{
|
|
|
|
|
struct slot_status_s *ss = slot_table + idx;
|
2008-11-11 09:22:06 +01:00
|
|
|
|
struct server_local_s *sl;
|
2008-12-18 17:34:28 +01:00
|
|
|
|
int sw_apdu;
|
2005-02-24 22:40:48 +01:00
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!ss->valid || ss->slot == -1)
|
|
|
|
|
continue; /* Not valid or reader not yet open. */
|
|
|
|
|
|
2008-12-18 17:34:28 +01:00
|
|
|
|
sw_apdu = apdu_get_status (ss->slot, 0, &status, &changed);
|
2009-07-16 17:54:59 +02:00
|
|
|
|
if (sw_apdu == SW_HOST_NO_READER)
|
|
|
|
|
{
|
|
|
|
|
/* Most likely the _reader_ has been unplugged. */
|
|
|
|
|
status = 0;
|
|
|
|
|
changed = ss->changed;
|
|
|
|
|
}
|
|
|
|
|
else if (sw_apdu)
|
2008-12-18 17:34:28 +01:00
|
|
|
|
{
|
|
|
|
|
/* Get status failed. Ignore that. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-02-24 22:40:48 +01:00
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!ss->any || ss->status != status || ss->changed != changed )
|
|
|
|
|
{
|
|
|
|
|
char *fname;
|
|
|
|
|
char templ[50];
|
|
|
|
|
FILE *fp;
|
2004-12-15 15:15:54 +01:00
|
|
|
|
|
2008-12-18 17:34:28 +01:00
|
|
|
|
log_info ("updating slot %d status: 0x%04X->0x%04X (%u->%u)\n",
|
|
|
|
|
ss->slot, ss->status, status, ss->changed, changed);
|
|
|
|
|
ss->status = status;
|
|
|
|
|
ss->changed = changed;
|
2006-09-02 16:47:47 +02:00
|
|
|
|
|
|
|
|
|
/* FIXME: Should this be IDX instead of ss->slot? This
|
|
|
|
|
depends on how client sessions will associate the reader
|
|
|
|
|
status with their session. */
|
2008-11-03 20:09:34 +01:00
|
|
|
|
snprintf (templ, sizeof templ, "reader_%d.status", ss->slot);
|
2006-03-01 12:05:47 +01:00
|
|
|
|
fname = make_filename (opt.homedir, templ, NULL );
|
|
|
|
|
fp = fopen (fname, "w");
|
|
|
|
|
if (fp)
|
|
|
|
|
{
|
|
|
|
|
fprintf (fp, "%s\n",
|
|
|
|
|
(status & 1)? "USABLE":
|
|
|
|
|
(status & 4)? "ACTIVE":
|
|
|
|
|
(status & 2)? "PRESENT": "NOCARD");
|
|
|
|
|
fclose (fp);
|
|
|
|
|
}
|
|
|
|
|
xfree (fname);
|
|
|
|
|
|
2006-09-07 17:13:33 +02:00
|
|
|
|
/* If a status script is executable, run it. */
|
|
|
|
|
{
|
|
|
|
|
const char *args[9], *envs[2];
|
2006-10-02 02:34:53 +02:00
|
|
|
|
char numbuf1[30], numbuf2[30], numbuf3[30];
|
2006-09-07 17:13:33 +02:00
|
|
|
|
char *homestr, *envstr;
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
|
|
|
|
homestr = make_filename (opt.homedir, NULL);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
if (estream_asprintf (&envstr, "GNUPGHOME=%s", homestr) < 0)
|
2006-09-07 17:13:33 +02:00
|
|
|
|
log_error ("out of core while building environment\n");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
envs[0] = envstr;
|
|
|
|
|
envs[1] = NULL;
|
|
|
|
|
|
|
|
|
|
sprintf (numbuf1, "%d", ss->slot);
|
|
|
|
|
sprintf (numbuf2, "0x%04X", ss->status);
|
|
|
|
|
sprintf (numbuf3, "0x%04X", status);
|
|
|
|
|
args[0] = "--reader-port";
|
|
|
|
|
args[1] = numbuf1;
|
|
|
|
|
args[2] = "--old-code";
|
|
|
|
|
args[3] = numbuf2;
|
|
|
|
|
args[4] = "--new-code";
|
|
|
|
|
args[5] = numbuf3;
|
|
|
|
|
args[6] = "--status";
|
|
|
|
|
args[7] = ((status & 1)? "USABLE":
|
|
|
|
|
(status & 4)? "ACTIVE":
|
|
|
|
|
(status & 2)? "PRESENT": "NOCARD");
|
|
|
|
|
args[8] = NULL;
|
|
|
|
|
|
|
|
|
|
fname = make_filename (opt.homedir, "scd-event", NULL);
|
|
|
|
|
err = gnupg_spawn_process_detached (fname, args, envs);
|
|
|
|
|
if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
|
|
|
|
|
log_error ("failed to run event handler `%s': %s\n",
|
|
|
|
|
fname, gpg_strerror (err));
|
|
|
|
|
xfree (fname);
|
2008-08-31 13:55:09 +02:00
|
|
|
|
xfree (envstr);
|
2006-09-07 17:13:33 +02:00
|
|
|
|
}
|
|
|
|
|
xfree (homestr);
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
/* Set the card removed flag for all current sessions. We
|
|
|
|
|
will set this on any card change because a reset or
|
|
|
|
|
SERIALNO request must be done in any case. */
|
2008-11-03 20:09:34 +01:00
|
|
|
|
if (ss->any && set_card_removed_flag)
|
2006-09-02 16:47:47 +02:00
|
|
|
|
update_card_removed (idx, 1);
|
2006-03-01 12:05:47 +01:00
|
|
|
|
|
|
|
|
|
ss->any = 1;
|
|
|
|
|
|
|
|
|
|
/* Send a signal to all clients who applied for it. */
|
2008-12-18 17:34:28 +01:00
|
|
|
|
send_client_notifications ();
|
2006-03-01 12:05:47 +01:00
|
|
|
|
}
|
2008-11-11 09:22:06 +01:00
|
|
|
|
|
|
|
|
|
/* Check whether a disconnect is pending. */
|
2008-12-05 13:01:01 +01:00
|
|
|
|
if (opt.card_timeout)
|
2008-11-11 09:22:06 +01:00
|
|
|
|
{
|
2008-12-05 13:01:01 +01:00
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
|
|
|
|
if (!sl->disconnect_allowed)
|
|
|
|
|
break;
|
|
|
|
|
if (session_list && !sl)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME: Use a real timeout. */
|
|
|
|
|
/* At least one connection and all allow a disconnect. */
|
2008-12-18 17:34:28 +01:00
|
|
|
|
log_info ("disconnecting card in slot %d\n", ss->slot);
|
2008-12-05 13:01:01 +01:00
|
|
|
|
apdu_disconnect (ss->slot);
|
|
|
|
|
}
|
2008-11-11 09:22:06 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-03-01 12:05:47 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is called by the ticker thread to check for changes
|
|
|
|
|
of the reader stati. It updates the reader status files and if
|
|
|
|
|
requested by the caller also send a signal to the caller. */
|
|
|
|
|
void
|
|
|
|
|
scd_update_reader_status_file (void)
|
|
|
|
|
{
|
|
|
|
|
if (!pth_mutex_acquire (&status_file_update_lock, 1, NULL))
|
|
|
|
|
return; /* locked - give up. */
|
2008-11-03 20:09:34 +01:00
|
|
|
|
update_reader_status_file (1);
|
2006-03-01 12:05:47 +01:00
|
|
|
|
if (!pth_mutex_release (&status_file_update_lock))
|
|
|
|
|
log_error ("failed to release status_file_update lock\n");
|
2004-04-20 16:17:10 +02:00
|
|
|
|
}
|