2003-08-05 17:11:04 +00:00
|
|
|
|
/* command.c - SCdaemon command handler
|
2007-07-05 16:58:19 +00:00
|
|
|
|
* Copyright (C) 2001, 2002, 2003, 2004, 2005,
|
2011-12-13 16:55:42 +01:00
|
|
|
|
* 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <unistd.h>
|
2004-04-21 14:44:09 +00:00
|
|
|
|
#include <signal.h>
|
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
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
# include <npth.h>
|
2005-04-14 17:25:43 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00: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 00:01:25 +00:00
|
|
|
|
#include <assuan.h>
|
2003-11-12 15:17:44 +00:00
|
|
|
|
#include <ksba.h>
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
#include "iso7816.h"
|
2004-01-27 16:40:42 +00:00
|
|
|
|
#include "apdu.h" /* Required for apdu_*_reader (). */
|
2011-12-15 14:47:04 +01:00
|
|
|
|
#include "atr.h"
|
2007-04-03 16:57:37 +00:00
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
#include "ccid-driver.h"
|
|
|
|
|
#endif
|
2017-03-07 20:21:23 +09:00
|
|
|
|
#include "../common/asshelp.h"
|
|
|
|
|
#include "../common/server-help.h"
|
2011-12-15 14:47:04 +01:00
|
|
|
|
|
2020-01-07 18:45:33 +01:00
|
|
|
|
/* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN. That
|
|
|
|
|
* length needs to small compared to the maximum Assuan line length. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#define MAXLEN_PIN 100
|
|
|
|
|
|
2005-05-20 20:39:36 +00:00
|
|
|
|
/* Maximum allowed size of key data as used in inquiries. */
|
|
|
|
|
#define MAXLEN_KEYDATA 4096
|
|
|
|
|
|
2012-11-06 12:02:25 +01:00
|
|
|
|
/* Maximum allowed total data size for SETDATA. */
|
|
|
|
|
#define MAXLEN_SETDATA 4096
|
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
/* Maximum allowed size of certificate data as used in inquiries. */
|
|
|
|
|
#define MAXLEN_CERTDATA 16384
|
|
|
|
|
|
2019-01-31 14:26:17 +01:00
|
|
|
|
/* Maximum allowed size for "SETATTR --inquire". */
|
|
|
|
|
#define MAXLEN_SETATTRDATA 16384
|
|
|
|
|
|
2004-04-21 14:44:09 +00:00
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2016-12-28 12:29:17 +09:00
|
|
|
|
#define IS_LOCKED(c) (locked_session && locked_session != (c)->server_local)
|
2006-03-01 11:05:47 +00:00
|
|
|
|
|
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
/* Data used to associate an Assuan context with local server data.
|
|
|
|
|
This object describes the local properties of one session. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
struct server_local_s
|
2006-03-01 11:05:47 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
/* We keep a list of all active sessions with the anchor at
|
|
|
|
|
SESSION_LIST (see below). This field is used for linking. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
struct server_local_s *next_session;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
|
|
|
|
/* This object is usually assigned to a CTRL object (which is
|
2005-06-07 19:09:18 +00:00
|
|
|
|
globally visible). While enumerating all sessions we sometimes
|
2005-04-14 17:25:43 +00: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 17:36:11 +00:00
|
|
|
|
assuan_context_t assuan_ctx;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2018-03-27 16:24:17 +09:00
|
|
|
|
void *event_signal; /* Or NULL if not used. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#else
|
|
|
|
|
int event_signal; /* Or 0 if not used. */
|
|
|
|
|
#endif
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
/* True if the card has been removed and a reset is required to
|
|
|
|
|
continue operation. */
|
2020-04-02 15:39:26 +09:00
|
|
|
|
unsigned int card_removed:1;
|
2008-11-11 08:22:06 +00:00
|
|
|
|
|
2009-02-27 14:36:59 +00:00
|
|
|
|
/* If set to true we will be terminate ourself at the end of the
|
|
|
|
|
this session. */
|
2020-04-02 15:39:26 +09:00
|
|
|
|
unsigned int stopme:1;
|
2009-02-27 14:36:59 +00:00
|
|
|
|
|
2020-04-02 15:39:26 +09:00
|
|
|
|
/* If set to true, status change will be reported. */
|
|
|
|
|
unsigned int watching_status:1;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 17:25:43 +00: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;
|
|
|
|
|
|
2019-09-04 13:50:12 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Local prototypes. */
|
|
|
|
|
static int command_has_option (const char *cmd, const char *cmdopt);
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
2006-04-11 13:53:21 +00: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++)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (spacep (s) || *s == ':')
|
2006-04-11 13:53:21 +00:00
|
|
|
|
continue;
|
|
|
|
|
if (hexdigitp (s) && hexdigitp (s+1))
|
|
|
|
|
{
|
|
|
|
|
buffer[n++] = xtoi_2 (s);
|
|
|
|
|
s++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
*r_length = n;
|
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-03-01 11:05:47 +00:00
|
|
|
|
/* Reset the card and free the application context. With SEND_RESET
|
2008-11-03 19:09:34 +00:00
|
|
|
|
set to true actually send a RESET to the reader; this is the normal
|
|
|
|
|
way of calling the function. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static void
|
2006-03-01 11:05:47 +00:00
|
|
|
|
do_reset (ctrl_t ctrl, int send_reset)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card = ctrl->card_ctx;
|
2006-03-01 11:05:47 +00:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (card)
|
|
|
|
|
card_reset (card, ctrl, IS_LOCKED (ctrl)? 0: send_reset);
|
2006-03-01 11:05:47 +00: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");
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2019-06-19 08:50:40 +02:00
|
|
|
|
|
|
|
|
|
|
2004-04-20 14:17:10 +00: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 17:47:11 +00:00
|
|
|
|
static gpg_error_t
|
|
|
|
|
reset_notify (assuan_context_t ctx, char *line)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2004-04-20 14:17:10 +00: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 17:47:11 +00:00
|
|
|
|
(void) line;
|
|
|
|
|
|
2006-03-01 11:05:47 +00: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 17:47:11 +00:00
|
|
|
|
return 0;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
option_handler (assuan_context_t ctx, const char *key, const char *value)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-04-21 14:44:09 +00: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 18:18:21 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
if (!*value)
|
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
2018-03-27 16:24:17 +09:00
|
|
|
|
#ifdef _WIN64
|
|
|
|
|
ctrl->server_local->event_signal = (void *)strtoull (value, NULL, 16);
|
|
|
|
|
#else
|
|
|
|
|
ctrl->server_local->event_signal = (void *)strtoul (value, NULL, 16);
|
|
|
|
|
#endif
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#else
|
2004-04-21 14:44:09 +00:00
|
|
|
|
int i = *value? atoi (value) : -1;
|
|
|
|
|
if (i < 0)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_ASS_PARAMETER);
|
2004-04-21 14:44:09 +00:00
|
|
|
|
ctrl->server_local->event_signal = i;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#endif
|
2004-04-21 14:44:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-12-12 20:34:12 +01:00
|
|
|
|
/* If the card has not yet been opened, do it. */
|
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
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
open_card (ctrl_t ctrl)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-02-24 17:36:11 +00: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 16:35:52 +00:00
|
|
|
|
return gpg_error (GPG_ERR_CARD_REMOVED);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
2005-04-21 09:33:07 +00:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (ctrl->card_ctx)
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
return 0;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
return select_application (ctrl, NULL, &ctrl->card_ctx, 0, NULL, 0);
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
}
|
|
|
|
|
|
2019-09-04 13:38:50 +02:00
|
|
|
|
/* Explicitly open a card for a specific use of APPTYPE or SERIALNO.
|
Spelling cleanup.
No functional changes, just fixing minor spelling issues.
---
Most of these were identified from the command line by running:
codespell \
--ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
--skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
NEWS README README.maint TODO
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2020-02-18 09:34:42 -05:00
|
|
|
|
* If OPT_ALL is set also add all possible additional apps. */
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
static gpg_error_t
|
2019-06-21 11:41:58 +02:00
|
|
|
|
open_card_with_request (ctrl_t ctrl,
|
2019-09-04 13:38:50 +02:00
|
|
|
|
const char *apptypestr, const char *serialno,
|
|
|
|
|
int opt_all)
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
unsigned char *serialno_bin = NULL;
|
|
|
|
|
size_t serialno_bin_len = 0;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card = ctrl->card_ctx;
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
|
2019-06-25 09:48:18 +02:00
|
|
|
|
if (serialno)
|
|
|
|
|
serialno_bin = hex_to_buffer (serialno, &serialno_bin_len);
|
|
|
|
|
|
2009-03-24 11:40:57 +00: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. */
|
2019-06-21 11:41:58 +02:00
|
|
|
|
if (apptypestr && ctrl->card_ctx)
|
scd: Add an re-select mechanism to switch apps.
* scd/app-common.h (struct app_ctx_s): Add func ptr 'reselect'.
* scd/app-piv.c (do_reselect): New.
(app_select_piv): Move AID constant to file scope.
* scd/app-openpgp.c (do_reselect): New.
(app_select_openpgp): Move AID constant to file scope.
* scd/app.c (apptype_from_name): New.
(check_application_conflict): Check against all apps of the card.
Always set current_apptype.
(select_additional_application): New.
(maybe_switch_app): New.
(app_write_learn_status, app_readcert, app_readkey, app_getattr)
(app_setattr, app_sign, app_auth, app_decipher, app_writecert)
(app_writekey, app_genkey, app_change_pin, app_check_pin): Use it here.
(app_do_with_keygrip): Force reselect on success.
(app_new_register): Move setting of CURRENT_APPTYPE to ...
(select_application): here so that it will be set to the requested
card.
* scd/command.c (open_card_with_request): Select additional
application if possible.
--
Noet that we will likely need to rework this even more so to get well
defined semantics for card access.
Signed-off-by: Werner Koch <wk@gnupg.org>
2019-06-25 08:30:04 +02:00
|
|
|
|
{
|
2019-06-25 09:48:18 +02:00
|
|
|
|
err = check_application_conflict (ctrl->card_ctx, apptypestr,
|
|
|
|
|
serialno_bin, serialno_bin_len);
|
scd: Add an re-select mechanism to switch apps.
* scd/app-common.h (struct app_ctx_s): Add func ptr 'reselect'.
* scd/app-piv.c (do_reselect): New.
(app_select_piv): Move AID constant to file scope.
* scd/app-openpgp.c (do_reselect): New.
(app_select_openpgp): Move AID constant to file scope.
* scd/app.c (apptype_from_name): New.
(check_application_conflict): Check against all apps of the card.
Always set current_apptype.
(select_additional_application): New.
(maybe_switch_app): New.
(app_write_learn_status, app_readcert, app_readkey, app_getattr)
(app_setattr, app_sign, app_auth, app_decipher, app_writecert)
(app_writekey, app_genkey, app_change_pin, app_check_pin): Use it here.
(app_do_with_keygrip): Force reselect on success.
(app_new_register): Move setting of CURRENT_APPTYPE to ...
(select_application): here so that it will be set to the requested
card.
* scd/command.c (open_card_with_request): Select additional
application if possible.
--
Noet that we will likely need to rework this even more so to get well
defined semantics for card access.
Signed-off-by: Werner Koch <wk@gnupg.org>
2019-06-25 08:30:04 +02:00
|
|
|
|
if (gpg_err_code (err) == GPG_ERR_FALSE)
|
|
|
|
|
{
|
|
|
|
|
/* Different application but switching is supported. */
|
|
|
|
|
err = select_additional_application (ctrl, apptypestr);
|
|
|
|
|
}
|
2019-06-25 09:48:18 +02:00
|
|
|
|
goto leave;
|
scd: Add an re-select mechanism to switch apps.
* scd/app-common.h (struct app_ctx_s): Add func ptr 'reselect'.
* scd/app-piv.c (do_reselect): New.
(app_select_piv): Move AID constant to file scope.
* scd/app-openpgp.c (do_reselect): New.
(app_select_openpgp): Move AID constant to file scope.
* scd/app.c (apptype_from_name): New.
(check_application_conflict): Check against all apps of the card.
Always set current_apptype.
(select_additional_application): New.
(maybe_switch_app): New.
(app_write_learn_status, app_readcert, app_readkey, app_getattr)
(app_setattr, app_sign, app_auth, app_decipher, app_writecert)
(app_writekey, app_genkey, app_change_pin, app_check_pin): Use it here.
(app_do_with_keygrip): Force reselect on success.
(app_new_register): Move setting of CURRENT_APPTYPE to ...
(select_application): here so that it will be set to the requested
card.
* scd/command.c (open_card_with_request): Select additional
application if possible.
--
Noet that we will likely need to rework this even more so to get well
defined semantics for card access.
Signed-off-by: Werner Koch <wk@gnupg.org>
2019-06-25 08:30:04 +02:00
|
|
|
|
}
|
2009-03-24 11:40:57 +00:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
/* Re-scan USB devices. Release CARD, before the scan. */
|
|
|
|
|
/* FIXME: Is a card_unref sufficient or do we need to deallocate? */
|
|
|
|
|
ctrl->card_ctx = NULL;
|
2019-08-21 09:57:52 +09:00
|
|
|
|
ctrl->current_apptype = APPTYPE_NONE;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_unref (card);
|
2017-01-31 12:56:11 +09:00
|
|
|
|
|
2019-06-21 11:41:58 +02:00
|
|
|
|
err = select_application (ctrl, apptypestr, &ctrl->card_ctx, 1,
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
serialno_bin, serialno_bin_len);
|
2019-09-04 13:38:50 +02:00
|
|
|
|
if (!err && opt_all)
|
2020-01-03 11:43:55 +01:00
|
|
|
|
err = select_additional_application (ctrl, NULL);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2019-06-25 09:48:18 +02:00
|
|
|
|
leave:
|
|
|
|
|
xfree (serialno_bin);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_serialno[] =
|
2019-09-04 13:38:50 +02:00
|
|
|
|
"SERIALNO [--demand=<serialno>] [--all] [<apptype>]\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2015-11-16 12:41:46 +01:00
|
|
|
|
"Return the serial number of the card using a status response. This\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"function should be used to check for the presence of a card.\n"
|
|
|
|
|
"\n"
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
"If --demand is given, an application on the card with SERIALNO is\n"
|
|
|
|
|
"selected and an error is returned if no such card available.\n"
|
|
|
|
|
"\n"
|
2019-09-04 13:38:50 +02:00
|
|
|
|
"If --all is given, all possible other applications of the card are\n"
|
2020-01-13 12:08:23 +01:00
|
|
|
|
"also selected to prepare for things like \"LEARN --force --multi\".\n"
|
2019-09-04 13:38:50 +02:00
|
|
|
|
"\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2020-01-16 19:42:16 +01:00
|
|
|
|
"preference system.\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-02-24 21:40:48 +00:00
|
|
|
|
cmd_serialno (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-02-24 17:36:11 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2016-12-28 12:29:17 +09:00
|
|
|
|
struct server_local_s *sl;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc = 0;
|
|
|
|
|
char *serial;
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
const char *demand;
|
2019-09-04 13:38:50 +02:00
|
|
|
|
int opt_all = has_option (line, "--all");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ( IS_LOCKED (ctrl) )
|
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2016-12-28 12:29:17 +09:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((demand = has_option_name (line, "--demand")))
|
|
|
|
|
{
|
|
|
|
|
if (*demand != '=')
|
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
|
|
|
|
|
line = (char *)++demand;
|
|
|
|
|
for (; *line && !spacep (line); line++)
|
|
|
|
|
;
|
|
|
|
|
if (*line)
|
|
|
|
|
*line++ = 0;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
}
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
else
|
|
|
|
|
demand = NULL;
|
|
|
|
|
|
2019-09-04 13:38:50 +02:00
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
/* Clear the remove flag so that the open_card is able to reread it. */
|
|
|
|
|
if (ctrl->server_local->card_removed)
|
|
|
|
|
ctrl->server_local->card_removed = 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2019-09-04 13:38:50 +02:00
|
|
|
|
if ((rc = open_card_with_request (ctrl, *line? line:NULL, demand, opt_all)))
|
2011-12-12 21:02:54 +01:00
|
|
|
|
{
|
2016-12-28 12:29:17 +09:00
|
|
|
|
ctrl->server_local->card_removed = 1;
|
2011-12-12 21:02:54 +01:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2016-12-28 12:29:17 +09:00
|
|
|
|
/* Success, clear the card_removed flag for all sessions. */
|
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t c = sl->ctrl_backlink;
|
|
|
|
|
|
|
|
|
|
if (c != ctrl)
|
|
|
|
|
c->server_local->card_removed = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
serial = card_get_serialno (ctrl->card_ctx);
|
2017-01-18 15:48:50 +09:00
|
|
|
|
if (!serial)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
2005-04-27 12:09:21 +00:00
|
|
|
|
|
2017-01-18 15:48:50 +09:00
|
|
|
|
rc = assuan_write_status (ctx, "SERIALNO", serial);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
xfree (serial);
|
2012-02-07 13:51:47 +01:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-01-16 19:42:16 +01:00
|
|
|
|
|
|
|
|
|
static const char hlp_switchcard[] =
|
|
|
|
|
"SWITCHCARD [<serialno>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Make the card with SERIALNO the current card.\n"
|
|
|
|
|
"The command \"getinfo card_list\" can be used to list\n"
|
|
|
|
|
"the serial numbers of inserted and known cards. Note\n"
|
|
|
|
|
"that the command \"SERIALNO\" can be used to refresh\n"
|
|
|
|
|
"the list of known cards. A simple SERIALNO status\n"
|
|
|
|
|
"is printed on success.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_switchcard (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
unsigned char *sn_bin = NULL;
|
|
|
|
|
size_t sn_bin_len = 0;
|
|
|
|
|
|
|
|
|
|
if ((err = open_card (ctrl)))
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
|
|
|
|
if (*line)
|
|
|
|
|
{
|
|
|
|
|
sn_bin = hex_to_buffer (line, &sn_bin_len);
|
|
|
|
|
if (!sn_bin)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Note that an SN_BIN of NULL will only print the status. */
|
|
|
|
|
err = app_switch_current_card (ctrl, sn_bin, sn_bin_len);
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (sn_bin);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const char hlp_switchapp[] =
|
|
|
|
|
"SWITCHAPP [<appname>]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Make APPNAME the active application for the current card.\n"
|
|
|
|
|
"Only some cards support switching between application; the\n"
|
|
|
|
|
"command \"getinfo active_app\" can be used to get a list of\n"
|
|
|
|
|
"applications which can be switched to. A SERIALNO status\n"
|
|
|
|
|
"including the active appname is printed on success.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_switchapp (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
|
|
|
|
|
if ((err = open_card (ctrl)))
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
return app_switch_active_app (ctrl->card_ctx, ctrl, line);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_learn[] =
|
2019-09-04 12:08:07 +02:00
|
|
|
|
"LEARN [--force] [--keypairinfo] [--multi]\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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"
|
2017-01-18 15:48:50 +09:00
|
|
|
|
" INQUIRE KNOWNCARDP <hexstring_with_serialNumber>\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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"
|
2019-01-20 11:41:23 +01:00
|
|
|
|
"With the option --keypairinfo only KEYPARIINFO status lines are\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2019-01-20 11:41:23 +01:00
|
|
|
|
" PIV = PIV card\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
" NKS = NetKey card\n"
|
|
|
|
|
"\n"
|
2019-09-04 12:08:07 +02:00
|
|
|
|
"are implemented. These strings are aliases for the AID. With option\n"
|
|
|
|
|
"--multi information for all switchable apps are returned.\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2019-02-21 09:24:37 +01:00
|
|
|
|
" S KEYPAIRINFO <hexstring_with_keygrip> <hexstring_with_id> [<usage>]\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"If there is no certificate yet stored on the card a single 'X' is\n"
|
2020-02-13 11:51:54 +01:00
|
|
|
|
"returned as the keygrip. For more info see doc/DETAILS. In addition\n"
|
|
|
|
|
"to the keypair info, information about all certificates stored on the\n"
|
|
|
|
|
"card is also returned:\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_learn (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc = 0;
|
2009-03-18 11:18:56 +00:00
|
|
|
|
int only_keypairinfo = has_option (line, "--keypairinfo");
|
2019-09-04 12:08:07 +02:00
|
|
|
|
int opt_multi = has_option (line, "--multi");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00: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 11:18:56 +00:00
|
|
|
|
if (!only_keypairinfo)
|
|
|
|
|
{
|
2015-11-09 16:15:44 +09:00
|
|
|
|
const char *reader;
|
2009-03-18 11:18:56 +00:00
|
|
|
|
char *serial;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card = ctrl->card_ctx;
|
2016-12-28 12:29:17 +09:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!card)
|
2016-12-28 12:29:17 +09:00
|
|
|
|
return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
reader = apdu_get_reader_name (card->slot);
|
2015-11-09 16:15:44 +09:00
|
|
|
|
if (!reader)
|
|
|
|
|
return out_of_core ();
|
|
|
|
|
send_status_direct (ctrl, "READER", reader);
|
|
|
|
|
/* No need to free the string of READER. */
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
serial = card_get_serialno (ctrl->card_ctx);
|
2017-01-18 15:48:50 +09:00
|
|
|
|
if (!serial)
|
2019-04-25 14:49:49 +09:00
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
2012-02-07 13:51:47 +01:00
|
|
|
|
|
2017-01-18 15:48:50 +09:00
|
|
|
|
rc = assuan_write_status (ctx, "SERIALNO", serial);
|
2009-03-18 11:18:56 +00:00
|
|
|
|
if (rc < 0)
|
2012-02-07 13:51:47 +01:00
|
|
|
|
{
|
|
|
|
|
xfree (serial);
|
|
|
|
|
return out_of_core ();
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-03-18 11:18:56 +00:00
|
|
|
|
if (!has_option (line, "--force"))
|
|
|
|
|
{
|
|
|
|
|
char *command;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2017-01-18 15:48:50 +09:00
|
|
|
|
rc = gpgrt_asprintf (&command, "KNOWNCARDP %s", serial);
|
2009-03-18 11:18:56 +00:00
|
|
|
|
if (rc < 0)
|
|
|
|
|
{
|
2012-02-07 13:51:47 +01:00
|
|
|
|
xfree (serial);
|
2009-03-18 11:18:56 +00:00
|
|
|
|
return out_of_core ();
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
rc = assuan_inquire (ctx, command, NULL, NULL, 0);
|
2009-03-18 11:18:56 +00:00
|
|
|
|
xfree (command);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
if (gpg_err_code (rc) != GPG_ERR_ASS_CANCELED)
|
|
|
|
|
log_error ("inquire KNOWNCARDP failed: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
2012-02-07 13:51:47 +01:00
|
|
|
|
xfree (serial);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return rc;
|
2009-03-18 11:18:56 +00:00
|
|
|
|
}
|
2017-04-28 10:06:33 +09:00
|
|
|
|
/* Not canceled, so we have to proceed. */
|
2009-03-18 11:18:56 +00:00
|
|
|
|
}
|
2012-02-07 13:51:47 +01:00
|
|
|
|
xfree (serial);
|
2009-03-18 11:18:56 +00:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-04-27 12:09:21 +00:00
|
|
|
|
/* Let the application print out its collection of useful status
|
2004-01-27 16:40:42 +00:00
|
|
|
|
information. */
|
2005-04-27 12:09:21 +00:00
|
|
|
|
if (!rc)
|
2019-09-04 10:43:18 +02:00
|
|
|
|
rc = app_write_learn_status
|
|
|
|
|
(ctrl->card_ctx, ctrl,
|
2019-09-04 12:08:07 +02:00
|
|
|
|
( (only_keypairinfo? APP_LEARN_FLAG_KEYPAIRINFO : 0)
|
|
|
|
|
| (opt_multi? APP_LEARN_FLAG_MULTI : 0)) );
|
2004-01-27 16:40:42 +00:00
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-04 12:22:09 +00:00
|
|
|
|
static const char hlp_readcert[] =
|
2019-01-03 15:17:04 +01:00
|
|
|
|
"READCERT <hexified_certid>|<keyid>|<oid>\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_readcert (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *cert;
|
|
|
|
|
size_t ncert;
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2020-01-13 12:18:53 +01:00
|
|
|
|
line = xtrystrdup (line); /* Need a copy of the line. */
|
|
|
|
|
if (!line)
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_readcert (ctrl->card_ctx, ctrl, line, &cert, &ncert);
|
2005-04-27 12:09:21 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
|
2004-01-27 16:40:42 +00:00
|
|
|
|
xfree (line);
|
|
|
|
|
line = NULL;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, cert, ncert);
|
|
|
|
|
xfree (cert);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
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
|
2020-01-10 15:58:49 +09:00
|
|
|
|
do_readkey (card_t card, ctrl_t ctrl, const char *line,
|
|
|
|
|
int opt_info, int opt_nokey,
|
|
|
|
|
unsigned char **pk_p, size_t *pklen_p)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
2019-02-26 16:42:50 +01:00
|
|
|
|
|
2005-04-27 12:09:21 +00:00
|
|
|
|
/* If the application supports the READKEY function we use that.
|
|
|
|
|
Otherwise we use the old way by extracting it from the
|
|
|
|
|
certificate. */
|
2020-01-10 15:58:49 +09:00
|
|
|
|
rc = app_readkey (card, ctrl, line,
|
2019-04-03 17:31:09 +02:00
|
|
|
|
opt_info? APP_READKEY_FLAG_INFO : 0,
|
2020-01-10 15:58:49 +09:00
|
|
|
|
opt_nokey? NULL : pk_p, pklen_p);
|
2005-04-27 12:09:21 +00:00
|
|
|
|
if (!rc)
|
2020-01-10 15:58:49 +09:00
|
|
|
|
/* Okay, got that key. */
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (gpg_err_code (rc) == GPG_ERR_UNSUPPORTED_OPERATION
|
|
|
|
|
|| gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
|
2004-01-27 16:40:42 +00:00
|
|
|
|
{
|
2020-01-10 15:58:49 +09:00
|
|
|
|
unsigned char *cert = NULL;
|
|
|
|
|
size_t ncert;
|
|
|
|
|
|
2019-02-26 16:42:50 +01:00
|
|
|
|
/* Fall back to certificate reading. */
|
2020-01-10 15:58:49 +09:00
|
|
|
|
rc = app_readcert (card, ctrl, line, &cert, &ncert);
|
2004-01-27 16:40:42 +00:00
|
|
|
|
if (rc)
|
2019-02-26 16:42:50 +01:00
|
|
|
|
{
|
|
|
|
|
log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
|
2020-01-10 15:58:49 +09:00
|
|
|
|
return rc;
|
2019-02-26 16:42:50 +01:00
|
|
|
|
}
|
2020-01-10 15:58:49 +09:00
|
|
|
|
|
|
|
|
|
rc = app_help_pubkey_from_cert (cert, ncert, pk_p, pklen_p);
|
|
|
|
|
xfree (cert);
|
2019-02-26 16:42:50 +01:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to parse the certificate: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
2020-01-10 15:58:49 +09:00
|
|
|
|
return rc;
|
2019-02-26 16:42:50 +01:00
|
|
|
|
}
|
2019-04-03 17:31:09 +02:00
|
|
|
|
|
|
|
|
|
if (opt_info)
|
|
|
|
|
{
|
|
|
|
|
char keygripstr[KEYGRIP_LEN*2+1];
|
|
|
|
|
|
2020-03-31 19:55:15 +02:00
|
|
|
|
rc = app_help_get_keygrip_string_pk (*pk_p, *pklen_p,
|
2020-05-05 08:07:11 +02:00
|
|
|
|
keygripstr, NULL, NULL);
|
2019-04-03 17:31:09 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("app_help_get_keygrip_string failed: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
2020-01-10 15:58:49 +09:00
|
|
|
|
return rc;
|
2019-04-03 17:31:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* FIXME: Using LINE is not correct because it might be an
|
|
|
|
|
* OID and has not been canonicalized (i.e. uppercased). */
|
|
|
|
|
send_status_info (ctrl, "KEYPAIRINFO",
|
|
|
|
|
keygripstr, strlen (keygripstr),
|
|
|
|
|
line, strlen (line),
|
|
|
|
|
NULL, (size_t)0);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2019-02-26 16:42:50 +01:00
|
|
|
|
else
|
2020-01-10 15:58:49 +09:00
|
|
|
|
log_error ("app_readkey failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char hlp_readkey[] =
|
|
|
|
|
"READKEY [--advanced] [--info[-only]] <keyid>|<oid>|<keygrip>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Return the public key for the given cert or key ID as a standard\n"
|
|
|
|
|
"S-expression. With --advanced the S-expression is returned in\n"
|
|
|
|
|
"advanced format. With --info a KEYPAIRINFO status line is also\n"
|
|
|
|
|
"emitted; with --info-only the regular output is suppressed.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_readkey (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc;
|
|
|
|
|
int advanced = 0;
|
|
|
|
|
int opt_info = 0;
|
|
|
|
|
int opt_nokey = 0;
|
|
|
|
|
unsigned char *pk = NULL;
|
|
|
|
|
size_t pklen;
|
|
|
|
|
card_t card;
|
|
|
|
|
int direct = 0;
|
|
|
|
|
|
|
|
|
|
if ((rc = open_card (ctrl)))
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (has_option (line, "--advanced"))
|
|
|
|
|
advanced = 1;
|
|
|
|
|
if (has_option (line, "--info"))
|
|
|
|
|
opt_info = 1;
|
|
|
|
|
if (has_option (line, "--info-only"))
|
|
|
|
|
opt_info = opt_nokey = 1;
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
2020-01-13 12:18:53 +01:00
|
|
|
|
|
|
|
|
|
line = xtrystrdup (line); /* Need a copy of the line. */
|
|
|
|
|
if (!line)
|
|
|
|
|
return gpg_error_from_syserror ();
|
2020-01-10 15:58:49 +09:00
|
|
|
|
|
|
|
|
|
if (strlen (line) == 40)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2020-01-10 15:58:49 +09:00
|
|
|
|
card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, line, 0);
|
|
|
|
|
direct = 1;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2020-01-10 15:58:49 +09:00
|
|
|
|
else
|
|
|
|
|
card = ctrl->card_ctx;
|
|
|
|
|
|
|
|
|
|
if (card)
|
|
|
|
|
{
|
|
|
|
|
if (direct)
|
|
|
|
|
card_ref (card);
|
|
|
|
|
|
|
|
|
|
rc = do_readkey (card, ctrl, line, opt_info, opt_nokey, &pk, &pklen);
|
|
|
|
|
|
|
|
|
|
if (direct)
|
|
|
|
|
card_unref (card);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-04-03 17:31:09 +02:00
|
|
|
|
if (opt_nokey)
|
|
|
|
|
;
|
|
|
|
|
else if (advanced)
|
2019-01-03 15:17:04 +01:00
|
|
|
|
{
|
|
|
|
|
gcry_sexp_t s_key;
|
2019-02-26 16:42:50 +01:00
|
|
|
|
unsigned char *pkadv;
|
|
|
|
|
size_t pkadvlen;
|
2019-01-03 15:17:04 +01:00
|
|
|
|
|
2019-02-26 16:42:50 +01:00
|
|
|
|
rc = gcry_sexp_new (&s_key, pk, pklen, 0);
|
2019-01-03 15:17:04 +01:00
|
|
|
|
if (rc)
|
|
|
|
|
goto leave;
|
|
|
|
|
|
2019-02-26 16:42:50 +01:00
|
|
|
|
pkadvlen = gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, NULL, 0);
|
|
|
|
|
pkadv = xtrymalloc (pkadvlen);
|
|
|
|
|
if (!pkadv)
|
2019-01-03 15:17:04 +01:00
|
|
|
|
{
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2019-02-26 16:42:50 +01:00
|
|
|
|
log_assert (pkadvlen);
|
2019-01-03 15:17:04 +01:00
|
|
|
|
|
2019-02-26 16:42:50 +01:00
|
|
|
|
gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, pkadv, pkadvlen);
|
2019-01-03 15:17:04 +01:00
|
|
|
|
gcry_sexp_release (s_key);
|
|
|
|
|
/* (One less to adjust for the trailing '\0') */
|
2019-02-26 16:42:50 +01:00
|
|
|
|
rc = assuan_send_data (ctx, pkadv, pkadvlen-1);
|
|
|
|
|
xfree (pkadv);
|
2019-01-03 15:17:04 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
2019-02-26 16:42:50 +01:00
|
|
|
|
rc = assuan_send_data (ctx, pk, pklen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
leave:
|
2019-02-26 16:42:50 +01:00
|
|
|
|
xfree (pk);
|
2020-01-13 12:18:53 +01:00
|
|
|
|
xfree (line);
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_setdata[] =
|
2012-11-06 12:02:25 +01:00
|
|
|
|
"SETDATA [--append] <hexstring>\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2012-11-06 12:02:25 +01:00
|
|
|
|
"The client should use this command to tell us the data he want to sign.\n"
|
|
|
|
|
"With the option --append, the data is appended to the data set by a\n"
|
|
|
|
|
"previous SETDATA 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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_setdata (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2012-11-06 12:02:25 +01:00
|
|
|
|
int append;
|
|
|
|
|
int n, i, off;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char *p;
|
|
|
|
|
unsigned char *buf;
|
|
|
|
|
|
2012-11-06 12:02:25 +01:00
|
|
|
|
append = (ctrl->in_data.value && has_option (line, "--append"));
|
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
if (locked_session && locked_session != ctrl->server_local)
|
2005-04-21 09:33:07 +00:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
2005-04-11 16:20:10 +00:00
|
|
|
|
|
|
|
|
|
/* Parse the hexstring. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
for (p=line,n=0; hexdigitp (p); p++, n++)
|
|
|
|
|
;
|
|
|
|
|
if (*p)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "invalid hexstring");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!n)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no data given");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if ((n&1))
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "odd number of digits");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
n /= 2;
|
2012-11-06 12:02:25 +01:00
|
|
|
|
if (append)
|
|
|
|
|
{
|
|
|
|
|
if (ctrl->in_data.valuelen + n > MAXLEN_SETDATA)
|
|
|
|
|
return set_error (GPG_ERR_TOO_LARGE,
|
|
|
|
|
"limit on total size of data reached");
|
|
|
|
|
buf = xtrymalloc (ctrl->in_data.valuelen + n);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
buf = xtrymalloc (n);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!buf)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2012-11-06 12:02:25 +01:00
|
|
|
|
if (append)
|
|
|
|
|
{
|
|
|
|
|
memcpy (buf, ctrl->in_data.value, ctrl->in_data.valuelen);
|
|
|
|
|
off = ctrl->in_data.valuelen;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
off = 0;
|
|
|
|
|
for (p=line, i=0; i < n; p += 2, i++)
|
|
|
|
|
buf[off+i] = xtoi_2 (p);
|
|
|
|
|
|
2009-10-28 12:02:15 +00:00
|
|
|
|
xfree (ctrl->in_data.value);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
ctrl->in_data.value = buf;
|
2012-11-06 12:02:25 +01:00
|
|
|
|
ctrl->in_data.valuelen = off+n;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static gpg_error_t
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pin_cb (void *opaque, const char *info, char **retstr)
|
|
|
|
|
{
|
2005-04-11 16:20:10 +00:00
|
|
|
|
assuan_context_t ctx = opaque;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char *command;
|
|
|
|
|
int rc;
|
2003-11-12 15:17:44 +00:00
|
|
|
|
unsigned char *value;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t valuelen;
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if (!retstr)
|
|
|
|
|
{
|
scd: Rename 'keypad' to 'pinpad'.
* NEWS: Mention scd changes.
* agent/divert-scd.c (getpin_cb): Change message.
* agent/call-scd.c (inq_needpin): Change the protocol to
POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
* scd/command.c (pin_cb): Likewise.
* scd/apdu.c (struct reader_table_s): Rename member functions.
(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/iso7816.h (iso7816_check_pinpad): Rename.
* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
(iso7816_check_pinpad): Rename.
(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
the change.
* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
* scd/ccid-driver.c (ccid_transceive_secure): Use it.
* scd/app-dinsig.c (verify_pin): Follow the change.
* scd/app-nks.c (verify_pin): Follow the change.
* scd/app-openpgp.c (check_pinpad_request): Rename.
(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
the change.
* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
* scd/scdaemon.h (opt): Rename to disable_pinpad,
enable_pinpad_varlen.
* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
disable-pinpad.
2013-02-07 10:07:51 +09:00
|
|
|
|
/* We prompt for pinpad entry. To make sure that the popup has
|
2006-11-20 16:49:41 +00:00
|
|
|
|
been show we use an inquire and not just a status message.
|
|
|
|
|
We ignore any value returned. */
|
|
|
|
|
if (info)
|
|
|
|
|
{
|
scd: Rename 'keypad' to 'pinpad'.
* NEWS: Mention scd changes.
* agent/divert-scd.c (getpin_cb): Change message.
* agent/call-scd.c (inq_needpin): Change the protocol to
POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
* scd/command.c (pin_cb): Likewise.
* scd/apdu.c (struct reader_table_s): Rename member functions.
(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/iso7816.h (iso7816_check_pinpad): Rename.
* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
(iso7816_check_pinpad): Rename.
(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
the change.
* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
* scd/ccid-driver.c (ccid_transceive_secure): Use it.
* scd/app-dinsig.c (verify_pin): Follow the change.
* scd/app-nks.c (verify_pin): Follow the change.
* scd/app-openpgp.c (check_pinpad_request): Rename.
(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
the change.
* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
* scd/scdaemon.h (opt): Rename to disable_pinpad,
enable_pinpad_varlen.
* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
disable-pinpad.
2013-02-07 10:07:51 +09:00
|
|
|
|
log_debug ("prompting for pinpad entry '%s'\n", info);
|
2014-08-26 17:47:22 +02:00
|
|
|
|
rc = gpgrt_asprintf (&command, "POPUPPINPADPROMPT %s", info);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if (rc < 0)
|
|
|
|
|
return gpg_error (gpg_err_code_from_errno (errno));
|
2011-02-04 12:57:53 +01:00
|
|
|
|
rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
|
|
|
|
|
xfree (command);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
scd: Rename 'keypad' to 'pinpad'.
* NEWS: Mention scd changes.
* agent/divert-scd.c (getpin_cb): Change message.
* agent/call-scd.c (inq_needpin): Change the protocol to
POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
* scd/command.c (pin_cb): Likewise.
* scd/apdu.c (struct reader_table_s): Rename member functions.
(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/iso7816.h (iso7816_check_pinpad): Rename.
* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
(iso7816_check_pinpad): Rename.
(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
the change.
* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
* scd/ccid-driver.c (ccid_transceive_secure): Use it.
* scd/app-dinsig.c (verify_pin): Follow the change.
* scd/app-nks.c (verify_pin): Follow the change.
* scd/app-openpgp.c (check_pinpad_request): Rename.
(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
the change.
* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
* scd/scdaemon.h (opt): Rename to disable_pinpad,
enable_pinpad_varlen.
* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
disable-pinpad.
2013-02-07 10:07:51 +09:00
|
|
|
|
log_debug ("dismiss pinpad entry prompt\n");
|
|
|
|
|
rc = assuan_inquire (ctx, "DISMISSPINPADPROMPT",
|
2011-02-04 12:57:53 +01:00
|
|
|
|
&value, &valuelen, MAXLEN_PIN);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
}
|
|
|
|
|
if (!rc)
|
|
|
|
|
xfree (value);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*retstr = NULL;
|
|
|
|
|
log_debug ("asking for PIN '%s'\n", info);
|
|
|
|
|
|
2014-08-26 17:47:22 +02:00
|
|
|
|
rc = gpgrt_asprintf (&command, "NEEDPIN %s", info);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc < 0)
|
2004-03-16 10:49:37 +00:00
|
|
|
|
return gpg_error (gpg_err_code_from_errno (errno));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-04-27 12:09:21 +00:00
|
|
|
|
/* Fixme: Write an inquire function which returns the result in
|
2005-09-06 18:42:13 +00:00
|
|
|
|
secure memory and check all further handling of the PIN. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
|
|
|
|
|
xfree (command);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00: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 08:12:03 +00:00
|
|
|
|
*retstr = (char*)value;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_pksign[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_pksign (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
2006-03-21 12:48:51 +00:00
|
|
|
|
int hash_algo;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
int direct = 0;
|
2006-03-21 12:48:51 +00:00
|
|
|
|
|
|
|
|
|
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 19:27:04 +00: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 12:48:51 +00:00
|
|
|
|
else if (has_option (line, "--hash=md5"))
|
|
|
|
|
hash_algo = GCRY_MD_MD5;
|
|
|
|
|
else if (!strstr (line, "--"))
|
2011-02-04 12:57:53 +01:00
|
|
|
|
hash_algo = GCRY_MD_SHA1;
|
2006-03-21 12:48:51 +00:00
|
|
|
|
else
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "invalid hash algorithm");
|
2008-09-23 09:57:45 +00:00
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00: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 09:58:02 +00:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
/* When it's a keygrip, we directly use the card, with no change of
|
|
|
|
|
ctrl->card_ctx. */
|
2019-05-07 09:41:14 +09:00
|
|
|
|
if (strlen (keyidstr) == 40)
|
|
|
|
|
{
|
2019-12-19 17:30:59 +09:00
|
|
|
|
card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
direct = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card = ctrl->card_ctx;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (card)
|
2019-05-07 09:41:14 +09:00
|
|
|
|
{
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_ref (card);
|
|
|
|
|
rc = app_sign (card, ctrl,
|
2019-05-07 09:41:14 +09:00
|
|
|
|
keyidstr, hash_algo,
|
|
|
|
|
pin_cb, ctx,
|
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen);
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_unref (card);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
2005-04-27 12:09:21 +00:00
|
|
|
|
|
2003-08-25 09:58:02 +00:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 12:46:06 +00:00
|
|
|
|
log_error ("app_sign failed: %s\n", gpg_strerror (rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_pkauth[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_pkauth (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
int direct = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
2006-03-21 12:48:51 +00:00
|
|
|
|
/* We have to use a copy of the key ID because the function may use
|
2003-08-05 17:11:04 +00:00
|
|
|
|
the pin_cb which in turn uses the assuan line buffer and thus
|
|
|
|
|
overwriting the original line with the keyid */
|
2003-08-25 09:58:02 +00:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
/* When it's a keygrip, we directly use CARD, with no change of
|
|
|
|
|
ctrl->card_ctx. */
|
2019-05-07 09:41:14 +09:00
|
|
|
|
if (strlen (keyidstr) == 40)
|
|
|
|
|
{
|
2019-12-19 17:30:59 +09:00
|
|
|
|
card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
direct = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card = ctrl->card_ctx;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (card)
|
2019-05-07 09:41:14 +09:00
|
|
|
|
{
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_ref (card);
|
|
|
|
|
rc = app_auth (card, ctrl, keyidstr, pin_cb, ctx,
|
2019-05-07 09:41:14 +09:00
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen);
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_unref (card);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
|
|
|
|
|
2003-08-25 09:58:02 +00:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 12:46:06 +00:00
|
|
|
|
log_error ("app_auth failed: %s\n", gpg_strerror (rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_pkdecrypt[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_pkdecrypt (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *outdata;
|
|
|
|
|
size_t outdatalen;
|
|
|
|
|
char *keyidstr;
|
2013-08-26 17:29:54 +02:00
|
|
|
|
unsigned int infoflags;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
int direct = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2003-08-25 09:58:02 +00:00
|
|
|
|
keyidstr = xtrystrdup (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!keyidstr)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2019-05-07 09:41:14 +09:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
/* When it's a keygrip, we directly use CARD, with no change of
|
|
|
|
|
ctrl->card_ctx. */
|
2019-05-07 09:41:14 +09:00
|
|
|
|
if (strlen (keyidstr) == 40)
|
|
|
|
|
{
|
2019-12-19 17:30:59 +09:00
|
|
|
|
card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
direct = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card = ctrl->card_ctx;
|
2019-05-07 09:41:14 +09:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (card)
|
2019-05-07 09:41:14 +09:00
|
|
|
|
{
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_ref (card);
|
|
|
|
|
rc = app_decipher (card, ctrl, keyidstr, pin_cb, ctx,
|
2019-05-07 09:41:14 +09:00
|
|
|
|
ctrl->in_data.value, ctrl->in_data.valuelen,
|
|
|
|
|
&outdata, &outdatalen, &infoflags);
|
|
|
|
|
if (direct)
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_unref (card);
|
2019-05-07 09:41:14 +09:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
2005-04-27 12:09:21 +00:00
|
|
|
|
|
2003-08-25 09:58:02 +00:00
|
|
|
|
xfree (keyidstr);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2009-03-30 12:46:06 +00:00
|
|
|
|
log_error ("app_decipher failed: %s\n", gpg_strerror (rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2013-08-26 17:29:54 +02:00
|
|
|
|
/* If the card driver told us that there is no padding, send a
|
|
|
|
|
status line. If there is a padding it is assumed that the
|
|
|
|
|
caller knows what padding is used. It would have been better
|
|
|
|
|
to always send that information but for backward
|
|
|
|
|
compatibility we can't do that. */
|
|
|
|
|
if ((infoflags & APP_DECIPHER_INFO_NOPAD))
|
|
|
|
|
send_status_direct (ctrl, "PADDING", "0");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
rc = assuan_send_data (ctx, outdata, outdatalen);
|
|
|
|
|
xfree (outdata);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_getattr[] =
|
2020-01-10 15:58:49 +09:00
|
|
|
|
"GETATTR <name> [<keygrip>]\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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"
|
2015-11-16 12:41:46 +01:00
|
|
|
|
"this works as long as no one uses arbitrary escaping. \n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2020-01-10 15:58:49 +09:00
|
|
|
|
"Note, that this function may even be used on a locked card.\n"
|
|
|
|
|
"When KEYGRIP is specified, it accesses directly with the KEYGRIP.";
|
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-04-11 16:20:10 +00:00
|
|
|
|
cmd_getattr (assuan_context_t ctx, char *line)
|
2003-09-30 17:35:05 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-09-30 17:35:05 +00:00
|
|
|
|
int rc;
|
2005-06-16 08:12:03 +00:00
|
|
|
|
const char *keyword;
|
2020-01-10 15:58:49 +09:00
|
|
|
|
card_t card;
|
|
|
|
|
int direct = 0;
|
2003-09-30 17:35:05 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-09-30 17:35:05 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
keyword = line;
|
|
|
|
|
for (; *line && !spacep (line); line++)
|
|
|
|
|
;
|
|
|
|
|
if (*line)
|
2020-01-10 15:58:49 +09:00
|
|
|
|
*line++ = 0;
|
2003-09-30 17:35:05 +00:00
|
|
|
|
|
2020-01-10 15:58:49 +09:00
|
|
|
|
if (strlen (line) == 40)
|
|
|
|
|
{
|
|
|
|
|
card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, line, 0);
|
|
|
|
|
direct = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
card = ctrl->card_ctx;
|
|
|
|
|
|
|
|
|
|
if (card)
|
|
|
|
|
{
|
|
|
|
|
if (direct)
|
|
|
|
|
card_ref (card);
|
2003-09-30 17:35:05 +00:00
|
|
|
|
|
2020-01-10 15:58:49 +09:00
|
|
|
|
/* FIXME: Applications should not return sensitive data if the card
|
|
|
|
|
is locked. */
|
|
|
|
|
rc = app_getattr (card, ctrl, keyword);
|
|
|
|
|
|
|
|
|
|
if (direct)
|
|
|
|
|
card_unref (card);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_SECKEY);
|
2003-09-30 17:35:05 +00:00
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-09-30 17:35:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_setattr[] =
|
2019-01-31 14:26:17 +01:00
|
|
|
|
"SETATTR [--inquire] <name> <value> \n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2017-02-20 16:19:50 -05:00
|
|
|
|
"This command is used to store data on a smartcard. The allowed\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2015-11-16 12:41:46 +01:00
|
|
|
|
"escaped; this works as long as no one uses arbitrary escaping.\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2019-01-31 14:26:17 +01:00
|
|
|
|
"If the option --inquire is used, VALUE shall not be given; instead\n"
|
|
|
|
|
"an inquiry using the keyword \"VALUE\" is used to retrieve it. The\n"
|
|
|
|
|
"value is in this case considered to be confidential and not logged.\n"
|
|
|
|
|
"\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_setattr (assuan_context_t ctx, char *orig_line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2019-01-31 14:26:17 +01:00
|
|
|
|
gpg_error_t err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
char *keyword;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
size_t nbytes;
|
2003-08-25 09:58:02 +00:00
|
|
|
|
char *line, *linebuf;
|
2019-01-31 14:26:17 +01:00
|
|
|
|
int opt_inquire;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-01-31 14:26:17 +01:00
|
|
|
|
opt_inquire = has_option (orig_line, "--inquire");
|
|
|
|
|
orig_line = skip_options (orig_line);
|
|
|
|
|
|
|
|
|
|
if ((err = open_card (ctrl)))
|
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-08-25 09:58:02 +00: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 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-25 09:58:02 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
keyword = line;
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
if (*line)
|
|
|
|
|
*line++ = 0;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
2019-01-31 14:26:17 +01:00
|
|
|
|
if (opt_inquire)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *value;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-01-31 14:26:17 +01:00
|
|
|
|
assuan_begin_confidential (ctx);
|
|
|
|
|
err = assuan_inquire (ctx, "VALUE", &value, &nbytes, MAXLEN_SETATTRDATA);
|
|
|
|
|
assuan_end_confidential (ctx);
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
2019-06-19 08:50:40 +02:00
|
|
|
|
err = app_setattr (ctrl->card_ctx, ctrl, keyword, pin_cb, ctx,
|
2019-01-31 14:26:17 +01:00
|
|
|
|
value, nbytes);
|
|
|
|
|
wipememory (value, nbytes);
|
|
|
|
|
xfree (value);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-01-31 14:26:17 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nbytes = percent_plus_unescape_inplace (line, 0);
|
2019-06-19 08:50:40 +02:00
|
|
|
|
err = app_setattr (ctrl->card_ctx, ctrl, keyword, pin_cb, ctx,
|
2019-01-31 14:26:17 +01:00
|
|
|
|
(const unsigned char*)line, nbytes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xfree (linebuf);
|
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-20 20:39:36 +00:00
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_writecert[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"WRITECERT <hexified_certid>\n"
|
|
|
|
|
"\n"
|
2019-01-31 14:26:17 +01:00
|
|
|
|
"This command is used to store a certificate on a smartcard. The\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2017-02-20 16:19:50 -05:00
|
|
|
|
"In almost all cases a PIN will be requested. See the related\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2008-09-23 09:57:45 +00: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;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2008-09-23 09:57:45 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2008-09-23 09:57:45 +00:00
|
|
|
|
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. */
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_writecert (ctrl->card_ctx, ctrl, certid,
|
2008-09-23 09:57:45 +00:00
|
|
|
|
pin_cb, ctx, certdata, certdatalen);
|
|
|
|
|
xfree (certid);
|
|
|
|
|
xfree (certdata);
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_writekey[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"WRITEKEY [--force] <keyid> \n"
|
|
|
|
|
"\n"
|
2017-02-20 16:19:50 -05:00
|
|
|
|
"This command is used to store a secret key on a smartcard. The\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-05-20 20:39:36 +00: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;
|
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2005-05-20 20:39:36 +00:00
|
|
|
|
if (!*line)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no keyid given");
|
2005-05-20 20:39:36 +00:00
|
|
|
|
keyid = line;
|
|
|
|
|
while (*line && !spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2005-05-20 20:39:36 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2005-05-20 20:39:36 +00:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
keyid = xtrystrdup (keyid);
|
|
|
|
|
if (!keyid)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2005-05-20 20:39:36 +00:00
|
|
|
|
|
|
|
|
|
/* Now get the actual keydata. */
|
2007-07-05 16:58:19 +00:00
|
|
|
|
assuan_begin_confidential (ctx);
|
2005-05-20 20:39:36 +00:00
|
|
|
|
rc = assuan_inquire (ctx, "KEYDATA", &keydata, &keydatalen, MAXLEN_KEYDATA);
|
2007-07-05 16:58:19 +00:00
|
|
|
|
assuan_end_confidential (ctx);
|
2005-05-20 20:39:36 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (keyid);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write the key to the card. */
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_writekey (ctrl->card_ctx, ctrl, keyid, force? 1:0,
|
2005-05-20 20:39:36 +00:00
|
|
|
|
pin_cb, ctx, keydata, keydatalen);
|
|
|
|
|
xfree (keyid);
|
|
|
|
|
xfree (keydata);
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2005-05-20 20:39:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_genkey[] =
|
2020-02-11 14:49:11 +01:00
|
|
|
|
"GENKEY [--force] [--timestamp=<isodate>] [--algo=ALGO] <keyref>\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
2019-02-08 11:53:34 +01:00
|
|
|
|
"Generate a key on-card identified by <keyref>, which is application\n"
|
|
|
|
|
"specific. Return values are also application specific. For OpenPGP\n"
|
2011-06-16 14:27:33 +02:00
|
|
|
|
"cards 3 status lines are returned:\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
|
|
|
|
" S KEY-FPR <hexstring>\n"
|
|
|
|
|
" S KEY-CREATED-AT <seconds_since_epoch>\n"
|
2011-06-16 14:27:33 +02:00
|
|
|
|
" S KEY-DATA [-|p|n] <hexdata>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" 'p' and 'n' are the names of the RSA parameters; '-' is used to\n"
|
|
|
|
|
" indicate that HEXDATA is the first chunk of a parameter given\n"
|
2019-03-05 17:40:08 +01:00
|
|
|
|
" by the next KEY-DATA. Only used by GnuPG version < 2.1.\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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"
|
2020-02-11 14:49:11 +01:00
|
|
|
|
"The option --algo can be used to request creation using a specific\n"
|
|
|
|
|
"algorithm. The possible algorithms are card dependent.\n"
|
|
|
|
|
"\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_genkey (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2019-02-08 11:53:34 +01:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char *keyref_buffer = NULL;
|
|
|
|
|
char *keyref;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
int force;
|
|
|
|
|
const char *s;
|
2019-02-08 11:53:34 +01:00
|
|
|
|
char *opt_algo = NULL;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
time_t timestamp;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2007-07-05 16:58:19 +00:00
|
|
|
|
force = has_option (line, "--force");
|
|
|
|
|
|
|
|
|
|
if ((s=has_option_name (line, "--timestamp")))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2007-07-05 16:58:19 +00: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 17:11:04 +00:00
|
|
|
|
}
|
2007-07-05 16:58:19 +00:00
|
|
|
|
else
|
|
|
|
|
timestamp = 0;
|
|
|
|
|
|
2019-02-08 11:53:34 +01:00
|
|
|
|
err = get_option_value (line, "--algo", &opt_algo);
|
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
2007-07-05 16:58:19 +00:00
|
|
|
|
|
|
|
|
|
line = skip_options (line);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!*line)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
|
2019-02-08 11:53:34 +01:00
|
|
|
|
keyref = line;
|
2003-10-25 14:22:42 +00:00
|
|
|
|
while (*line && !spacep (line))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
2019-02-08 11:53:34 +01:00
|
|
|
|
if ((err = open_card (ctrl)))
|
|
|
|
|
goto leave;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
2019-02-08 11:53:34 +01:00
|
|
|
|
keyref = keyref_buffer = xtrystrdup (keyref);
|
|
|
|
|
if (!keyref)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2019-06-19 08:50:40 +02:00
|
|
|
|
err = app_genkey (ctrl->card_ctx, ctrl, keyref, opt_algo,
|
2019-02-08 11:53:34 +01:00
|
|
|
|
force? APP_GENKEY_FLAG_FORCE : 0,
|
|
|
|
|
timestamp, pin_cb, ctx);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2019-02-08 11:53:34 +01:00
|
|
|
|
leave:
|
|
|
|
|
xfree (keyref_buffer);
|
|
|
|
|
xfree (opt_algo);
|
|
|
|
|
return err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_random[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_random (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
size_t nbytes;
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
|
|
|
|
|
if (!*line)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER,
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"number of requested bytes missing");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
nbytes = strtoul (line, NULL, 0);
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
|
|
|
|
buffer = xtrymalloc (nbytes);
|
|
|
|
|
if (!buffer)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_get_challenge (ctrl->card_ctx, ctrl, nbytes, buffer);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!rc)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, buffer, nbytes);
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
return rc; /* that is already an assuan error code */
|
|
|
|
|
}
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 12:22:09 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-11-04 12:22:09 +00:00
|
|
|
|
static const char hlp_passwd[] =
|
2019-01-21 14:06:51 +01:00
|
|
|
|
"PASSWD [--reset] [--nullpin] [--clear] <chvno>\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Change the PIN or, if --reset is given, reset the retry counter of\n"
|
2015-11-16 12:41:46 +01:00
|
|
|
|
"the card holder verification vector CHVNO. The option --nullpin is\n"
|
2019-01-21 14:06:51 +01:00
|
|
|
|
"used for TCOS cards to set the initial PIN. The option --clear clears\n"
|
|
|
|
|
"the security status associated with the PIN so that the PIN needs to\n"
|
|
|
|
|
"be presented again. The format of CHVNO 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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_passwd (assuan_context_t ctx, char *line)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int rc;
|
|
|
|
|
char *chvnostr;
|
2008-06-24 16:00:29 +00: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;
|
2019-01-21 14:06:51 +01:00
|
|
|
|
if (has_option (line, "--clear"))
|
|
|
|
|
flags |= APP_CHANGE_FLAG_CLEAR;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!*line)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return set_error (GPG_ERR_ASS_PARAMETER, "no CHV number given");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
chvnostr = line;
|
2003-10-25 14:22:42 +00:00
|
|
|
|
while (*line && !spacep (line))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
line++;
|
|
|
|
|
*line = 0;
|
|
|
|
|
|
2019-01-21 14:06:51 +01:00
|
|
|
|
/* Do not allow other flags aside of --clear. */
|
|
|
|
|
if ((flags & APP_CHANGE_FLAG_CLEAR) && (flags & ~APP_CHANGE_FLAG_CLEAR))
|
|
|
|
|
return set_error (GPG_ERR_UNSUPPORTED_OPERATION,
|
|
|
|
|
"--clear used with other options");
|
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-25 09:58:02 +00:00
|
|
|
|
chvnostr = xtrystrdup (chvnostr);
|
|
|
|
|
if (!chvnostr)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_change_pin (ctrl->card_ctx, ctrl, chvnostr, flags, pin_cb, ctx);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("command passwd failed: %s\n", gpg_strerror (rc));
|
2003-08-25 09:58:02 +00:00
|
|
|
|
xfree (chvnostr);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_checkpin[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2020-02-11 14:49:11 +01:00
|
|
|
|
" is however a special mode if the IDSTR is suffixed with the\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
" 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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-11 16:20:10 +00:00
|
|
|
|
cmd_checkpin (assuan_context_t ctx, char *line)
|
2003-10-21 17:12:50 +00:00
|
|
|
|
{
|
2005-04-14 17:25:43 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2003-10-21 17:12:50 +00:00
|
|
|
|
int rc;
|
2009-03-05 19:19:37 +00:00
|
|
|
|
char *idstr;
|
2003-10-21 17:12:50 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2003-10-21 17:12:50 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2003-10-21 17:12:50 +00:00
|
|
|
|
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 19:19:37 +00:00
|
|
|
|
idstr = xtrystrdup (line);
|
|
|
|
|
if (!idstr)
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return out_of_core ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = app_check_pin (ctrl->card_ctx, ctrl, idstr, pin_cb, ctx);
|
2009-03-05 19:19:37 +00:00
|
|
|
|
xfree (idstr);
|
2003-10-21 17:12:50 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("app_check_pin failed: %s\n", gpg_strerror (rc));
|
|
|
|
|
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2003-10-21 17:12:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_lock[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-14 17:25:43 +00: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 09:33:07 +00:00
|
|
|
|
rc = gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 17:25:43 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
locked_session = ctrl->server_local;
|
|
|
|
|
|
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
|
|
|
|
#ifdef USE_NPTH
|
2005-04-14 17:25:43 +00:00
|
|
|
|
if (rc && has_option (line, "--wait"))
|
|
|
|
|
{
|
2006-02-09 18:29:31 +00:00
|
|
|
|
rc = 0;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_sleep (1); /* Better implement an event mechanism. However,
|
2016-12-28 12:29:17 +09:00
|
|
|
|
for card operations this should be
|
|
|
|
|
sufficient. */
|
2006-02-09 18:29:31 +00:00
|
|
|
|
/* FIXME: Need to check that the connection is still alive.
|
|
|
|
|
This can be done by issuing status messages. */
|
2005-04-14 17:25:43 +00:00
|
|
|
|
goto retry;
|
|
|
|
|
}
|
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
|
|
|
|
#endif /*USE_NPTH*/
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
log_error ("cmd_lock failed: %s\n", gpg_strerror (rc));
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_unlock[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2005-04-14 17:25:43 +00:00
|
|
|
|
cmd_unlock (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
if (locked_session)
|
|
|
|
|
{
|
|
|
|
|
if (locked_session != ctrl->server_local)
|
2005-04-21 09:33:07 +00:00
|
|
|
|
rc = gpg_error (GPG_ERR_LOCKED);
|
2005-04-14 17:25:43 +00: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 16:35:52 +00:00
|
|
|
|
return rc;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_getinfo[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"GETINFO <what>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Multi purpose command to return certain information. \n"
|
|
|
|
|
"Supported values of WHAT are:\n"
|
|
|
|
|
"\n"
|
2017-02-01 08:58:01 +09:00
|
|
|
|
" version - Return the version of the program.\n"
|
|
|
|
|
" pid - Return the process id of the server.\n"
|
|
|
|
|
" socket_name - Return the name of the socket.\n"
|
|
|
|
|
" connections - Return number of active connections.\n"
|
|
|
|
|
" status - Return the status of the current reader (in the future,\n"
|
|
|
|
|
" may also return the status of all readers). The status\n"
|
|
|
|
|
" is a list of one-character flags. The following flags\n"
|
|
|
|
|
" are currently defined:\n"
|
|
|
|
|
" 'u' Usable card present.\n"
|
|
|
|
|
" 'r' Card removed. A reset is necessary.\n"
|
|
|
|
|
" These flags are exclusive.\n"
|
|
|
|
|
" reader_list - Return a list of detected card readers. Does\n"
|
|
|
|
|
" currently only work with the internal CCID driver.\n"
|
|
|
|
|
" deny_admin - Returns OK if admin commands are not allowed or\n"
|
|
|
|
|
" GPG_ERR_GENERAL if admin commands are allowed.\n"
|
|
|
|
|
" app_list - Return a list of supported applications. One\n"
|
|
|
|
|
" application per line, fields delimited by colons,\n"
|
|
|
|
|
" first field is the name.\n"
|
2020-01-16 19:42:16 +01:00
|
|
|
|
" card_list - Return a list of serial numbers of all inserted cards.\n"
|
|
|
|
|
" active_apps - Return a list of active apps on the current card.\n"
|
|
|
|
|
" all_active_apps\n"
|
|
|
|
|
" - Return a list of active apps on all inserted cards.\n"
|
2019-09-04 13:50:12 +02:00
|
|
|
|
" cmd_has_option CMD OPT\n"
|
2020-01-16 19:42:16 +01:00
|
|
|
|
" - Returns OK if command CMD has option OPT.\n";
|
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-05-18 10:48:06 +00:00
|
|
|
|
cmd_getinfo (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
2007-07-04 09:34:28 +00:00
|
|
|
|
if (!strcmp (line, "version"))
|
|
|
|
|
{
|
|
|
|
|
const char *s = VERSION;
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
}
|
2007-10-02 16:30:58 +00: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));
|
|
|
|
|
}
|
2019-09-04 13:50:12 +02:00
|
|
|
|
else if (!strncmp (line, "cmd_has_option", 14)
|
|
|
|
|
&& (line[14] == ' ' || line[14] == '\t' || !line[14]))
|
|
|
|
|
{
|
|
|
|
|
char *cmd, *cmdopt;
|
|
|
|
|
line += 14;
|
|
|
|
|
while (*line == ' ' || *line == '\t')
|
|
|
|
|
line++;
|
|
|
|
|
if (!*line)
|
|
|
|
|
rc = gpg_error (GPG_ERR_MISSING_VALUE);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cmd = line;
|
|
|
|
|
while (*line && (*line != ' ' && *line != '\t'))
|
|
|
|
|
line++;
|
|
|
|
|
if (!*line)
|
|
|
|
|
rc = gpg_error (GPG_ERR_MISSING_VALUE);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*line++ = 0;
|
|
|
|
|
while (*line == ' ' || *line == '\t')
|
|
|
|
|
line++;
|
|
|
|
|
if (!*line)
|
|
|
|
|
rc = gpg_error (GPG_ERR_MISSING_VALUE);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cmdopt = line;
|
|
|
|
|
if (!command_has_option (cmd, cmdopt))
|
|
|
|
|
rc = gpg_error (GPG_ERR_FALSE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-07-04 09:34:28 +00:00
|
|
|
|
else if (!strcmp (line, "socket_name"))
|
2005-05-18 10:48:06 +00: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);
|
|
|
|
|
}
|
2017-02-01 08:58:01 +09:00
|
|
|
|
else if (!strcmp (line, "connections"))
|
|
|
|
|
{
|
|
|
|
|
char numbuf[20];
|
|
|
|
|
|
|
|
|
|
snprintf (numbuf, sizeof numbuf, "%d", get_active_connection_count ());
|
|
|
|
|
rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
|
|
|
|
|
}
|
2006-09-01 13:57:33 +00:00
|
|
|
|
else if (!strcmp (line, "status"))
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2017-01-18 15:19:38 +09:00
|
|
|
|
char flag;
|
2006-09-01 13:57:33 +00:00
|
|
|
|
|
2017-01-18 15:19:38 +09:00
|
|
|
|
if (open_card (ctrl))
|
|
|
|
|
flag = 'r';
|
|
|
|
|
else
|
2016-12-28 12:29:17 +09:00
|
|
|
|
flag = 'u';
|
2006-09-01 13:57:33 +00:00
|
|
|
|
|
|
|
|
|
rc = assuan_send_data (ctx, &flag, 1);
|
|
|
|
|
}
|
2007-04-03 16:57:37 +00:00
|
|
|
|
else if (!strcmp (line, "reader_list"))
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
char *s = ccid_get_reader_list ();
|
|
|
|
|
#else
|
|
|
|
|
char *s = NULL;
|
|
|
|
|
#endif
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-04-03 16:57:37 +00:00
|
|
|
|
if (s)
|
|
|
|
|
rc = assuan_send_data (ctx, s, strlen (s));
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_NO_DATA);
|
|
|
|
|
xfree (s);
|
|
|
|
|
}
|
2009-02-12 17:45:40 +00:00
|
|
|
|
else if (!strcmp (line, "deny_admin"))
|
|
|
|
|
rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
|
2009-02-27 14:36:59 +00: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);
|
|
|
|
|
}
|
2017-01-18 15:19:38 +09:00
|
|
|
|
else if (!strcmp (line, "card_list"))
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
2019-06-25 09:23:38 +02:00
|
|
|
|
rc = app_send_card_list (ctrl);
|
2017-01-18 15:19:38 +09:00
|
|
|
|
}
|
2020-01-16 19:42:16 +01:00
|
|
|
|
else if (!strcmp (line, "active_apps"))
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
if (!ctrl->card_ctx)
|
|
|
|
|
rc = 0; /* No current card - no active apps. */
|
|
|
|
|
else
|
|
|
|
|
rc = app_send_active_apps (ctrl->card_ctx, ctrl);
|
|
|
|
|
}
|
|
|
|
|
else if (!strcmp (line, "all_active_apps"))
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
rc = app_send_active_apps (NULL, ctrl);
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
else
|
2006-09-06 16:35:52 +00:00
|
|
|
|
rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_restart[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2006-02-09 18:29:31 +00:00
|
|
|
|
cmd_restart (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card = ctrl->card_ctx;
|
2006-02-09 18:29:31 +00:00
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)line;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (card)
|
2006-02-09 18:29:31 +00:00
|
|
|
|
{
|
2019-06-19 08:50:40 +02:00
|
|
|
|
ctrl->card_ctx = NULL;
|
2019-08-21 09:57:52 +09:00
|
|
|
|
ctrl->current_apptype = APPTYPE_NONE;
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_unref (card);
|
2006-02-09 18:29:31 +00:00
|
|
|
|
}
|
|
|
|
|
if (locked_session && ctrl->server_local == locked_session)
|
|
|
|
|
{
|
|
|
|
|
locked_session = NULL;
|
|
|
|
|
log_info ("implicitly unlocking due to RESTART\n");
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_disconnect[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"DISCONNECT\n"
|
|
|
|
|
"\n"
|
2016-12-28 12:29:17 +09:00
|
|
|
|
"Disconnect the card if 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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2008-10-17 19:18:46 +00:00
|
|
|
|
cmd_disconnect (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
2008-11-11 08:22:06 +00:00
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)line;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
if (!ctrl->card_ctx)
|
2016-12-28 12:29:17 +09:00
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
apdu_disconnect (ctrl->card_ctx->slot);
|
2008-11-11 08:22:06 +00:00
|
|
|
|
return 0;
|
2008-10-17 19:18:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_apdu[] =
|
2011-12-15 14:47:04 +01:00
|
|
|
|
"APDU [--[dump-]atr] [--more] [--exlen[=N]] [hexstring]\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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"
|
Spelling cleanup.
No functional changes, just fixing minor spelling issues.
---
Most of these were identified from the command line by running:
codespell \
--ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
--skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
NEWS README README.maint TODO
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2020-02-18 09:34:42 -05:00
|
|
|
|
"commands are set to the card but the command will implicitly check\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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"
|
2015-11-16 12:41:46 +01:00
|
|
|
|
"(61xx) and concatenates all responses to one block.\n"
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"\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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2006-04-11 13:53:21 +00:00
|
|
|
|
cmd_apdu (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card;
|
2006-04-11 13:53:21 +00:00
|
|
|
|
int rc;
|
|
|
|
|
unsigned char *apdu;
|
|
|
|
|
size_t apdulen;
|
|
|
|
|
int with_atr;
|
|
|
|
|
int handle_more;
|
2009-05-13 17:12:00 +00:00
|
|
|
|
const char *s;
|
|
|
|
|
size_t exlen;
|
2006-04-11 13:53:21 +00:00
|
|
|
|
|
2011-12-15 14:47:04 +01:00
|
|
|
|
if (has_option (line, "--dump-atr"))
|
|
|
|
|
with_atr = 2;
|
|
|
|
|
else
|
|
|
|
|
with_atr = has_option (line, "--atr");
|
2006-04-11 13:53:21 +00:00
|
|
|
|
handle_more = has_option (line, "--more");
|
|
|
|
|
|
2009-05-13 17:12:00 +00: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 09:57:45 +00:00
|
|
|
|
line = skip_options (line);
|
2006-04-11 13:53:21 +00:00
|
|
|
|
|
scd: Add --demand option for SERIALNO.
* scd/app.c (select_application): Add SERIALNO_BIN and SERIALNO_BIN_LEN
arguments. Return matched APP with a serial number when specified.
* scd/command.c (open_card): Modify for the implicit open only.
(open_card_with_request): New for explicit open and support match with a
serial number.
(cmd_serialno): Support --demand option.
(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkauth)
(cmd_pkdecrypt, cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_apdu): Follow
the change of open_card.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-16 10:26:16 +09:00
|
|
|
|
if ((rc = open_card (ctrl)))
|
2006-04-11 13:53:21 +00:00
|
|
|
|
return rc;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card = ctrl->card_ctx;
|
|
|
|
|
if (!card)
|
2016-12-28 12:29:17 +09:00
|
|
|
|
return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
|
2011-12-13 16:55:42 +01:00
|
|
|
|
|
2006-04-11 13:53:21 +00:00
|
|
|
|
if (with_atr)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *atr;
|
|
|
|
|
size_t atrlen;
|
|
|
|
|
char hexbuf[400];
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
atr = apdu_get_atr (card->slot, &atrlen);
|
2006-04-11 13:53:21 +00:00
|
|
|
|
if (!atr || atrlen > sizeof hexbuf - 2 )
|
|
|
|
|
{
|
|
|
|
|
rc = gpg_error (GPG_ERR_INV_CARD);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2011-12-15 14:47:04 +01:00
|
|
|
|
if (with_atr == 2)
|
|
|
|
|
{
|
|
|
|
|
char *string, *p, *pend;
|
|
|
|
|
|
|
|
|
|
string = atr_dump (atr, atrlen);
|
|
|
|
|
if (string)
|
|
|
|
|
{
|
|
|
|
|
for (rc=0, p=string; !rc && (pend = strchr (p, '\n')); p = pend+1)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_send_data (ctx, p, pend - p + 1);
|
|
|
|
|
if (!rc)
|
|
|
|
|
rc = assuan_send_data (ctx, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
if (!rc && *p)
|
|
|
|
|
rc = assuan_send_data (ctx, p, strlen (p));
|
|
|
|
|
es_free (string);
|
|
|
|
|
if (rc)
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bin2hex (atr, atrlen, hexbuf);
|
|
|
|
|
send_status_info (ctrl, "CARD-ATR", hexbuf, strlen (hexbuf), NULL, 0);
|
|
|
|
|
}
|
2006-04-11 13:53:21 +00:00
|
|
|
|
xfree (atr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
apdu = hex_to_buffer (line, &apdulen);
|
|
|
|
|
if (!apdu)
|
|
|
|
|
{
|
2006-09-14 16:50:33 +00:00
|
|
|
|
rc = gpg_error_from_syserror ();
|
2006-04-11 13:53:21 +00:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (apdulen)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *result = NULL;
|
|
|
|
|
size_t resultlen;
|
|
|
|
|
|
2019-06-19 08:50:40 +02:00
|
|
|
|
rc = apdu_send_direct (card->slot, exlen,
|
2009-05-13 17:12:00 +00:00
|
|
|
|
apdu, apdulen, handle_more,
|
2019-01-20 11:41:23 +01:00
|
|
|
|
NULL, &result, &resultlen);
|
2006-04-11 13:53:21 +00:00
|
|
|
|
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:
|
2006-09-06 16:35:52 +00:00
|
|
|
|
return rc;
|
2006-04-11 13:53:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static const char hlp_killscd[] =
|
2009-11-04 12:22:09 +00:00
|
|
|
|
"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 00:01:25 +00:00
|
|
|
|
static gpg_error_t
|
2009-02-27 14:36:59 +00:00
|
|
|
|
cmd_killscd (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
|
|
|
|
|
(void)line;
|
|
|
|
|
|
|
|
|
|
ctrl->server_local->stopme = 1;
|
2011-08-10 11:47:04 +02:00
|
|
|
|
assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
|
|
|
|
|
return 0;
|
2009-02-27 14:36:59 +00:00
|
|
|
|
}
|
2006-04-11 13:53:21 +00:00
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
|
2019-04-25 14:49:49 +09:00
|
|
|
|
static const char hlp_keyinfo[] =
|
2019-12-19 17:30:59 +09:00
|
|
|
|
"KEYINFO [--list[=auth|encr|sign]] [--data] <keygrip>\n"
|
2019-04-25 14:49:49 +09:00
|
|
|
|
"\n"
|
|
|
|
|
"Return information about the key specified by the KEYGRIP. If the\n"
|
|
|
|
|
"key is not available GPG_ERR_NOT_FOUND is returned. If the option\n"
|
|
|
|
|
"--list is given the keygrip is ignored and information about all\n"
|
2019-12-19 17:30:59 +09:00
|
|
|
|
"available keys are returned. Capability may limit the listing.\n"
|
|
|
|
|
"Unless --data is given, the\n"
|
2019-04-25 14:49:49 +09:00
|
|
|
|
"information is returned as a status line using the format:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" KEYINFO <keygrip> T <serialno> <idstr>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"KEYGRIP is the keygrip.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"SERIALNO is an ASCII string with the serial number of the\n"
|
|
|
|
|
" smartcard. If the serial number is not known a single\n"
|
|
|
|
|
" dash '-' is used instead.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"IDSTR is the IDSTR used to distinguish keys on a smartcard. If it\n"
|
|
|
|
|
" is not known a dash is used instead.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"More information may be added in the future.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_keyinfo (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
2019-12-19 17:30:59 +09:00
|
|
|
|
int cap;
|
2019-04-25 14:49:49 +09:00
|
|
|
|
int opt_data;
|
|
|
|
|
int action;
|
|
|
|
|
char *keygrip_str;
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
2019-06-19 08:50:40 +02:00
|
|
|
|
card_t card;
|
2019-04-25 14:49:49 +09:00
|
|
|
|
|
2019-12-19 17:30:59 +09:00
|
|
|
|
cap = 0;
|
|
|
|
|
keygrip_str = NULL;
|
|
|
|
|
if (has_option (line, "--list"))
|
|
|
|
|
cap = 0;
|
|
|
|
|
else if (has_option (line, "--list=sign"))
|
2020-04-02 11:54:01 +02:00
|
|
|
|
cap = GCRY_PK_USAGE_SIGN;
|
2019-12-19 17:30:59 +09:00
|
|
|
|
else if (has_option (line, "--list=encr"))
|
2020-04-02 11:54:01 +02:00
|
|
|
|
cap = GCRY_PK_USAGE_ENCR;
|
2019-12-19 17:30:59 +09:00
|
|
|
|
else if (has_option (line, "--list=auth"))
|
2020-04-02 11:54:01 +02:00
|
|
|
|
cap = GCRY_PK_USAGE_AUTH;
|
2019-04-25 14:49:49 +09:00
|
|
|
|
else
|
|
|
|
|
keygrip_str = line;
|
|
|
|
|
|
2019-12-19 17:30:59 +09:00
|
|
|
|
opt_data = has_option (line, "--data");
|
|
|
|
|
line = skip_options (line);
|
|
|
|
|
|
2019-04-25 14:49:49 +09:00
|
|
|
|
if (opt_data)
|
|
|
|
|
action = KEYGRIP_ACTION_SEND_DATA;
|
|
|
|
|
else
|
|
|
|
|
action = KEYGRIP_ACTION_WRITE_STATUS;
|
|
|
|
|
|
2019-12-19 17:30:59 +09:00
|
|
|
|
card = app_do_with_keygrip (ctrl, action, keygrip_str, cap);
|
2019-04-25 14:49:49 +09:00
|
|
|
|
|
2019-12-19 17:30:59 +09:00
|
|
|
|
if (keygrip_str && !card)
|
2019-05-15 15:44:32 +09:00
|
|
|
|
return gpg_error (GPG_ERR_NOT_FOUND);
|
2019-04-25 14:49:49 +09:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-17 18:04:36 +02:00
|
|
|
|
|
|
|
|
|
/* Send a keyinfo string as used by the KEYGRIP_ACTION_SEND_DATA. If
|
|
|
|
|
* DATA is true the string is emitted as a data line, else as a status
|
|
|
|
|
* line. */
|
2019-04-25 14:49:49 +09:00
|
|
|
|
void
|
|
|
|
|
send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
|
|
|
|
|
const char *serialno, const char *idstr)
|
|
|
|
|
{
|
|
|
|
|
char *string;
|
|
|
|
|
assuan_context_t ctx = ctrl->server_local->assuan_ctx;
|
|
|
|
|
|
2019-06-18 10:13:40 +09:00
|
|
|
|
string = xtryasprintf ("%s T %s %s%s", keygrip_str,
|
2019-04-25 14:49:49 +09:00
|
|
|
|
serialno? serialno : "-",
|
2019-06-18 10:13:40 +09:00
|
|
|
|
idstr? idstr : "-",
|
|
|
|
|
data? "\n" : "");
|
|
|
|
|
|
2019-04-25 14:49:49 +09:00
|
|
|
|
if (!string)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (!data)
|
|
|
|
|
assuan_write_status (ctx, "KEYINFO", string);
|
|
|
|
|
else
|
|
|
|
|
assuan_send_data (ctx, string, strlen (string));
|
|
|
|
|
|
|
|
|
|
xfree (string);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2019-06-17 18:04:36 +02:00
|
|
|
|
|
|
|
|
|
|
2020-04-02 15:39:26 +09:00
|
|
|
|
static const char hlp_devinfo[] =
|
|
|
|
|
"DEVINFO [--watch]\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Return information about devices. If the option --watch is given,\n"
|
|
|
|
|
"it keeps reporting status change until it detects no device is\n"
|
|
|
|
|
"available."
|
|
|
|
|
"The information is returned as a status line using the format:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" DEVICE <card_type> <serialno> <app_type>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"CARD_TYPE is the type of the card.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"SERIALNO is an ASCII string with the serial number of the\n"
|
|
|
|
|
" smartcard. If the serial number is not known a single\n"
|
|
|
|
|
" dash '-' is used instead.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"APP_TYPE is the type of the application.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"More information may be added in the future.";
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
cmd_devinfo (assuan_context_t ctx, char *line)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = assuan_get_pointer (ctx);
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
int watch = 0;
|
|
|
|
|
|
|
|
|
|
if (has_option (line, "--watch"))
|
|
|
|
|
{
|
|
|
|
|
watch = 1;
|
|
|
|
|
ctrl->server_local->watching_status = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Firstly, send information of available devices. */
|
|
|
|
|
err = app_send_devinfo (ctrl);
|
|
|
|
|
|
|
|
|
|
/* If not watching, that's all. */
|
|
|
|
|
if (!watch)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
if (err && gpg_err_code (err) != GPG_ERR_NOT_FOUND)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
/* Secondly, try to open device(s) available. */
|
|
|
|
|
|
|
|
|
|
/* Clear the remove flag so that the open_card is able to reread it. */
|
|
|
|
|
if (ctrl->server_local->card_removed)
|
|
|
|
|
ctrl->server_local->card_removed = 0;
|
|
|
|
|
|
|
|
|
|
if ((err = open_card (ctrl))
|
|
|
|
|
&& gpg_err_code (err) != GPG_ERR_ENODEV)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
|
|
/* Remove reference(s) to the card. */
|
|
|
|
|
ctrl->card_ctx = NULL;
|
|
|
|
|
ctrl->current_apptype = APPTYPE_NONE;
|
|
|
|
|
card_unref (ctrl->card_ctx);
|
|
|
|
|
|
|
|
|
|
/* Then, keep watching the status change. */
|
|
|
|
|
while (!err)
|
|
|
|
|
{
|
|
|
|
|
app_wait ();
|
|
|
|
|
|
|
|
|
|
/* Send information of available devices. */
|
|
|
|
|
err = app_send_devinfo (ctrl);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ctrl->server_local->watching_status = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2019-09-04 13:50:12 +02:00
|
|
|
|
/* Return true if the command CMD implements the option OPT. */
|
|
|
|
|
static int
|
|
|
|
|
command_has_option (const char *cmd, const char *cmdopt)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp (cmd, "SERIALNO"))
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp (cmdopt, "all"))
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Tell the assuan library about our commands */
|
|
|
|
|
static int
|
2005-04-14 17:25:43 +00:00
|
|
|
|
register_commands (assuan_context_t ctx)
|
2003-08-05 17:11:04 +00: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 17:47:11 +00:00
|
|
|
|
assuan_handler_t handler;
|
2009-11-04 12:22:09 +00:00
|
|
|
|
const char * const help;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
} table[] = {
|
2009-11-04 12:22:09 +00:00
|
|
|
|
{ "SERIALNO", cmd_serialno, hlp_serialno },
|
2020-01-16 19:42:16 +01:00
|
|
|
|
{ "SWITCHCARD", cmd_switchcard,hlp_switchcard },
|
|
|
|
|
{ "SWITCHAPP", cmd_switchapp,hlp_switchapp },
|
2009-11-04 12:22:09 +00:00
|
|
|
|
{ "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 },
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{ "INPUT", NULL },
|
|
|
|
|
{ "OUTPUT", NULL },
|
2009-11-04 12:22:09 +00: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 },
|
2019-04-25 14:49:49 +09:00
|
|
|
|
{ "KEYINFO", cmd_keyinfo, hlp_keyinfo },
|
2020-04-02 15:39:26 +09:00
|
|
|
|
{ "DEVINFO", cmd_devinfo, hlp_devinfo },
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
|
|
|
|
int i, rc;
|
|
|
|
|
|
|
|
|
|
for (i=0; table[i].name; i++)
|
|
|
|
|
{
|
2009-11-04 12:22:09 +00:00
|
|
|
|
rc = assuan_register_command (ctx, table[i].name, table[i].handler,
|
|
|
|
|
table[i].help);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
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 10:48:06 +00:00
|
|
|
|
/* Startup the server. If FD is given as -1 this is simple pipe
|
2008-10-15 13:23:10 +00:00
|
|
|
|
server, otherwise it is a regular server. Returns true if there
|
|
|
|
|
are no more active asessions. */
|
|
|
|
|
int
|
2006-11-20 16:49:41 +00:00
|
|
|
|
scd_command_handler (ctrl_t ctrl, int fd)
|
2003-08-05 17:11:04 +00: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 00:01:25 +00:00
|
|
|
|
assuan_context_t ctx = NULL;
|
2009-03-03 12:02:42 +00:00
|
|
|
|
int stopme;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to allocate assuan context: %s\n",
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (fd == -1)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2009-11-25 17:58:26 +00:00
|
|
|
|
assuan_fd_t filedes[2];
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2009-11-25 17:58:26 +00: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 00:01:25 +00:00
|
|
|
|
rc = assuan_init_pipe_server (ctx, filedes);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2009-11-05 12:06:45 +00:00
|
|
|
|
rc = assuan_init_socket_server (ctx, INT2FD(fd),
|
2016-12-28 12:29:17 +09:00
|
|
|
|
ASSUAN_SOCKET_SERVER_ACCEPTED);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to initialize the server: %s\n",
|
2006-09-06 16:35:52 +00:00
|
|
|
|
gpg_strerror(rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
rc = register_commands (ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to register commands with Assuan: %s\n",
|
2006-09-06 16:35:52 +00:00
|
|
|
|
gpg_strerror(rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
2006-11-23 10:35:31 +00:00
|
|
|
|
assuan_set_pointer (ctx, ctrl);
|
2005-04-14 17:25:43 +00:00
|
|
|
|
|
|
|
|
|
/* Allocate and initialize the server object. Put it into the list
|
|
|
|
|
of active sessions. */
|
2006-11-20 16:49:41 +00: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 17:11:04 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Command processing loop. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_accept (ctx);
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (rc)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
log_info ("Assuan accept problem: %s\n", gpg_strerror (rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
rc = assuan_process (ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
|
log_info ("Assuan processing failed: %s\n", gpg_strerror (rc));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-04-21 14:44:09 +00:00
|
|
|
|
|
2008-11-03 19:09:34 +00:00
|
|
|
|
/* Cleanup. We don't send an explicit reset to the card. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
do_reset (ctrl, 0);
|
2004-04-21 14:44:09 +00:00
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
/* Release the server object. */
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if (session_list == ctrl->server_local)
|
|
|
|
|
session_list = ctrl->server_local->next_session;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct server_local_s *sl;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2005-04-14 17:25:43 +00:00
|
|
|
|
for (sl=session_list; sl->next_session; sl = sl->next_session)
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if (sl->next_session == ctrl->server_local)
|
2005-04-14 17:25:43 +00:00
|
|
|
|
break;
|
|
|
|
|
if (!sl->next_session)
|
|
|
|
|
BUG ();
|
2006-11-20 16:49:41 +00:00
|
|
|
|
sl->next_session = ctrl->server_local->next_session;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
}
|
2012-12-04 14:37:56 +09:00
|
|
|
|
stopme = ctrl->server_local->stopme;
|
2006-11-20 16:49:41 +00:00
|
|
|
|
xfree (ctrl->server_local);
|
|
|
|
|
ctrl->server_local = NULL;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-04-14 17:25:43 +00: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 00:01:25 +00:00
|
|
|
|
assuan_release (ctx);
|
2008-10-15 13:23:10 +00:00
|
|
|
|
|
2009-03-03 12:02:42 +00:00
|
|
|
|
if (stopme)
|
2009-02-27 14:36:59 +00:00
|
|
|
|
scd_exit (0);
|
|
|
|
|
|
2008-10-15 13:23:10 +00:00
|
|
|
|
/* If there are no more sessions return true. */
|
|
|
|
|
return !session_list;
|
2003-08-05 17:11:04 +00: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 17:25:43 +00:00
|
|
|
|
send_status_info (ctrl_t ctrl, const char *keyword, ...)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
va_list arg_ptr;
|
|
|
|
|
const unsigned char *value;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
char buf[950], *p;
|
|
|
|
|
size_t n;
|
2005-04-14 17:25:43 +00:00
|
|
|
|
assuan_context_t ctx = ctrl->server_local->assuan_ctx;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
va_start (arg_ptr, keyword);
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
p = buf;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
n = 0;
|
2018-02-14 12:21:23 +01:00
|
|
|
|
while ( (value = va_arg (arg_ptr, const unsigned char *))
|
|
|
|
|
&& n < DIM (buf)-2 )
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
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++)
|
|
|
|
|
{
|
2016-11-14 10:25:43 +09:00
|
|
|
|
if (*value == '+' || *value == '\"' || *value == '%'
|
|
|
|
|
|| *value < ' ')
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
sprintf (p, "%%%02X", *value);
|
|
|
|
|
p += 3;
|
2018-02-14 12:21:23 +01:00
|
|
|
|
n += 2;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else if (*value == ' ')
|
|
|
|
|
*p++ = '+';
|
|
|
|
|
else
|
|
|
|
|
*p++ = *value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*p = 0;
|
|
|
|
|
assuan_write_status (ctx, keyword, buf);
|
|
|
|
|
|
|
|
|
|
va_end (arg_ptr);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2009-03-10 16:10:35 +00: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 16:34:28 +00:00
|
|
|
|
|
2019-01-21 14:06:51 +01:00
|
|
|
|
/* This status functions expects a printf style format string. No
|
2020-02-11 20:41:29 +01:00
|
|
|
|
* filtering of the data is done instead the printf formatted data is
|
2019-01-21 14:06:51 +01:00
|
|
|
|
* send using assuan_send_status. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
send_status_printf (ctrl_t ctrl, const char *keyword, const char *format, ...)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
va_list arg_ptr;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
|
|
|
|
|
if (!ctrl || !ctrl->server_local || !(ctx = ctrl->server_local->assuan_ctx))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
va_start (arg_ptr, format);
|
|
|
|
|
err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
|
|
|
|
|
va_end (arg_ptr);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* Set a gcrypt key for use with the pincache. The key is a random
|
|
|
|
|
* key unique for this process and is useless after this process has
|
|
|
|
|
* terminated. This way the cached PINs stored in the gpg-agent are
|
|
|
|
|
* bound to this specific process. The main purpose of this
|
|
|
|
|
* encryption is to hide the PIN in logs of the IPC. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
set_key_for_pincache (gcry_cipher_hd_t hd)
|
|
|
|
|
{
|
|
|
|
|
static int initialized;
|
|
|
|
|
static unsigned char keybuf[16];
|
|
|
|
|
|
|
|
|
|
if (!initialized)
|
|
|
|
|
{
|
|
|
|
|
gcry_randomize (keybuf, sizeof keybuf, GCRY_STRONG_RANDOM);
|
|
|
|
|
initialized = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return gcry_cipher_setkey (hd, keybuf, sizeof keybuf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-01-07 18:45:33 +01:00
|
|
|
|
/* Store the PIN in the PIN cache. The key to identify the PIN
|
|
|
|
|
* consists of (SLOT,APPNAME,PINREF). If PIN is NULL the PIN stored
|
|
|
|
|
* under the given key is cleared. If APPNAME and PINREF are NULL the
|
|
|
|
|
* entire PIN cache for SLOT is cleared. If SLOT is -1 the entire PIN
|
|
|
|
|
* cache is cleared. We do no use an scdaemon internal cache but let
|
2020-01-09 12:00:50 +01:00
|
|
|
|
* gpg-agent cache it because it is better suited for this. */
|
2020-01-07 18:45:33 +01:00
|
|
|
|
void
|
|
|
|
|
pincache_put (ctrl_t ctrl, int slot, const char *appname, const char *pinref,
|
2020-01-13 17:53:49 +01:00
|
|
|
|
const char *pin, unsigned int pinlen)
|
2020-01-07 18:45:33 +01:00
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
char line[950];
|
|
|
|
|
gcry_cipher_hd_t cipherhd = NULL;
|
|
|
|
|
char *pinbuf = NULL;
|
|
|
|
|
unsigned char *wrappedkey = NULL;
|
2020-01-13 17:53:49 +01:00
|
|
|
|
size_t pinbuflen, wrappedkeylen;
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
|
|
|
|
if (!ctrl)
|
|
|
|
|
{
|
|
|
|
|
/* No CTRL object provided. We could pick an arbitrary
|
|
|
|
|
* connection and send the status to that one. However, such a
|
|
|
|
|
* connection is inlikley to wait for a respinse from use and
|
|
|
|
|
* thus it would at best be read as a response to the next
|
|
|
|
|
* command send to us. That is not good because it may clog up
|
|
|
|
|
* our connection. Thus we better don't do that. A better will
|
|
|
|
|
* be to queue this up and let the agent poll for general status
|
|
|
|
|
* messages. */
|
|
|
|
|
/* struct server_local_s *sl; */
|
|
|
|
|
/* for (sl=session_list; sl; sl = sl->next_session) */
|
|
|
|
|
/* if (sl->ctrl_backlink && sl->ctrl_backlink->server_local */
|
|
|
|
|
/* && sl->ctrl_backlink->server_local->assuan_ctx) */
|
|
|
|
|
/* { */
|
|
|
|
|
/* ctrl = sl->ctrl_backlink; */
|
|
|
|
|
/* break; */
|
|
|
|
|
/* } */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!ctrl || !ctrl->server_local || !(ctx=ctrl->server_local->assuan_ctx))
|
|
|
|
|
return;
|
2020-01-13 17:53:49 +01:00
|
|
|
|
if (pin && !pinlen)
|
2020-01-07 18:45:33 +01:00
|
|
|
|
return; /* Ignore an empty PIN. */
|
|
|
|
|
|
|
|
|
|
snprintf (line, sizeof line, "%d/%s/%s ",
|
2020-01-09 12:00:50 +01:00
|
|
|
|
slot, appname? appname:"", pinref? pinref:"");
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
|
|
|
|
/* Without an APPNAME etc or without a PIN we clear the cache and
|
|
|
|
|
* thus there is no need to send the pin - even if the caller
|
Spelling cleanup.
No functional changes, just fixing minor spelling issues.
---
Most of these were identified from the command line by running:
codespell \
--ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
--skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
NEWS README README.maint TODO
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2020-02-18 09:34:42 -05:00
|
|
|
|
* accidentally passed a pin. */
|
2020-01-07 18:45:33 +01:00
|
|
|
|
if (pin && slot != -1 && appname && pinref)
|
|
|
|
|
{
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* FIXME: Replace this by OCB mode and use the cache key as
|
|
|
|
|
* additional data. */
|
|
|
|
|
/* Pad with zeroes (AESWRAP requires multiples of 64 bit but
|
|
|
|
|
* at least 128 bit data). */
|
|
|
|
|
pinbuflen = pinlen + 8 - (pinlen % 8);
|
|
|
|
|
if (pinbuflen < 16)
|
|
|
|
|
pinbuflen = 16;
|
|
|
|
|
pinbuf = xtrycalloc_secure (1, pinbuflen);
|
|
|
|
|
if (!pinbuf)
|
2020-01-07 18:45:33 +01:00
|
|
|
|
{
|
2020-01-09 12:00:50 +01:00
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
2020-01-07 18:45:33 +01:00
|
|
|
|
}
|
2020-01-09 12:00:50 +01:00
|
|
|
|
memcpy (pinbuf, pin, pinlen);
|
|
|
|
|
pinlen = pinbuflen;
|
|
|
|
|
pin = pinbuf;
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
|
|
|
|
err = gcry_cipher_open (&cipherhd, GCRY_CIPHER_AES128,
|
|
|
|
|
GCRY_CIPHER_MODE_AESWRAP, 0);
|
|
|
|
|
if (!err)
|
2020-01-09 12:00:50 +01:00
|
|
|
|
err = set_key_for_pincache (cipherhd);
|
2020-01-07 18:45:33 +01:00
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
wrappedkeylen = pinlen + 8;
|
|
|
|
|
wrappedkey = xtrymalloc (wrappedkeylen);
|
|
|
|
|
if (!wrappedkey)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = gcry_cipher_encrypt (cipherhd, wrappedkey, wrappedkeylen,
|
|
|
|
|
pin, pinlen);
|
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
|
|
|
|
gcry_cipher_close (cipherhd);
|
|
|
|
|
cipherhd = NULL;
|
|
|
|
|
if (strlen (line) + 2*wrappedkeylen + 1 >= sizeof line)
|
|
|
|
|
{
|
|
|
|
|
log_error ("%s: PIN or pinref string too long - ignored", __func__);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
bin2hex (wrappedkey, wrappedkeylen, line + strlen (line));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
send_status_direct (ctrl, "PINCACHE_PUT", line);
|
|
|
|
|
|
|
|
|
|
leave:
|
|
|
|
|
xfree (pinbuf);
|
|
|
|
|
xfree (wrappedkey);
|
|
|
|
|
gcry_cipher_close (cipherhd);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("%s: error caching PIN: %s\n", __func__, gpg_strerror (err));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Ask the agent for a cached PIN for the tuple (SLOT,APPNAME,PINREF).
|
|
|
|
|
* Returns on success and stores the PIN at R_PIN; the caller needs to
|
|
|
|
|
* wipe(!) and then free that value. On error NULL is stored at
|
|
|
|
|
* R_PIN and an error code returned. Common error codes are:
|
|
|
|
|
* GPG_ERR_NOT_SUPPORTED - Client does not support the PIN cache
|
|
|
|
|
* GPG_ERR_NO_DATA - No PIN cached for the given key tuple
|
|
|
|
|
*/
|
|
|
|
|
gpg_error_t
|
|
|
|
|
pincache_get (ctrl_t ctrl, int slot, const char *appname, const char *pinref,
|
|
|
|
|
char **r_pin)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
assuan_context_t ctx;
|
|
|
|
|
char command[512];
|
|
|
|
|
unsigned char *value = NULL;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
unsigned char *wrappedkey = NULL;
|
|
|
|
|
size_t wrappedkeylen;
|
|
|
|
|
gcry_cipher_hd_t cipherhd = NULL;
|
|
|
|
|
|
|
|
|
|
if (slot == -1 || !appname || !pinref || !r_pin)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_INV_ARG);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (!ctrl || !ctrl->server_local || !(ctx = ctrl->server_local->assuan_ctx))
|
|
|
|
|
{
|
2020-01-09 12:00:50 +01:00
|
|
|
|
err = gpg_error (GPG_ERR_USE_CONDITIONS);
|
|
|
|
|
log_error ("%s: called w/o assuan context\n", __func__);
|
2020-01-07 18:45:33 +01:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
snprintf (command, sizeof command, "PINCACHE_GET %d/%s/%s",
|
2020-01-09 12:00:50 +01:00
|
|
|
|
slot, appname? appname:"", pinref? pinref:"");
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* Limit the inquire to something reasonable. The 32 extra bytes
|
|
|
|
|
* are a guessed size for padding etc. */
|
2020-01-07 18:45:33 +01:00
|
|
|
|
err = assuan_inquire (ctx, command, &wrappedkey, &wrappedkeylen,
|
2020-01-09 12:00:50 +01:00
|
|
|
|
2*MAXLEN_PIN+32);
|
2020-01-07 18:45:33 +01:00
|
|
|
|
if (gpg_err_code (err) == GPG_ERR_ASS_CANCELED)
|
2020-01-09 12:00:50 +01:00
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_NOT_SUPPORTED);
|
|
|
|
|
log_info ("caller does not feature a PIN cache");
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("%s: sending PINCACHE_GET to caller failed: %s\n",
|
|
|
|
|
__func__, gpg_strerror (err));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
if (!wrappedkey || !wrappedkeylen)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_NOT_FOUND);
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
/* Convert to hex to binary and store it in (wrappedkey, wrappedkeylen). */
|
|
|
|
|
if (!hex2str (wrappedkey, wrappedkey, wrappedkeylen, &wrappedkeylen))
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("%s: caller returned invalid hex string: %s\n",
|
|
|
|
|
__func__, gpg_strerror (err));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
if (!wrappedkey || wrappedkeylen < 24)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error (GPG_ERR_INV_LENGTH); /* too short cryptogram */
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2020-01-07 18:45:33 +01:00
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
valuelen = wrappedkeylen - 8;
|
|
|
|
|
value = xtrymalloc_secure (valuelen);
|
|
|
|
|
if (!value)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
goto leave;
|
2020-01-07 18:45:33 +01:00
|
|
|
|
}
|
|
|
|
|
|
2020-01-09 12:00:50 +01:00
|
|
|
|
err = gcry_cipher_open (&cipherhd, GCRY_CIPHER_AES128,
|
|
|
|
|
GCRY_CIPHER_MODE_AESWRAP, 0);
|
|
|
|
|
if (!err)
|
|
|
|
|
err = set_key_for_pincache (cipherhd);
|
|
|
|
|
if (err)
|
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
|
err = gcry_cipher_decrypt (cipherhd, value, valuelen,
|
|
|
|
|
wrappedkey, wrappedkeylen);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("%s: cached value could not be decrypted: %s\n",
|
|
|
|
|
__func__, gpg_strerror (err));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*r_pin = value;
|
|
|
|
|
value = NULL;
|
|
|
|
|
|
2020-01-07 18:45:33 +01:00
|
|
|
|
leave:
|
|
|
|
|
gcry_cipher_close (cipherhd);
|
|
|
|
|
xfree (wrappedkey);
|
|
|
|
|
xfree (value);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2018-10-11 15:41:49 +09:00
|
|
|
|
void
|
|
|
|
|
popup_prompt (void *opaque, int on)
|
|
|
|
|
{
|
|
|
|
|
ctrl_t ctrl = opaque;
|
|
|
|
|
|
|
|
|
|
if (ctrl)
|
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx = ctrl->server_local->assuan_ctx;
|
|
|
|
|
|
|
|
|
|
if (ctx)
|
|
|
|
|
{
|
|
|
|
|
const char *cmd;
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
unsigned char *value;
|
|
|
|
|
size_t valuelen;
|
|
|
|
|
|
|
|
|
|
if (on)
|
|
|
|
|
cmd = "POPUPPINPADPROMPT --ack";
|
|
|
|
|
else
|
|
|
|
|
cmd = "DISMISSPINPADPROMPT";
|
|
|
|
|
err = assuan_inquire (ctx, cmd, &value, &valuelen, 100);
|
|
|
|
|
if (!err)
|
|
|
|
|
xfree (value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2019-06-17 16:19:22 +02:00
|
|
|
|
/* Helper to send the clients a status change notification. Note that
|
2019-06-21 10:47:45 +02:00
|
|
|
|
* this function assumes that APP is already locked. */
|
2016-12-28 12:29:17 +09:00
|
|
|
|
void
|
2019-06-19 08:50:40 +02:00
|
|
|
|
send_client_notifications (card_t card, int removal)
|
2008-12-18 16:34:28 +00:00
|
|
|
|
{
|
|
|
|
|
struct {
|
2011-02-04 12:57:53 +01:00
|
|
|
|
pid_t pid;
|
2008-12-18 16:34:28 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
HANDLE handle;
|
|
|
|
|
#else
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int signo;
|
2008-12-18 16:34:28 +00:00
|
|
|
|
#endif
|
|
|
|
|
} killed[50];
|
|
|
|
|
int killidx = 0;
|
|
|
|
|
int kidx;
|
|
|
|
|
struct server_local_s *sl;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2008-12-18 16:34:28 +00:00
|
|
|
|
for (sl=session_list; sl; sl = sl->next_session)
|
2020-04-02 15:39:26 +09:00
|
|
|
|
{
|
|
|
|
|
if (sl->watching_status)
|
|
|
|
|
{
|
|
|
|
|
if (removal)
|
|
|
|
|
assuan_write_status (sl->assuan_ctx, "DEVINFO_STATUS", "removal");
|
|
|
|
|
else
|
|
|
|
|
assuan_write_status (sl->assuan_ctx, "DEVINFO_STATUS", "new");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sl->ctrl_backlink && sl->ctrl_backlink->card_ctx == card)
|
|
|
|
|
{
|
|
|
|
|
pid_t pid;
|
2016-12-30 13:17:49 +09:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2020-04-02 15:39:26 +09:00
|
|
|
|
HANDLE handle;
|
2016-12-30 13:17:49 +09:00
|
|
|
|
#else
|
2020-04-02 15:39:26 +09:00
|
|
|
|
int signo;
|
2016-12-30 13:17:49 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
2020-04-02 15:39:26 +09:00
|
|
|
|
if (removal)
|
|
|
|
|
{
|
|
|
|
|
sl->ctrl_backlink->card_ctx = NULL;
|
|
|
|
|
sl->ctrl_backlink->current_apptype = APPTYPE_NONE;
|
|
|
|
|
sl->card_removed = 1;
|
|
|
|
|
card_unref_locked (card);
|
|
|
|
|
}
|
2016-12-30 13:17:49 +09:00
|
|
|
|
|
2020-04-02 15:39:26 +09:00
|
|
|
|
if (!sl->event_signal || !sl->assuan_ctx)
|
|
|
|
|
continue;
|
2016-12-30 13:17:49 +09:00
|
|
|
|
|
2020-04-02 15:39:26 +09:00
|
|
|
|
pid = assuan_get_pid (sl->assuan_ctx);
|
2016-12-30 13:17:49 +09:00
|
|
|
|
|
2008-12-18 16:34:28 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2020-04-02 15:39:26 +09:00
|
|
|
|
handle = 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 %p (%p) already triggered for client %d\n",
|
2008-12-18 16:34:28 +00:00
|
|
|
|
sl->event_signal, handle, (int)pid);
|
2020-04-02 15:39:26 +09:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_info ("triggering event %p (%p) for client %d\n",
|
|
|
|
|
sl->event_signal, handle, (int)pid);
|
|
|
|
|
if (!SetEvent (handle))
|
|
|
|
|
log_error ("SetEvent(%p) failed: %s\n",
|
|
|
|
|
sl->event_signal, w32_strerror (-1));
|
|
|
|
|
if (killidx < DIM (killed))
|
|
|
|
|
{
|
|
|
|
|
killed[killidx].pid = pid;
|
|
|
|
|
killed[killidx].handle = handle;
|
|
|
|
|
killidx++;
|
|
|
|
|
}
|
|
|
|
|
}
|
2008-12-18 16:34:28 +00:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2020-04-02 15:39:26 +09:00
|
|
|
|
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",
|
2008-12-18 16:34:28 +00:00
|
|
|
|
signo, (int)pid);
|
2020-04-02 15:39:26 +09:00
|
|
|
|
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 10:08:55 +00:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2020-04-02 15:39:26 +09:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-03-01 11:05:47 +00:00
|
|
|
|
}
|