2003-08-05 17:11:04 +00:00
|
|
|
|
/* call-scd.c - fork of the scdaemon to do SC operations
|
2011-12-14 15:42:28 +01:00
|
|
|
|
* Copyright (C) 2001, 2002, 2005, 2007, 2010,
|
|
|
|
|
* 2011 Free Software Foundation, Inc.
|
2013-08-26 17:29:54 +02:00
|
|
|
|
* Copyright (C) 2013 Werner Koch
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2020-06-24 12:44:02 +02:00
|
|
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <unistd.h>
|
2010-04-14 11:24:02 +00:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include <sys/stat.h>
|
2004-04-21 14:43:51 +00:00
|
|
|
|
#include <sys/types.h>
|
2004-12-13 15:49:56 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2004-04-21 14:43:51 +00:00
|
|
|
|
#include <sys/wait.h>
|
2004-12-13 15:49:56 +00:00
|
|
|
|
#endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#include <npth.h>
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
#include "agent.h"
|
|
|
|
|
#include <assuan.h>
|
agent: Resolve conflict of util.h.
* agent/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* agent/call-pinentry.c, agent/call-scd.c: Follow the change.
* agent/command-ssh.c, agent/command.c, agent/cvt-openpgp.c: Ditto.
* agent/divert-scd.c, agent/findkey.c, agent/genkey.c: Ditto.
* agent/gpg-agent.c, agent/pksign.c, agent/preset-passphrase.c: Ditto.
* agent/protect-tool.c, agent/protect.c, agent/trustlist.c: Ditto.
* agent/w32main.c: Ditto.
--
For openpty function, we need to include util.h on some OS.
We also have util.h in common/, so this change is needed.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-03-07 19:22:48 +09:00
|
|
|
|
#include "../common/strlist.h"
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_OPEN_MAX
|
|
|
|
|
#define MAX_OPEN_FDS _POSIX_OPEN_MAX
|
|
|
|
|
#else
|
|
|
|
|
#define MAX_OPEN_FDS 20
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Definition of module local data of the CTRL structure. */
|
|
|
|
|
struct scd_local_s
|
|
|
|
|
{
|
2017-02-20 16:25:15 -05:00
|
|
|
|
/* We keep a list of all allocated context with an anchor at
|
2006-02-09 18:29:31 +00:00
|
|
|
|
SCD_LOCAL_LIST (see below). */
|
|
|
|
|
struct scd_local_s *next_local;
|
|
|
|
|
|
2018-11-26 11:05:28 +09:00
|
|
|
|
assuan_context_t ctx; /* NULL or session context for the SCdaemon
|
|
|
|
|
used with this connection. */
|
|
|
|
|
unsigned int in_use: 1; /* CTX is in use. */
|
|
|
|
|
unsigned int invalid:1; /* CTX is invalid, should be released. */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
};
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
/* Callback parameter for learn card */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
struct learn_parm_s
|
|
|
|
|
{
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void (*kpinfo_cb)(void*, const char *);
|
|
|
|
|
void *kpinfo_cb_arg;
|
|
|
|
|
void (*certinfo_cb)(void*, const char *);
|
|
|
|
|
void *certinfo_cb_arg;
|
|
|
|
|
void (*sinfo_cb)(void*, const char *, size_t, const char *);
|
|
|
|
|
void *sinfo_cb_arg;
|
|
|
|
|
};
|
|
|
|
|
|
2017-02-22 09:40:50 +01:00
|
|
|
|
|
|
|
|
|
/* Callback parameter used by inq_getpin and inq_writekey_parms. */
|
|
|
|
|
struct inq_needpin_parm_s
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
int (*getpin_cb)(void *, const char *, const char *, char*, size_t);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *getpin_cb_arg;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
const char *getpin_cb_desc;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
assuan_context_t passthru; /* If not NULL, pass unknown inquiries
|
|
|
|
|
up to the caller. */
|
2017-02-22 09:40:50 +01:00
|
|
|
|
|
|
|
|
|
/* The next fields are used by inq_writekey_parm. */
|
|
|
|
|
const unsigned char *keydata;
|
|
|
|
|
size_t keydatalen;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
static int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
start_scd (ctrl_t ctrl)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2020-06-24 12:44:02 +02:00
|
|
|
|
return daemon_start (DAEMON_SCD, ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
unlock_scd (ctrl_t ctrl, gpg_error_t err)
|
2009-03-03 09:02:58 +00:00
|
|
|
|
{
|
2020-06-24 12:44:02 +02:00
|
|
|
|
return daemon_unlock (DAEMON_SCD, ctrl, err);
|
2009-03-03 09:02:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
static assuan_context_t
|
|
|
|
|
daemon_ctx (ctrl_t ctrl)
|
2004-01-29 20:17:27 +00:00
|
|
|
|
{
|
2020-06-24 12:44:02 +02:00
|
|
|
|
return daemon_type_ctx (DAEMON_SCD, ctrl);
|
2004-01-29 20:17:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
|
|
|
|
|
/* This handler is a helper for pincache_put_cb but may also be called
|
|
|
|
|
* directly for that status code with ARGS being the arguments after
|
|
|
|
|
* the status keyword (and with white space removed). */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
handle_pincache_put (const char *args)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
2020-01-09 12:00:50 +01:00
|
|
|
|
const char *s, *key, *pin;
|
2020-01-07 18:36:18 +01:00
|
|
|
|
char *keybuf = NULL;
|
2020-01-09 12:00:50 +01:00
|
|
|
|
size_t keylen;
|
2020-01-07 18:36:18 +01:00
|
|
|
|
|
|
|
|
|
key = s = args;
|
|
|
|
|
while (*s && !spacep (s))
|
|
|
|
|
s++;
|
|
|
|
|
keylen = s - key;
|
|
|
|
|
if (keylen < 3)
|
|
|
|
|
{
|
|
|
|
|
/* At least we need 2 slashes and slot number. */
|
|
|
|
|
log_error ("%s: ignoring invalid key\n", __func__);
|
|
|
|
|
err = 0;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
keybuf = xtrymalloc (keylen+1);
|
|
|
|
|
if (!keybuf)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
memcpy (keybuf, key, keylen);
|
|
|
|
|
keybuf[keylen] = 0;
|
|
|
|
|
key = keybuf;
|
|
|
|
|
|
|
|
|
|
while (spacep (s))
|
|
|
|
|
s++;
|
2020-01-09 12:00:50 +01:00
|
|
|
|
pin = s;
|
|
|
|
|
if (!*pin)
|
2020-01-07 18:36:18 +01:00
|
|
|
|
{
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* No value - flush the cache. The cache module knows aboput
|
|
|
|
|
* the structure of the key to flush only parts. */
|
2020-01-07 18:36:18 +01:00
|
|
|
|
log_debug ("%s: flushing cache '%s'\n", __func__, key);
|
|
|
|
|
agent_put_cache (NULL, key, CACHE_MODE_PIN, NULL, -1);
|
|
|
|
|
err = 0;
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
log_debug ("%s: caching '%s'->'%s'\n", __func__, key, pin);
|
|
|
|
|
agent_put_cache (NULL, key, CACHE_MODE_PIN, pin, -1);
|
|
|
|
|
err = 0;
|
2020-01-07 18:36:18 +01:00
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (keybuf);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-02-13 11:45:41 +01:00
|
|
|
|
/* This status callback is to intercept the PINCACHE_PUT status
|
|
|
|
|
* messages. OPAQUE is not used. */
|
2020-01-07 18:36:18 +01:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
pincache_put_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
(void)opaque;
|
|
|
|
|
|
|
|
|
|
s = has_leading_keyword (line, "PINCACHE_PUT");
|
|
|
|
|
if (s)
|
|
|
|
|
return handle_pincache_put (s);
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* Handle a PINCACHE_GET inquiry. ARGS are the arguments of the
|
|
|
|
|
* inquiry which should be a single string with the key for the cached
|
|
|
|
|
* value. CTX is the Assuan handle. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
handle_pincache_get (const char *args, assuan_context_t ctx)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
const char *key;
|
|
|
|
|
char *pin = NULL;
|
|
|
|
|
|
|
|
|
|
log_debug ("%s: enter '%s'\n", __func__, args);
|
|
|
|
|
key = args;
|
|
|
|
|
if (strlen (key) < 5)
|
|
|
|
|
{
|
|
|
|
|
/* We need at least 2 slashes, one slot number and two 1 byte strings.*/
|
|
|
|
|
err = gpg_error (GPG_ERR_INV_REQUEST);
|
|
|
|
|
log_debug ("%s: key too short\n", __func__);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pin = agent_get_cache (NULL, key, CACHE_MODE_PIN);
|
|
|
|
|
if (!pin || !*pin)
|
|
|
|
|
{
|
|
|
|
|
xfree (pin);
|
|
|
|
|
err = 0; /* Not found is indicated by sending no data back. */
|
|
|
|
|
log_debug ("%s: not cached\n", __func__);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
log_debug ("%s: cache returned '%s'\n", __func__, pin);
|
|
|
|
|
err = assuan_send_data (ctx, pin, strlen (pin));
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (pin);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
learn_status_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct learn_parm_s *parm = opaque;
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
if (keywordlen == 8 && !memcmp (keyword, "CERTINFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
parm->certinfo_cb (parm->certinfo_cb_arg, line);
|
|
|
|
|
}
|
|
|
|
|
else if (keywordlen == 11 && !memcmp (keyword, "KEYPAIRINFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
parm->kpinfo_cb (parm->kpinfo_cb_arg, line);
|
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
|
|
|
|
|
err = handle_pincache_put (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
else if (keywordlen && *line)
|
|
|
|
|
{
|
|
|
|
|
parm->sinfo_cb (parm->sinfo_cb_arg, keyword, keywordlen, line);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-02-22 18:08:28 +00:00
|
|
|
|
/* Perform the LEARN command and return a list of all private keys
|
2003-08-05 17:11:04 +00:00
|
|
|
|
stored on the card. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_learn (ctrl_t ctrl,
|
|
|
|
|
void (*kpinfo_cb)(void*, const char *),
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *kpinfo_cb_arg,
|
|
|
|
|
void (*certinfo_cb)(void*, const char *),
|
|
|
|
|
void *certinfo_cb_arg,
|
|
|
|
|
void (*sinfo_cb)(void*, const char *, size_t, const char *),
|
|
|
|
|
void *sinfo_cb_arg)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct learn_parm_s parm;
|
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.kpinfo_cb = kpinfo_cb;
|
|
|
|
|
parm.kpinfo_cb_arg = kpinfo_cb_arg;
|
|
|
|
|
parm.certinfo_cb = certinfo_cb;
|
|
|
|
|
parm.certinfo_cb_arg = certinfo_cb_arg;
|
|
|
|
|
parm.sinfo_cb = sinfo_cb;
|
|
|
|
|
parm.sinfo_cb_arg = sinfo_cb_arg;
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), "LEARN --force",
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
learn_status_cb, &parm);
|
|
|
|
|
if (rc)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
get_serialno_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char **serialno = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
const char *s;
|
|
|
|
|
int keywordlen, n;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (keywordlen == 8 && !memcmp (keyword, "SERIALNO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
if (*serialno)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_CONFLICT); /* Unexpected status line. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
for (n=0,s=line; hexdigitp (s); s++, n++)
|
|
|
|
|
;
|
|
|
|
|
if (!n || (n&1)|| !(spacep (s) || !*s) )
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*serialno = xtrymalloc (n+1);
|
|
|
|
|
if (!*serialno)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
memcpy (*serialno, line, n);
|
|
|
|
|
(*serialno)[n] = 0;
|
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
|
|
|
|
|
err = handle_pincache_put (line);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2020-02-13 11:45:41 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Return the serial number of the card or an appropriate error. The
|
2020-02-13 11:45:41 +01:00
|
|
|
|
* serial number is returned as a hexstring. If the serial number is
|
|
|
|
|
* not required by the caller R_SERIALNO can be NULL; this might be
|
|
|
|
|
* useful to test whether a card is available. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2017-01-16 10:33:08 +09:00
|
|
|
|
agent_card_serialno (ctrl_t ctrl, char **r_serialno, const char *demand)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *serialno = NULL;
|
2017-01-16 10:33:08 +09:00
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2017-01-16 10:33:08 +09:00
|
|
|
|
if (!demand)
|
2020-01-13 12:08:23 +01:00
|
|
|
|
strcpy (line, "SERIALNO --all");
|
2017-01-16 10:33:08 +09:00
|
|
|
|
else
|
|
|
|
|
snprintf (line, DIM(line), "SERIALNO --demand=%s", demand);
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
get_serialno_cb, &serialno);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (serialno);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2020-02-13 11:45:41 +01:00
|
|
|
|
if (r_serialno)
|
|
|
|
|
*r_serialno = serialno;
|
|
|
|
|
else
|
|
|
|
|
xfree (serialno);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
/* Handle the NEEDPIN inquiry. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin (void *opaque, const char *line)
|
|
|
|
|
{
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s *parm = opaque;
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
const char *s;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char *pin;
|
|
|
|
|
size_t pinlen;
|
|
|
|
|
int rc;
|
|
|
|
|
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if ((s = has_leading_keyword (line, "NEEDPIN")))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
line = s;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
pinlen = 90;
|
|
|
|
|
pin = gcry_malloc_secure (pinlen);
|
|
|
|
|
if (!pin)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2017-02-22 09:40:50 +01:00
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
|
|
|
|
|
line, pin, pinlen);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
if (!rc)
|
|
|
|
|
rc = assuan_send_data (parm->ctx, pin, pinlen);
|
|
|
|
|
xfree (pin);
|
|
|
|
|
}
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
|
2005-11-28 11:52:25 +00:00
|
|
|
|
{
|
2017-02-22 09:40:50 +01:00
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
|
|
|
|
|
s, NULL, 1);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
}
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
else if ((s = has_leading_keyword (line, "DISMISSPINPADPROMPT")))
|
2006-11-20 16:49:41 +00:00
|
|
|
|
{
|
2017-02-22 09:40:50 +01:00
|
|
|
|
rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
|
|
|
|
|
"", NULL, 0);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if ((s = has_leading_keyword (line, "PINCACHE_GET")))
|
|
|
|
|
{
|
2020-01-09 12:00:50 +01:00
|
|
|
|
rc = handle_pincache_get (s, parm->ctx);
|
2020-01-07 18:36:18 +01:00
|
|
|
|
}
|
2007-07-05 16:58:19 +00:00
|
|
|
|
else if (parm->passthru)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *value;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
int rest;
|
|
|
|
|
int needrest = !strncmp (line, "KEYDATA", 8);
|
|
|
|
|
|
|
|
|
|
/* Pass the inquiry up to our caller. We limit the maximum
|
|
|
|
|
amount to an arbitrary value. As we know that the KEYDATA
|
|
|
|
|
enquiry is pretty sensitive we disable logging then */
|
|
|
|
|
if ((rest = (needrest
|
|
|
|
|
&& !assuan_get_flag (parm->passthru, ASSUAN_CONFIDENTIAL))))
|
|
|
|
|
assuan_begin_confidential (parm->passthru);
|
|
|
|
|
rc = assuan_inquire (parm->passthru, line, &value, &valuelen, 8096);
|
|
|
|
|
if (rest)
|
|
|
|
|
assuan_end_confidential (parm->passthru);
|
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if ((rest = (needrest
|
2007-07-05 16:58:19 +00:00
|
|
|
|
&& !assuan_get_flag (parm->ctx, ASSUAN_CONFIDENTIAL))))
|
|
|
|
|
assuan_begin_confidential (parm->ctx);
|
|
|
|
|
rc = assuan_send_data (parm->ctx, value, valuelen);
|
|
|
|
|
if (rest)
|
|
|
|
|
assuan_end_confidential (parm->ctx);
|
|
|
|
|
xfree (value);
|
|
|
|
|
}
|
|
|
|
|
else
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("error forwarding inquiry '%s': %s\n",
|
2007-07-05 16:58:19 +00:00
|
|
|
|
line, gpg_strerror (rc));
|
|
|
|
|
}
|
2005-11-28 11:52:25 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("unsupported inquiry '%s'\n", line);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-03-02 15:35:10 +01:00
|
|
|
|
/* Helper returning a command option to describe the used hash
|
|
|
|
|
algorithm. See scd/command.c:cmd_pksign. */
|
|
|
|
|
static const char *
|
|
|
|
|
hash_algo_option (int algo)
|
|
|
|
|
{
|
|
|
|
|
switch (algo)
|
|
|
|
|
{
|
|
|
|
|
case GCRY_MD_MD5 : return "--hash=md5";
|
|
|
|
|
case GCRY_MD_RMD160: return "--hash=rmd160";
|
|
|
|
|
case GCRY_MD_SHA1 : return "--hash=sha1";
|
|
|
|
|
case GCRY_MD_SHA224: return "--hash=sha224";
|
|
|
|
|
case GCRY_MD_SHA256: return "--hash=sha256";
|
|
|
|
|
case GCRY_MD_SHA384: return "--hash=sha384";
|
|
|
|
|
case GCRY_MD_SHA512: return "--hash=sha512";
|
|
|
|
|
default: return "";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2011-03-02 15:35:10 +01:00
|
|
|
|
/* Create a signature using the current card. MDALGO is either 0 or
|
2017-02-22 09:40:50 +01:00
|
|
|
|
* gives the digest algorithm. DESC_TEXT is an additional parameter
|
|
|
|
|
* passed to GETPIN_CB. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_pksign (ctrl_t ctrl,
|
|
|
|
|
const char *keyid,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
int (*getpin_cb)(void *, const char *,
|
|
|
|
|
const char *, char*, size_t),
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *getpin_cb_arg,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
const char *desc_text,
|
2011-03-02 15:35:10 +01:00
|
|
|
|
int mdalgo,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
const unsigned char *indata, size_t indatalen,
|
2005-06-16 08:12:03 +00:00
|
|
|
|
unsigned char **r_buf, size_t *r_buflen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2014-12-02 14:13:53 +01:00
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s inqparm;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2020-05-18 19:24:41 +02:00
|
|
|
|
/* FIXME: In the mdalgo case (INDATA,INDATALEN) might be long and
|
|
|
|
|
* thus we can't convey it on a single Assuan line. */
|
|
|
|
|
if (!mdalgo)
|
|
|
|
|
gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (indatalen*2 + 50 > DIM(line))
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_GENERAL));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2014-12-02 14:13:53 +01:00
|
|
|
|
bin2hex (indata, indatalen, stpcpy (line, "SETDATA "));
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2020-01-07 18:36:18 +01:00
|
|
|
|
NULL, NULL, NULL, NULL, pincache_put_cb, NULL);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
inqparm.ctx = daemon_ctx (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.getpin_cb_desc = desc_text;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = 0;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.keydata = NULL;
|
|
|
|
|
inqparm.keydatalen = 0;
|
|
|
|
|
|
2011-03-02 15:35:10 +01:00
|
|
|
|
if (ctrl->use_auth_call)
|
|
|
|
|
snprintf (line, sizeof line, "PKAUTH %s", keyid);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, sizeof line, "PKSIGN %s %s",
|
|
|
|
|
hash_algo_option (mdalgo), keyid);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin, &inqparm,
|
2020-01-07 18:36:18 +01:00
|
|
|
|
pincache_put_cb, NULL);
|
2012-01-14 09:57:31 -05:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2013-02-28 11:17:47 +09:00
|
|
|
|
size_t len;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2013-02-28 11:17:47 +09:00
|
|
|
|
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-08-26 17:29:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check whether there is any padding info from scdaemon. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
padding_info_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2013-08-26 17:29:54 +02:00
|
|
|
|
int *r_padding = opaque;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if ((s=has_leading_keyword (line, "PADDING")))
|
|
|
|
|
{
|
|
|
|
|
*r_padding = atoi (s);
|
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if ((s=has_leading_keyword (line, "PINCACHE_PUT")))
|
|
|
|
|
err = handle_pincache_put (line);
|
2013-08-26 17:29:54 +02:00
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2013-08-26 17:29:54 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Decipher INDATA using the current card. Note that the returned
|
2017-02-22 09:40:50 +01:00
|
|
|
|
* value is not an s-expression but the raw data as returned by
|
|
|
|
|
* scdaemon. The padding information is stored at R_PADDING with -1
|
|
|
|
|
* for not known. DESC_TEXT is an additional parameter passed to
|
|
|
|
|
* GETPIN_CB. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_pkdecrypt (ctrl_t ctrl,
|
|
|
|
|
const char *keyid,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
int (*getpin_cb)(void *, const char *,
|
|
|
|
|
const char *, char*, size_t),
|
2004-01-29 20:17:27 +00:00
|
|
|
|
void *getpin_cb_arg,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
const char *desc_text,
|
2004-01-29 20:17:27 +00:00
|
|
|
|
const unsigned char *indata, size_t indatalen,
|
2013-08-26 17:29:54 +02:00
|
|
|
|
char **r_buf, size_t *r_buflen, int *r_padding)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc, i;
|
|
|
|
|
char *p, line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s inqparm;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2013-08-26 17:29:54 +02:00
|
|
|
|
*r_padding = -1; /* Unknown. */
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
/* FIXME: use secure memory where appropriate */
|
|
|
|
|
|
2012-11-06 12:02:25 +01:00
|
|
|
|
for (len = 0; len < indatalen;)
|
|
|
|
|
{
|
|
|
|
|
p = stpcpy (line, "SETDATA ");
|
|
|
|
|
if (len)
|
|
|
|
|
p = stpcpy (p, "--append ");
|
|
|
|
|
for (i=0; len < indatalen && (i*2 < DIM(line)-50); i++, len++)
|
|
|
|
|
{
|
|
|
|
|
sprintf (p, "%02X", indata[len]);
|
|
|
|
|
p += 2;
|
|
|
|
|
}
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2012-11-06 12:02:25 +01:00
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
return unlock_scd (ctrl, rc);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
inqparm.ctx = daemon_ctx (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.getpin_cb_desc = desc_text;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = 0;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.keydata = NULL;
|
|
|
|
|
inqparm.keydatalen = 0;
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "PKDECRYPT %s", keyid);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inq_needpin, &inqparm,
|
2013-08-26 17:29:54 +02:00
|
|
|
|
padding_info_cb, r_padding);
|
2012-01-14 09:57:31 -05:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
|
|
|
|
if (!*r_buf)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a certificate with ID into R_BUF and R_BUFLEN. */
|
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_readcert (ctrl_t ctrl,
|
|
|
|
|
const char *id, char **r_buf, size_t *r_buflen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
Fix use cases of snprintf.
* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2016-10-21 12:04:46 +09:00
|
|
|
|
snprintf (line, DIM(line), "READCERT %s", id);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL,
|
2020-01-07 18:36:18 +01:00
|
|
|
|
pincache_put_cb, NULL);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
|
|
|
|
if (!*r_buf)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-02-13 11:45:41 +01:00
|
|
|
|
struct readkey_status_parm_s
|
|
|
|
|
{
|
|
|
|
|
char *keyref;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
readkey_status_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
struct readkey_status_parm_s *parm = opaque;
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
char *line_buffer = NULL;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if ((s = has_leading_keyword (line, "KEYPAIRINFO"))
|
|
|
|
|
&& !parm->keyref)
|
|
|
|
|
{
|
|
|
|
|
/* The format of such a line is:
|
2020-09-21 14:47:53 +02:00
|
|
|
|
* KEYPAIRINFO <hexgrip> <keyref> [usage] [keytime] [algostr]
|
2020-02-13 11:45:41 +01:00
|
|
|
|
*
|
|
|
|
|
* Here we only need the keyref. We use only the first received
|
|
|
|
|
* KEYPAIRINFO; it is possible to receive several if there are
|
|
|
|
|
* two or more active cards with the same key. */
|
common,agent,dirmngr,g10,tools: Fix split_fields API.
* common/stringhelp.h (split_fields): Use const * for the strings in
the ARRAY.
(split_fields_colon): Likewise.
* common/stringhelp.c (split_fields, split_fields_colon): Fix
the implementation.
* agent/call-scd.c, agent/command.c: Follow the change.
* common/t-stringhelp.c, dirmngr/loadswdb.c: Likewise.
* g10/call-agent.c, tools/card-call-scd.c: Likewise.
* tools/card-yubikey.c, tools/gpg-card.c: Likewise.
* tools/gpg-card.h, tools/gpg-wks-client.c: Likewise.
* tools/gpgconf-comp.c, tools/gpgconf.c: Likewise.
* tools/wks-util.c: Likewise.
--
The strings in the ARRAY don't need to be released by caller, as those
are references. It's easier to follow the code when it's explicitly
const *.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2020-09-18 10:20:23 +09:00
|
|
|
|
const char *fields[2];
|
2020-02-13 11:45:41 +01:00
|
|
|
|
int nfields;
|
|
|
|
|
|
|
|
|
|
line_buffer = xtrystrdup (line);
|
|
|
|
|
if (!line_buffer)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((nfields = split_fields (line_buffer, fields, DIM (fields))) < 2)
|
|
|
|
|
goto leave; /* Not enough args; invalid status line - skip. */
|
|
|
|
|
|
|
|
|
|
parm->keyref = xtrystrdup (fields[1]);
|
|
|
|
|
if (!parm->keyref)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
err = pincache_put_cb (NULL, line);
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (line_buffer);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a key with ID (keyref or keygrip) and return it in a malloced
|
|
|
|
|
* buffer pointed to by R_BUF as a valid S-expression. If R_KEYREF is
|
|
|
|
|
* not NULL the keyref is stored there. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2020-02-13 11:45:41 +01:00
|
|
|
|
agent_card_readkey (ctrl_t ctrl, const char *id,
|
|
|
|
|
unsigned char **r_buf, char **r_keyref)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2004-12-20 08:32:56 +00:00
|
|
|
|
membuf_t data;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t len, buflen;
|
2020-02-13 11:45:41 +01:00
|
|
|
|
struct readkey_status_parm_s parm;
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
2020-02-13 11:45:41 +01:00
|
|
|
|
if (r_keyref)
|
|
|
|
|
*r_keyref = NULL;
|
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2020-02-13 11:45:41 +01:00
|
|
|
|
snprintf (line, DIM(line), "READKEY%s -- %s",
|
|
|
|
|
r_keyref? " --info":"", id);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), line,
|
2016-01-08 06:33:27 +01:00
|
|
|
|
put_membuf_cb, &data,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NULL, NULL,
|
2020-02-13 11:45:41 +01:00
|
|
|
|
readkey_status_cb, &parm);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2020-02-13 11:45:41 +01:00
|
|
|
|
xfree (parm.keyref);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, &buflen);
|
|
|
|
|
if (!*r_buf)
|
2020-02-13 11:45:41 +01:00
|
|
|
|
{
|
|
|
|
|
xfree (parm.keyref);
|
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_ENOMEM));
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
if (!gcry_sexp_canon_len (*r_buf, buflen, NULL, NULL))
|
|
|
|
|
{
|
2020-02-13 11:45:41 +01:00
|
|
|
|
xfree (parm.keyref);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
xfree (*r_buf); *r_buf = NULL;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, gpg_error (GPG_ERR_INV_VALUE));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2020-02-13 11:45:41 +01:00
|
|
|
|
if (r_keyref)
|
|
|
|
|
*r_keyref = parm.keyref;
|
|
|
|
|
else
|
|
|
|
|
xfree (parm.keyref);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-02-06 14:00:05 +09:00
|
|
|
|
/* Handle a KEYDATA inquiry. Note, we only send the data,
|
|
|
|
|
assuan_transact takes care of flushing and writing the end */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
inq_writekey_parms (void *opaque, const char *line)
|
|
|
|
|
{
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s *parm = opaque;
|
2013-02-06 14:00:05 +09:00
|
|
|
|
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if (has_leading_keyword (line, "KEYDATA"))
|
2013-02-06 14:00:05 +09:00
|
|
|
|
return assuan_send_data (parm->ctx, parm->keydata, parm->keydatalen);
|
|
|
|
|
else
|
|
|
|
|
return inq_needpin (opaque, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2019-03-05 12:08:27 +01:00
|
|
|
|
/* Call scd to write a key to a card under the id KEYREF. */
|
|
|
|
|
gpg_error_t
|
2013-02-06 14:00:05 +09:00
|
|
|
|
agent_card_writekey (ctrl_t ctrl, int force, const char *serialno,
|
2019-03-05 12:08:27 +01:00
|
|
|
|
const char *keyref,
|
|
|
|
|
const char *keydata, size_t keydatalen,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
int (*getpin_cb)(void *, const char *,
|
|
|
|
|
const char *, char*, size_t),
|
2013-02-06 14:00:05 +09:00
|
|
|
|
void *getpin_cb_arg)
|
|
|
|
|
{
|
2019-03-05 12:08:27 +01:00
|
|
|
|
gpg_error_t err;
|
2013-02-06 14:00:05 +09:00
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s parms;
|
2013-02-06 14:00:05 +09:00
|
|
|
|
|
2019-03-05 15:49:20 +01:00
|
|
|
|
(void)serialno; /* NULL or a number to check for the correct card.
|
|
|
|
|
* But is is not implemented. */
|
2013-02-06 14:00:05 +09:00
|
|
|
|
|
2019-03-05 12:08:27 +01:00
|
|
|
|
err = start_scd (ctrl);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line), "WRITEKEY %s%s", force ? "--force " : "", keyref);
|
2020-06-24 12:44:02 +02:00
|
|
|
|
parms.ctx = daemon_ctx (ctrl);
|
2013-02-06 14:00:05 +09:00
|
|
|
|
parms.getpin_cb = getpin_cb;
|
|
|
|
|
parms.getpin_cb_arg = getpin_cb_arg;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
parms.getpin_cb_desc= NULL;
|
2013-02-06 14:00:05 +09:00
|
|
|
|
parms.passthru = 0;
|
|
|
|
|
parms.keydata = keydata;
|
|
|
|
|
parms.keydatalen = keydatalen;
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
err = assuan_transact (daemon_ctx (ctrl), line, NULL, NULL,
|
2020-01-07 18:36:18 +01:00
|
|
|
|
inq_writekey_parms, &parms,
|
|
|
|
|
pincache_put_cb, NULL);
|
2019-03-05 12:08:27 +01:00
|
|
|
|
return unlock_scd (ctrl, err);
|
2013-02-06 14:00:05 +09:00
|
|
|
|
}
|
2017-02-22 09:40:50 +01:00
|
|
|
|
|
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
/* Type used with the card_getattr_cb. */
|
|
|
|
|
struct card_getattr_parm_s {
|
|
|
|
|
const char *keyword; /* Keyword to look for. */
|
|
|
|
|
size_t keywordlen; /* strlen of KEYWORD. */
|
|
|
|
|
char *data; /* Malloced and unescaped data. */
|
|
|
|
|
int error; /* ERRNO value or 0 on success. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Callback function for agent_card_getattr. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-02-24 21:40:48 +00:00
|
|
|
|
card_getattr_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2005-02-24 21:40:48 +00:00
|
|
|
|
struct card_getattr_parm_s *parm = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
if (parm->data)
|
|
|
|
|
return 0; /* We want only the first occurrence. */
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (keywordlen == parm->keywordlen
|
|
|
|
|
&& !memcmp (keyword, parm->keyword, keywordlen))
|
|
|
|
|
{
|
2009-04-01 10:51:53 +00:00
|
|
|
|
parm->data = percent_plus_unescape ((const unsigned char*)line, 0xff);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!parm->data)
|
|
|
|
|
parm->error = errno;
|
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
|
|
|
|
|
err = handle_pincache_put (line);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2005-02-24 21:40:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Call the agent to retrieve a single line data object. On success
|
|
|
|
|
the object is malloced and stored at RESULT; it is guaranteed that
|
|
|
|
|
NULL is never stored in this case. On error an error code is
|
|
|
|
|
returned and NULL stored at RESULT. */
|
|
|
|
|
gpg_error_t
|
2020-01-13 16:43:53 +09:00
|
|
|
|
agent_card_getattr (ctrl_t ctrl, const char *name, char **result,
|
|
|
|
|
const char *keygrip)
|
2005-02-24 21:40:48 +00:00
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
struct card_getattr_parm_s parm;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
*result = NULL;
|
|
|
|
|
|
|
|
|
|
if (!*name)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.keyword = name;
|
|
|
|
|
parm.keywordlen = strlen (name);
|
|
|
|
|
|
|
|
|
|
/* We assume that NAME does not need escaping. */
|
|
|
|
|
if (8 + strlen (name) > DIM(line)-1)
|
|
|
|
|
return gpg_error (GPG_ERR_TOO_LARGE);
|
2020-01-13 16:43:53 +09:00
|
|
|
|
if (keygrip == NULL)
|
|
|
|
|
stpcpy (stpcpy (line, "GETATTR "), name);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, sizeof line, "GETATTR %s %s", name, keygrip);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
|
|
|
|
|
err = start_scd (ctrl);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
err = assuan_transact (daemon_ctx (ctrl), line,
|
2006-09-06 16:35:52 +00:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
card_getattr_cb, &parm);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err && parm.error)
|
|
|
|
|
err = gpg_error_from_errno (parm.error);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err && !parm.data)
|
|
|
|
|
err = gpg_error (GPG_ERR_NO_DATA);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-02-24 21:40:48 +00:00
|
|
|
|
if (!err)
|
|
|
|
|
*result = parm.data;
|
|
|
|
|
else
|
|
|
|
|
xfree (parm.data);
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, err);
|
2005-02-24 21:40:48 +00:00
|
|
|
|
}
|
2017-02-22 09:40:50 +01:00
|
|
|
|
|
|
|
|
|
|
2017-02-17 19:39:28 +09:00
|
|
|
|
|
2019-05-15 15:53:35 +09:00
|
|
|
|
struct card_keyinfo_parm_s {
|
|
|
|
|
int error;
|
|
|
|
|
struct card_key_info_s *list;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Callback function for agent_card_keylist. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
card_keyinfo_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2019-05-15 15:53:35 +09:00
|
|
|
|
struct card_keyinfo_parm_s *parm = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (keywordlen == 7 && !memcmp (keyword, "KEYINFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int n;
|
|
|
|
|
struct card_key_info_s *keyinfo;
|
|
|
|
|
struct card_key_info_s **l_p = &parm->list;
|
|
|
|
|
|
|
|
|
|
while ((*l_p))
|
|
|
|
|
l_p = &(*l_p)->next;
|
|
|
|
|
|
|
|
|
|
keyinfo = xtrycalloc (1, sizeof *keyinfo);
|
|
|
|
|
if (!keyinfo)
|
|
|
|
|
{
|
|
|
|
|
alloc_error:
|
|
|
|
|
if (!parm->error)
|
|
|
|
|
parm->error = gpg_error_from_syserror ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (n=0,s=line; hexdigitp (s); s++, n++)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (n != 40)
|
|
|
|
|
{
|
|
|
|
|
parm_error:
|
|
|
|
|
if (!parm->error)
|
|
|
|
|
parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memcpy (keyinfo->keygrip, line, 40);
|
2020-01-13 16:43:53 +09:00
|
|
|
|
keyinfo->keygrip[40] = 0;
|
2019-05-15 15:53:35 +09:00
|
|
|
|
|
|
|
|
|
line = s;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (*line++ != 'T')
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
for (n=0,s=line; hexdigitp (s); s++, n++)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
if (!n)
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
keyinfo->serialno = xtrymalloc (n+1);
|
|
|
|
|
if (!keyinfo->serialno)
|
|
|
|
|
goto alloc_error;
|
|
|
|
|
|
|
|
|
|
memcpy (keyinfo->serialno, line, n);
|
|
|
|
|
keyinfo->serialno[n] = 0;
|
|
|
|
|
|
|
|
|
|
line = s;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
|
|
|
|
goto parm_error;
|
|
|
|
|
|
|
|
|
|
keyinfo->idstr = xtrystrdup (line);
|
|
|
|
|
if (!keyinfo->idstr)
|
|
|
|
|
goto alloc_error;
|
|
|
|
|
|
|
|
|
|
*l_p = keyinfo;
|
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
|
|
|
|
|
err = handle_pincache_put (line);
|
2019-05-15 15:53:35 +09:00
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2019-05-15 15:53:35 +09:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
agent_card_free_keyinfo (struct card_key_info_s *l)
|
|
|
|
|
{
|
|
|
|
|
struct card_key_info_s *l_next;
|
|
|
|
|
|
|
|
|
|
for (; l; l = l_next)
|
|
|
|
|
{
|
|
|
|
|
l_next = l->next;
|
2020-01-13 15:22:50 +01:00
|
|
|
|
xfree (l->serialno);
|
|
|
|
|
xfree (l->idstr);
|
|
|
|
|
xfree (l);
|
2019-05-15 15:53:35 +09:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Call the scdaemon to check if a key of KEYGRIP is available, or
|
2020-01-09 11:55:42 +09:00
|
|
|
|
retrieve list of available keys on cards. With CAP, we can limit
|
|
|
|
|
keys with specified capability. On success, the allocated
|
|
|
|
|
structure is stored at RESULT. On error, an error code is returned
|
2019-05-15 15:53:35 +09:00
|
|
|
|
and NULL is stored at RESULT. */
|
|
|
|
|
gpg_error_t
|
2020-01-09 11:55:42 +09:00
|
|
|
|
agent_card_keyinfo (ctrl_t ctrl, const char *keygrip, int cap,
|
2019-05-15 15:53:35 +09:00
|
|
|
|
struct card_key_info_s **result)
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
struct card_keyinfo_parm_s parm;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2020-01-09 11:55:42 +09:00
|
|
|
|
char *list_option;
|
2019-05-15 15:53:35 +09:00
|
|
|
|
|
|
|
|
|
*result = NULL;
|
|
|
|
|
|
2020-01-09 11:55:42 +09:00
|
|
|
|
switch (cap)
|
|
|
|
|
{
|
|
|
|
|
case 0: list_option = "--list"; break;
|
|
|
|
|
case GCRY_PK_USAGE_SIGN: list_option = "--list=sign"; break;
|
|
|
|
|
case GCRY_PK_USAGE_ENCR: list_option = "--list=encr"; break;
|
|
|
|
|
case GCRY_PK_USAGE_AUTH: list_option = "--list=auth"; break;
|
|
|
|
|
default: return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-15 15:53:35 +09:00
|
|
|
|
memset (&parm, 0, sizeof parm);
|
2020-01-09 11:55:42 +09:00
|
|
|
|
snprintf (line, sizeof line, "KEYINFO %s", keygrip ? keygrip : list_option);
|
2019-05-15 15:53:35 +09:00
|
|
|
|
|
|
|
|
|
err = start_scd (ctrl);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
err = assuan_transact (daemon_ctx (ctrl), line,
|
2019-05-15 15:53:35 +09:00
|
|
|
|
NULL, NULL, NULL, NULL,
|
|
|
|
|
card_keyinfo_cb, &parm);
|
|
|
|
|
if (!err && parm.error)
|
|
|
|
|
err = parm.error;
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
*result = parm.list;
|
|
|
|
|
else
|
|
|
|
|
agent_card_free_keyinfo (parm.list);
|
|
|
|
|
|
|
|
|
|
return unlock_scd (ctrl, err);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_status_thru (void *opaque, const char *line)
|
|
|
|
|
{
|
2020-01-07 18:36:18 +01:00
|
|
|
|
gpg_error_t err = 0;
|
2006-09-06 16:35:52 +00:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char keyword[200];
|
|
|
|
|
int i;
|
|
|
|
|
|
2011-12-14 15:42:28 +01:00
|
|
|
|
if (line[0] == '#' && (!line[1] || spacep (line+1)))
|
|
|
|
|
{
|
|
|
|
|
/* We are called in convey comments mode. Now, if we see a
|
|
|
|
|
comment marker as keyword we forward the line verbatim to the
|
|
|
|
|
the caller. This way the comment lines from scdaemon won't
|
|
|
|
|
appear as status lines with keyword '#'. */
|
|
|
|
|
assuan_write_line (ctx, line);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (i=0; *line && !spacep (line) && i < DIM(keyword)-1; line++, i++)
|
|
|
|
|
keyword[i] = *line;
|
|
|
|
|
keyword[i] = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2011-12-14 15:42:28 +01:00
|
|
|
|
/* Truncate any remaining keyword stuff. */
|
|
|
|
|
for (; *line && !spacep (line); line++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
|
2020-01-07 18:36:18 +01:00
|
|
|
|
/* We do not want to pass PINCACHE_PUT through. */
|
|
|
|
|
if (!strcmp (keyword, "PINCACHE_PUT"))
|
|
|
|
|
err = handle_pincache_put (line);
|
|
|
|
|
else
|
|
|
|
|
assuan_write_status (ctx, keyword, line);
|
2011-12-14 15:42:28 +01:00
|
|
|
|
}
|
2020-01-07 18:36:18 +01:00
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_data_thru (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
assuan_send_data (ctx, buffer, length);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Send the line CMDLINE with command for the SCDdaemon to it and send
|
|
|
|
|
all status messages back. This command is used as a general quoting
|
2007-07-05 16:58:19 +00:00
|
|
|
|
mechanism to pass everything verbatim to SCDAEMON. The PIN
|
|
|
|
|
inquiry is handled inside gpg-agent. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2004-01-29 20:17:27 +00:00
|
|
|
|
agent_card_scd (ctrl_t ctrl, const char *cmdline,
|
2017-02-22 09:40:50 +01:00
|
|
|
|
int (*getpin_cb)(void *, const char *,
|
|
|
|
|
const char *, char*, size_t),
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *getpin_cb_arg, void *assuan_context)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
struct inq_needpin_parm_s inqparm;
|
2010-08-11 13:11:04 +00:00
|
|
|
|
int saveflag;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-01-29 20:17:27 +00:00
|
|
|
|
rc = start_scd (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
inqparm.ctx = daemon_ctx (ctrl);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
inqparm.getpin_cb = getpin_cb;
|
|
|
|
|
inqparm.getpin_cb_arg = getpin_cb_arg;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.getpin_cb_desc = NULL;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
inqparm.passthru = assuan_context;
|
2017-02-22 09:40:50 +01:00
|
|
|
|
inqparm.keydata = NULL;
|
|
|
|
|
inqparm.keydatalen = 0;
|
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
saveflag = assuan_get_flag (daemon_ctx (ctrl), ASSUAN_CONVEY_COMMENTS);
|
|
|
|
|
assuan_set_flag (daemon_ctx (ctrl), ASSUAN_CONVEY_COMMENTS, 1);
|
|
|
|
|
rc = assuan_transact (daemon_ctx (ctrl), cmdline,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pass_data_thru, assuan_context,
|
|
|
|
|
inq_needpin, &inqparm,
|
|
|
|
|
pass_status_thru, assuan_context);
|
2011-07-09 08:25:22 -04:00
|
|
|
|
|
2020-06-24 12:44:02 +02:00
|
|
|
|
assuan_set_flag (daemon_ctx (ctrl), ASSUAN_CONVEY_COMMENTS, saveflag);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return unlock_scd (ctrl, rc);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return unlock_scd (ctrl, 0);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|