2010-02-17 20:03:37 +01:00
|
|
|
|
/* call-pinentry.c - Spawn the pinentry to query stuff from the user
|
|
|
|
|
* Copyright (C) 2001, 2002, 2004, 2007, 2008,
|
|
|
|
|
* 2010 Free Software Foundation, Inc.
|
2003-06-05 09:14:21 +02:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-06-05 09:14:21 +02:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-06-05 09:14:21 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <sys/stat.h>
|
2005-11-28 12:52:25 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2008-03-20 16:31:43 +01:00
|
|
|
|
# include <sys/wait.h>
|
|
|
|
|
# include <sys/types.h>
|
|
|
|
|
# include <signal.h>
|
2003-06-05 09:14:21 +02:00
|
|
|
|
#endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#include <npth.h>
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
#include "agent.h"
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
#include <assuan.h>
|
2010-04-14 13:24:02 +02:00
|
|
|
|
#include "sysutils.h"
|
2003-06-05 09:14:21 +02:00
|
|
|
|
#include "i18n.h"
|
|
|
|
|
|
|
|
|
|
#ifdef _POSIX_OPEN_MAX
|
|
|
|
|
#define MAX_OPEN_FDS _POSIX_OPEN_MAX
|
|
|
|
|
#else
|
|
|
|
|
#define MAX_OPEN_FDS 20
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-08-20 15:03:32 +02:00
|
|
|
|
|
|
|
|
|
/* Because access to the pinentry must be serialized (it is and shall
|
|
|
|
|
be a global mutual dialog) we should better timeout further
|
|
|
|
|
requests after some time. 2 minutes seem to be a reasonable
|
|
|
|
|
time. */
|
|
|
|
|
#define LOCK_TIMEOUT (1*60)
|
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
/* The assuan context of the current pinentry. */
|
|
|
|
|
static assuan_context_t entry_ctx;
|
2004-08-20 15:03:32 +02:00
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
/* The control variable of the connection owning the current pinentry.
|
|
|
|
|
This is only valid if ENTRY_CTX is not NULL. Note, that we care
|
|
|
|
|
only about the value of the pointer and that it should never be
|
|
|
|
|
dereferenced. */
|
|
|
|
|
static ctrl_t entry_owner;
|
|
|
|
|
|
|
|
|
|
/* A mutex used to serialize access to the pinentry. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
static npth_mutex_t entry_lock;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
/* The thread ID of the popup working thread. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
static npth_t popup_tid;
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
/* A flag used in communication between the popup working thread and
|
|
|
|
|
its stop function. */
|
|
|
|
|
static int popup_finished;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Data to be passed to our callbacks, */
|
|
|
|
|
struct entry_parm_s
|
|
|
|
|
{
|
2003-06-05 09:14:21 +02:00
|
|
|
|
int lines;
|
|
|
|
|
size_t size;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
unsigned char *buffer;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-12-19 18:44:20 +01:00
|
|
|
|
/* This function must be called once to initialize this module. This
|
|
|
|
|
has to be done before a second thread is spawned. We can't do the
|
|
|
|
|
static initialization because Pth emulation code might not be able
|
2005-11-28 12:52:25 +01:00
|
|
|
|
to do a static init; in particular, it is not possible for W32. */
|
2004-12-19 18:44:20 +01:00
|
|
|
|
void
|
2007-06-14 19:05:07 +02:00
|
|
|
|
initialize_module_call_pinentry (void)
|
2004-12-19 18:44:20 +01:00
|
|
|
|
{
|
|
|
|
|
static int initialized;
|
|
|
|
|
|
|
|
|
|
if (!initialized)
|
2005-11-28 12:52:25 +01:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (npth_mutex_init (&entry_lock, NULL))
|
2005-11-28 12:52:25 +01:00
|
|
|
|
initialized = 1;
|
|
|
|
|
}
|
2004-12-19 18:44:20 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-06-07 21:09:18 +02:00
|
|
|
|
/* This function may be called to print infromation pertaining to the
|
|
|
|
|
current state of this module to the log. */
|
|
|
|
|
void
|
|
|
|
|
agent_query_dump_state (void)
|
|
|
|
|
{
|
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
|
|
|
|
log_info ("agent_query_dump_state: entry_ctx=%p pid=%ld popup_tid=%lx\n",
|
2005-11-28 12:52:25 +01:00
|
|
|
|
entry_ctx, (long)assuan_get_pid (entry_ctx), popup_tid);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called to make sure that a popup window owned by the current
|
|
|
|
|
connection gets closed. */
|
|
|
|
|
void
|
|
|
|
|
agent_reset_query (ctrl_t ctrl)
|
|
|
|
|
{
|
|
|
|
|
if (entry_ctx && popup_tid && entry_owner == ctrl)
|
|
|
|
|
{
|
|
|
|
|
agent_popup_message_stop (ctrl);
|
|
|
|
|
}
|
2005-06-07 21:09:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-12-19 18:44:20 +01:00
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
/* Unlock the pinentry so that another thread can start one and
|
|
|
|
|
disconnect that pinentry - we do this after the unlock so that a
|
|
|
|
|
stalled pinentry does not block other threads. Fixme: We should
|
2005-02-23 22:06:32 +01:00
|
|
|
|
have a timeout in Assuan for the disconnect operation. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
static int
|
2003-06-05 09:14:21 +02:00
|
|
|
|
unlock_pinentry (int rc)
|
|
|
|
|
{
|
2005-06-07 21:09:18 +02:00
|
|
|
|
assuan_context_t ctx = entry_ctx;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
int err;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2005-06-07 21:09:18 +02:00
|
|
|
|
entry_ctx = NULL;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_unlock (&entry_lock);
|
|
|
|
|
if (err)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
log_error ("failed to release the entry lock: %s\n", strerror (err));
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (!rc)
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = gpg_error_from_errno (err);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
assuan_release (ctx);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-24 21:50:49 +01:00
|
|
|
|
|
|
|
|
|
/* To make sure we leave no secrets in our image after forking of the
|
|
|
|
|
pinentry, we use this callback. */
|
|
|
|
|
static void
|
|
|
|
|
atfork_cb (void *opaque, int where)
|
|
|
|
|
{
|
2007-11-19 17:03:50 +01:00
|
|
|
|
ctrl_t ctrl = opaque;
|
|
|
|
|
|
2004-01-24 21:50:49 +01:00
|
|
|
|
if (!where)
|
2007-11-19 17:03:50 +01:00
|
|
|
|
{
|
2009-07-07 12:02:41 +02:00
|
|
|
|
int iterator = 0;
|
|
|
|
|
const char *name, *assname, *value;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-11-19 17:03:50 +01:00
|
|
|
|
gcry_control (GCRYCTL_TERM_SECMEM);
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
|
|
|
|
while ((name = session_env_list_stdenvnames (&iterator, &assname)))
|
|
|
|
|
{
|
|
|
|
|
/* For all new envvars (!ASSNAME) and the two medium old
|
|
|
|
|
ones which do have an assuan name but are conveyed using
|
|
|
|
|
environment variables, update the environment of the
|
|
|
|
|
forked process. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (!assname
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|| !strcmp (name, "XAUTHORITY")
|
|
|
|
|
|| !strcmp (name, "PINENTRY_USER_DATA"))
|
|
|
|
|
{
|
|
|
|
|
value = session_env_getenv (ctrl->session_env, name);
|
|
|
|
|
if (value)
|
2010-04-14 13:24:02 +02:00
|
|
|
|
gnupg_setenv (name, value, 1);
|
2009-07-07 12:02:41 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2007-11-19 17:03:50 +01:00
|
|
|
|
}
|
2004-01-24 21:50:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2008-02-14 20:50:10 +01:00
|
|
|
|
getinfo_pid_cb (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
|
|
|
|
unsigned long *pid = opaque;
|
|
|
|
|
char pidbuf[50];
|
|
|
|
|
|
|
|
|
|
/* There is only the pid in the server's response. */
|
|
|
|
|
if (length >= sizeof pidbuf)
|
|
|
|
|
length = sizeof pidbuf -1;
|
|
|
|
|
if (length)
|
|
|
|
|
{
|
|
|
|
|
strncpy (pidbuf, buffer, length);
|
|
|
|
|
pidbuf[length] = 0;
|
|
|
|
|
*pid = strtoul (pidbuf, NULL, 10);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-01-24 21:50:49 +01:00
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
/* Fork off the pin entry if this has not already been done. Note,
|
|
|
|
|
that this function must always be used to aquire the lock for the
|
|
|
|
|
pinentry - we will serialize _all_ pinentry calls.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
2005-11-28 12:52:25 +01:00
|
|
|
|
start_pinentry (ctrl_t ctrl)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
int rc = 0;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
const char *pgmname;
|
2006-09-06 18:35:52 +02:00
|
|
|
|
assuan_context_t ctx;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
const char *argv[5];
|
2014-03-07 09:46:44 +01:00
|
|
|
|
assuan_fd_t no_close_list[3];
|
2003-06-05 09:14:21 +02:00
|
|
|
|
int i;
|
2007-02-14 17:27:55 +01:00
|
|
|
|
const char *tmpstr;
|
2008-02-14 20:50:10 +01:00
|
|
|
|
unsigned long pinentry_pid;
|
2009-07-07 12:02:41 +02:00
|
|
|
|
const char *value;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
struct timespec abstime;
|
|
|
|
|
int err;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += LOCK_TIMEOUT;
|
|
|
|
|
err = npth_mutex_timedlock (&entry_lock, &abstime);
|
|
|
|
|
if (err)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (err == ETIMEDOUT)
|
|
|
|
|
rc = gpg_error (GPG_ERR_TIMEOUT);
|
2004-08-20 15:03:32 +02:00
|
|
|
|
else
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = gpg_error_from_errno (rc);
|
2004-08-20 15:03:32 +02:00
|
|
|
|
log_error (_("failed to acquire the pinentry lock: %s\n"),
|
|
|
|
|
gpg_strerror (rc));
|
|
|
|
|
return rc;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
entry_owner = ctrl;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
if (entry_ctx)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return 0;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("starting a new PIN Entry\n");
|
2007-07-16 11:53:47 +02:00
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2007-07-16 11:53:47 +02:00
|
|
|
|
fflush (stdout);
|
|
|
|
|
fflush (stderr);
|
|
|
|
|
#endif
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (fflush (NULL))
|
|
|
|
|
{
|
2007-08-27 20:10:27 +02:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-06-05 09:14:21 +02:00
|
|
|
|
gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
|
2007-08-27 20:10:27 +02:00
|
|
|
|
#endif
|
2003-06-05 09:14:21 +02:00
|
|
|
|
log_error ("error flushing pending output: %s\n", strerror (errno));
|
2007-07-16 11:53:47 +02:00
|
|
|
|
/* At least Windows XP fails here with EBADF. According to docs
|
|
|
|
|
and Wine an fflush(NULL) is the same as _flushall. However
|
|
|
|
|
the Wime implementaion does not flush stdin,stdout and stderr
|
|
|
|
|
- see above. Lets try to ignore the error. */
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return unlock_pinentry (tmperr);
|
2007-07-16 11:53:47 +02:00
|
|
|
|
#endif
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!opt.pinentry_program || !*opt.pinentry_program)
|
2007-06-14 19:05:07 +02:00
|
|
|
|
opt.pinentry_program = gnupg_module_name (GNUPG_MODULE_NAME_PINENTRY);
|
2010-04-14 13:24:02 +02:00
|
|
|
|
pgmname = opt.pinentry_program;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if ( !(pgmname = strrchr (opt.pinentry_program, '/')))
|
|
|
|
|
pgmname = opt.pinentry_program;
|
|
|
|
|
else
|
|
|
|
|
pgmname++;
|
|
|
|
|
|
2007-02-20 15:55:32 +01:00
|
|
|
|
/* OS X needs the entire file name in argv[0], so that it can locate
|
2007-07-04 11:34:28 +02:00
|
|
|
|
the resource bundle. For other systems we stick to the usual
|
2007-02-20 15:55:32 +01:00
|
|
|
|
convention of supplying only the name of the program. */
|
|
|
|
|
#ifdef __APPLE__
|
|
|
|
|
argv[0] = opt.pinentry_program;
|
|
|
|
|
#else /*!__APPLE__*/
|
2003-06-05 09:14:21 +02:00
|
|
|
|
argv[0] = pgmname;
|
2007-02-20 15:55:32 +01:00
|
|
|
|
#endif /*__APPLE__*/
|
|
|
|
|
|
2009-07-07 12:02:41 +02:00
|
|
|
|
if (!opt.keep_display
|
|
|
|
|
&& (value = session_env_getenv (ctrl->session_env, "DISPLAY")))
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
argv[1] = "--display";
|
2009-07-07 12:02:41 +02:00
|
|
|
|
argv[2] = value;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
argv[3] = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
argv[1] = NULL;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
i=0;
|
|
|
|
|
if (!opt.running_detached)
|
|
|
|
|
{
|
|
|
|
|
if (log_get_fd () != -1)
|
2009-12-08 05:43:15 +01:00
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2014-03-07 09:46:44 +01:00
|
|
|
|
no_close_list[i] = ASSUAN_INVALID_FD;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't allocate assuan context: %s\n", gpg_strerror (rc));
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
2010-09-01 11:48:35 +02:00
|
|
|
|
/* We don't want to log the pinentry communication to make the logs
|
|
|
|
|
easier to read. We might want to add a new debug option to enable
|
|
|
|
|
pinentry logging. */
|
|
|
|
|
#ifdef ASSUAN_NO_LOGGING
|
|
|
|
|
assuan_set_flag (ctx, ASSUAN_NO_LOGGING, 1);
|
|
|
|
|
#endif
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
|
2007-11-19 17:03:50 +01:00
|
|
|
|
/* Connect to the pinentry and perform initial handshaking. Note
|
2008-01-15 17:06:08 +01:00
|
|
|
|
that atfork is used to change the environment for pinentry. We
|
|
|
|
|
start the server in detached mode to suppress the console window
|
|
|
|
|
under Windows. */
|
2009-11-05 13:06:45 +01:00
|
|
|
|
rc = assuan_pipe_connect (ctx, opt.pinentry_program, argv,
|
|
|
|
|
no_close_list, atfork_cb, ctrl,
|
|
|
|
|
ASSUAN_PIPE_CONNECT_DETACHED);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("can't connect to the PIN entry module '%s': %s\n",
|
2010-10-18 16:56:52 +02:00
|
|
|
|
opt.pinentry_program, gpg_strerror (rc));
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
assuan_release (ctx);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return unlock_pinentry (gpg_error (GPG_ERR_NO_PIN_ENTRY));
|
|
|
|
|
}
|
|
|
|
|
entry_ctx = ctx;
|
|
|
|
|
|
|
|
|
|
if (DBG_ASSUAN)
|
|
|
|
|
log_debug ("connection to PIN entry established\n");
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
rc = assuan_transact (entry_ctx,
|
2003-06-05 09:14:21 +02:00
|
|
|
|
opt.no_grab? "OPTION no-grab":"OPTION grab",
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
|
|
|
|
value = session_env_getenv (ctrl->session_env, "GPG_TTY");
|
|
|
|
|
if (value)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
2009-07-07 12:02:41 +02:00
|
|
|
|
if (asprintf (&optstr, "OPTION ttyname=%s", value) < 0 )
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
rc = assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (optstr);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2009-07-07 12:02:41 +02:00
|
|
|
|
value = session_env_getenv (ctrl->session_env, "TERM");
|
|
|
|
|
if (value)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
2009-07-07 12:02:41 +02:00
|
|
|
|
if (asprintf (&optstr, "OPTION ttytype=%s", value) < 0 )
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
rc = assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
2010-02-17 20:03:37 +01:00
|
|
|
|
xfree (optstr);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2004-12-17 21:41:50 +01:00
|
|
|
|
if (ctrl->lc_ctype)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 )
|
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
rc = assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
2010-02-17 20:03:37 +01:00
|
|
|
|
xfree (optstr);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2004-12-17 21:41:50 +01:00
|
|
|
|
if (ctrl->lc_messages)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 )
|
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
rc = assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
2010-02-17 20:03:37 +01:00
|
|
|
|
xfree (optstr);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2007-02-14 17:27:55 +01:00
|
|
|
|
|
2010-02-17 20:03:37 +01:00
|
|
|
|
{
|
|
|
|
|
/* Provide a few default strings for use by the pinentries. This
|
|
|
|
|
may help a pinentry to avoid implementing localization code. */
|
|
|
|
|
static struct { const char *key, *value; } tbl[] = {
|
|
|
|
|
/* TRANSLATORS: These are labels for buttons etc used in
|
2010-02-26 11:52:05 +01:00
|
|
|
|
Pinentries. An underscore indicates that the next letter
|
|
|
|
|
should be used as an accelerator. Double the underscore for
|
|
|
|
|
a literal one. The actual to be translated text starts after
|
|
|
|
|
the second vertical bar. */
|
2010-02-17 20:03:37 +01:00
|
|
|
|
{ "ok", N_("|pinentry-label|_OK") },
|
|
|
|
|
{ "cancel", N_("|pinentry-label|_Cancel") },
|
2010-02-26 11:52:05 +01:00
|
|
|
|
{ "prompt", N_("|pinentry-label|PIN:") },
|
2010-02-17 20:03:37 +01:00
|
|
|
|
{ NULL, NULL}
|
|
|
|
|
};
|
|
|
|
|
char *optstr;
|
|
|
|
|
int idx;
|
2010-02-26 11:52:05 +01:00
|
|
|
|
const char *s, *s2;
|
2010-02-17 20:03:37 +01:00
|
|
|
|
|
|
|
|
|
for (idx=0; tbl[idx].key; idx++)
|
|
|
|
|
{
|
2010-02-26 11:52:05 +01:00
|
|
|
|
s = _(tbl[idx].value);
|
|
|
|
|
if (*s == '|' && (s2=strchr (s+1,'|')))
|
|
|
|
|
s = s2+1;
|
|
|
|
|
if (asprintf (&optstr, "OPTION default-%s=%s", tbl[idx].key, s) < 0 )
|
2010-02-17 20:03:37 +01:00
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
xfree (optstr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-02-14 17:27:55 +01:00
|
|
|
|
/* Tell the pinentry the name of a file it shall touch after having
|
|
|
|
|
messed with the tty. This is optional and only supported by
|
|
|
|
|
newer pinentries and thus we do no error checking. */
|
|
|
|
|
tmpstr = opt.pinentry_touch_file;
|
|
|
|
|
if (tmpstr && !strcmp (tmpstr, "/dev/null"))
|
|
|
|
|
tmpstr = NULL;
|
|
|
|
|
else if (!tmpstr)
|
|
|
|
|
tmpstr = get_agent_socket_name ();
|
|
|
|
|
if (tmpstr)
|
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-02-14 17:27:55 +01:00
|
|
|
|
if (asprintf (&optstr, "OPTION touch-file=%s", tmpstr ) < 0 )
|
|
|
|
|
;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (optstr);
|
2007-02-14 17:27:55 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-14 20:50:10 +01:00
|
|
|
|
|
|
|
|
|
/* Now ask the Pinentry for its PID. If the Pinentry is new enough
|
|
|
|
|
it will send the pid back and we will use an inquire to notify
|
|
|
|
|
our client. The client may answer the inquiry either with END or
|
|
|
|
|
with CAN to cancel the pinentry. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
rc = assuan_transact (entry_ctx, "GETINFO pid",
|
2008-02-14 20:50:10 +01:00
|
|
|
|
getinfo_pid_cb, &pinentry_pid,
|
|
|
|
|
NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_info ("You may want to update to a newer pinentry\n");
|
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (!rc && (pid_t)pinentry_pid == (pid_t)(-1))
|
|
|
|
|
log_error ("pinentry did not return a PID\n");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = agent_inq_pinentry_launched (ctrl, pinentry_pid);
|
2010-10-13 17:57:08 +02:00
|
|
|
|
if (gpg_err_code (rc) == GPG_ERR_CANCELED
|
|
|
|
|
|| gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED)
|
|
|
|
|
return unlock_pinentry (gpg_err_make (GPG_ERR_SOURCE_DEFAULT,
|
|
|
|
|
gpg_err_code (rc)));
|
2008-02-14 20:50:10 +01:00
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-14 20:50:10 +01:00
|
|
|
|
|
2006-10-19 16:22:06 +02:00
|
|
|
|
/* Returns True is the pinentry is currently active. If WAITSECONDS is
|
|
|
|
|
greater than zero the function will wait for this many seconds
|
|
|
|
|
before returning. */
|
|
|
|
|
int
|
|
|
|
|
pinentry_active_p (ctrl_t ctrl, int waitseconds)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
int err;
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)ctrl;
|
|
|
|
|
|
2006-10-19 16:22:06 +02:00
|
|
|
|
if (waitseconds > 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
|
|
|
|
struct timespec abstime;
|
2006-10-19 16:22:06 +02:00
|
|
|
|
int rc;
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += waitseconds;
|
|
|
|
|
err = npth_mutex_timedlock (&entry_lock, &abstime);
|
|
|
|
|
if (err)
|
2006-10-19 16:22:06 +02:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (err == ETIMEDOUT)
|
2006-10-19 16:22:06 +02:00
|
|
|
|
rc = gpg_error (GPG_ERR_TIMEOUT);
|
|
|
|
|
else
|
|
|
|
|
rc = gpg_error (GPG_ERR_INTERNAL);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_trylock (&entry_lock);
|
|
|
|
|
if (err)
|
2006-10-19 16:22:06 +02:00
|
|
|
|
return gpg_error (GPG_ERR_LOCKED);
|
|
|
|
|
}
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_unlock (&entry_lock);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("failed to release the entry lock at %d: %s\n", __LINE__,
|
|
|
|
|
strerror (errno));
|
2006-10-19 16:22:06 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2003-06-05 09:14:21 +02:00
|
|
|
|
getpin_cb (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
|
|
|
|
struct entry_parm_s *parm = opaque;
|
|
|
|
|
|
|
|
|
|
if (!buffer)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* we expect the pin to fit on one line */
|
|
|
|
|
if (parm->lines || length >= parm->size)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return gpg_error (GPG_ERR_ASS_TOO_MUCH_DATA);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
/* fixme: we should make sure that the assuan buffer is allocated in
|
|
|
|
|
secure memory or read the response byte by byte */
|
|
|
|
|
memcpy (parm->buffer, buffer, length);
|
|
|
|
|
parm->buffer[length] = 0;
|
|
|
|
|
parm->lines++;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
all_digitsp( const char *s)
|
|
|
|
|
{
|
|
|
|
|
for (; *s && *s >= '0' && *s <= '9'; s++)
|
|
|
|
|
;
|
|
|
|
|
return !*s;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
}
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
|
2007-09-18 13:40:09 +02:00
|
|
|
|
/* Return a new malloced string by unescaping the string S. Escaping
|
|
|
|
|
is percent escaping and '+'/space mapping. A binary Nul will
|
|
|
|
|
silently be replaced by a 0xFF. Function returns NULL to indicate
|
|
|
|
|
an out of memory status. PArsing stops at the end of the string or
|
|
|
|
|
a white space character. */
|
|
|
|
|
static char *
|
|
|
|
|
unescape_passphrase_string (const unsigned char *s)
|
|
|
|
|
{
|
|
|
|
|
char *buffer, *d;
|
|
|
|
|
|
|
|
|
|
buffer = d = xtrymalloc_secure (strlen ((const char*)s)+1);
|
|
|
|
|
if (!buffer)
|
|
|
|
|
return NULL;
|
|
|
|
|
while (*s && !spacep (s))
|
|
|
|
|
{
|
|
|
|
|
if (*s == '%' && s[1] && s[2])
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2007-09-18 13:40:09 +02:00
|
|
|
|
s++;
|
|
|
|
|
*d = xtoi_2 (s);
|
|
|
|
|
if (!*d)
|
|
|
|
|
*d = '\xff';
|
|
|
|
|
d++;
|
|
|
|
|
s += 2;
|
|
|
|
|
}
|
|
|
|
|
else if (*s == '+')
|
|
|
|
|
{
|
|
|
|
|
*d++ = ' ';
|
|
|
|
|
s++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*d++ = *s++;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
*d = 0;
|
2007-09-18 13:40:09 +02:00
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Estimate the quality of the passphrase PW and return a value in the
|
|
|
|
|
range 0..100. */
|
|
|
|
|
static int
|
|
|
|
|
estimate_passphrase_quality (const char *pw)
|
|
|
|
|
{
|
|
|
|
|
int goodlength = opt.min_passphrase_len + opt.min_passphrase_len/3;
|
|
|
|
|
int length;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if (goodlength < 1)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (length = 0, s = pw; *s; s++)
|
|
|
|
|
if (!spacep (s))
|
|
|
|
|
length ++;
|
|
|
|
|
|
|
|
|
|
if (length > goodlength)
|
|
|
|
|
return 100;
|
|
|
|
|
return ((length*10) / goodlength)*10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle the QUALITY inquiry. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2007-09-18 13:40:09 +02:00
|
|
|
|
inq_quality (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
assuan_context_t ctx = opaque;
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
const char *s;
|
2007-09-18 13:40:09 +02:00
|
|
|
|
char *pin;
|
|
|
|
|
int rc;
|
|
|
|
|
int percent;
|
|
|
|
|
char numbuf[20];
|
|
|
|
|
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
if ((s = has_leading_keyword (line, "QUALITY")))
|
2007-09-18 13:40:09 +02:00
|
|
|
|
{
|
Use has_leading_keyword in the assuan callbacks.
* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
(keyinfo_status_cb, inq_import_key_parms): Ditto.
* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
2013-02-22 10:56:13 +01:00
|
|
|
|
pin = unescape_passphrase_string (s);
|
2007-09-18 13:40:09 +02:00
|
|
|
|
if (!pin)
|
|
|
|
|
rc = gpg_error_from_syserror ();
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
percent = estimate_passphrase_quality (pin);
|
|
|
|
|
if (check_passphrase_constraints (NULL, pin, 1))
|
|
|
|
|
percent = -percent;
|
|
|
|
|
snprintf (numbuf, sizeof numbuf, "%d", percent);
|
|
|
|
|
rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
|
|
|
|
|
xfree (pin);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("unsupported inquiry '%s' from pinentry\n", line);
|
2007-09-18 13:40:09 +02:00
|
|
|
|
rc = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-05-15 13:16:28 +02:00
|
|
|
|
/* Helper for agent_askpin and agent_get_passphrase. */
|
|
|
|
|
static int
|
|
|
|
|
setup_qualitybar (void)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
char *tmpstr, *tmpstr2;
|
|
|
|
|
const char *tooltip;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-05-15 13:16:28 +02:00
|
|
|
|
/* TRANSLATORS: This string is displayed by Pinentry as the label
|
|
|
|
|
for the quality bar. */
|
|
|
|
|
tmpstr = try_percent_escape (_("Quality:"), "\t\r\n\f\v");
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETQUALITYBAR %s", tmpstr? tmpstr:"");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
xfree (tmpstr);
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc == 103 /*(Old assuan error code)*/
|
|
|
|
|
|| gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
|
|
|
|
|
; /* Ignore Unknown Command from old Pinentry versions. */
|
|
|
|
|
else if (rc)
|
|
|
|
|
return rc;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-05-15 13:16:28 +02:00
|
|
|
|
tmpstr2 = gnupg_get_help_string ("pinentry.qualitybar.tooltip", 0);
|
|
|
|
|
if (tmpstr2)
|
|
|
|
|
tooltip = tmpstr2;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* TRANSLATORS: This string is a tooltip, shown by pinentry when
|
|
|
|
|
hovering over the quality bar. Please use an appropriate
|
|
|
|
|
string to describe what this is about. The length of the
|
|
|
|
|
tooltip is limited to about 900 characters. If you do not
|
|
|
|
|
translate this entry, a default english text (see source)
|
|
|
|
|
will be used. */
|
|
|
|
|
tooltip = _("pinentry.qualitybar.tooltip");
|
|
|
|
|
if (!strcmp ("pinentry.qualitybar.tooltip", tooltip))
|
|
|
|
|
tooltip = ("The quality of the text entered above.\n"
|
|
|
|
|
"Please ask your administrator for "
|
|
|
|
|
"details about the criteria.");
|
|
|
|
|
}
|
|
|
|
|
tmpstr = try_percent_escape (tooltip, "\t\r\n\f\v");
|
|
|
|
|
xfree (tmpstr2);
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETQUALITYBAR_TT %s", tmpstr? tmpstr:"");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
xfree (tmpstr);
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc == 103 /*(Old assuan error code)*/
|
|
|
|
|
|| gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
|
|
|
|
|
; /* Ignore Unknown Command from old pinentry versions. */
|
|
|
|
|
else if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2007-09-18 13:40:09 +02:00
|
|
|
|
|
|
|
|
|
|
2010-10-01 22:33:53 +02:00
|
|
|
|
/* Check the button_info line for a close action. */
|
|
|
|
|
static gpg_error_t
|
|
|
|
|
close_button_status_cb (void *opaque, const char *line)
|
|
|
|
|
{
|
|
|
|
|
int *flag = opaque;
|
|
|
|
|
const char *keyword = line;
|
|
|
|
|
int keywordlen;
|
|
|
|
|
|
|
|
|
|
for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
|
|
|
|
|
;
|
|
|
|
|
while (spacep (line))
|
|
|
|
|
line++;
|
|
|
|
|
if (keywordlen == 11 && !memcmp (keyword, "BUTTON_INFO", keywordlen))
|
|
|
|
|
{
|
|
|
|
|
if ( !strcmp (line, "close") )
|
|
|
|
|
*flag = 1;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-10-01 22:33:53 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
/* Call the Entry and ask for the PIN. We do check for a valid PIN
|
|
|
|
|
number here and repeat it as long as we have invalid formed
|
|
|
|
|
numbers. */
|
|
|
|
|
int
|
2005-05-24 14:37:36 +02:00
|
|
|
|
agent_askpin (ctrl_t ctrl,
|
|
|
|
|
const char *desc_text, const char *prompt_text,
|
|
|
|
|
const char *initial_errtext,
|
2010-10-13 17:57:08 +02:00
|
|
|
|
struct pin_entry_info_s *pininfo)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
struct entry_parm_s parm;
|
|
|
|
|
const char *errtext = NULL;
|
|
|
|
|
int is_pin = 0;
|
2010-08-12 13:43:46 +02:00
|
|
|
|
int saveflag;
|
2010-10-01 22:33:53 +02:00
|
|
|
|
int close_button;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (opt.batch)
|
|
|
|
|
return 0; /* fixme: we should return BAD PIN */
|
|
|
|
|
|
2011-03-03 18:35:08 +01:00
|
|
|
|
if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
|
{
|
|
|
|
|
if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL)
|
|
|
|
|
return gpg_error (GPG_ERR_CANCELED);
|
2011-09-11 22:55:34 +02:00
|
|
|
|
if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *passphrase;
|
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
|
|
*pininfo->pin = 0; /* Reset the PIN. */
|
|
|
|
|
rc = pinentry_loopback(ctrl, "PASSPHRASE", &passphrase, &size,
|
|
|
|
|
pininfo->max_length);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
memcpy(&pininfo->pin, passphrase, size);
|
|
|
|
|
xfree(passphrase);
|
|
|
|
|
pininfo->pin[size] = 0;
|
|
|
|
|
if (pininfo->check_cb)
|
|
|
|
|
{
|
|
|
|
|
/* More checks by utilizing the optional callback. */
|
|
|
|
|
pininfo->cb_errtext = NULL;
|
|
|
|
|
rc = pininfo->check_cb (pininfo);
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
return gpg_error(GPG_ERR_NO_PIN_ENTRY);
|
2011-03-03 18:35:08 +01:00
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (!pininfo || pininfo->max_length < 1)
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
if (!desc_text && pininfo->min_digits)
|
|
|
|
|
desc_text = _("Please enter your PIN, so that the secret key "
|
|
|
|
|
"can be unlocked for this session");
|
|
|
|
|
else if (!desc_text)
|
|
|
|
|
desc_text = _("Please enter your passphrase, so that the secret key "
|
|
|
|
|
"can be unlocked for this session");
|
|
|
|
|
|
2005-05-24 14:37:36 +02:00
|
|
|
|
if (prompt_text)
|
|
|
|
|
is_pin = !!strstr (prompt_text, "PIN");
|
|
|
|
|
else
|
|
|
|
|
is_pin = desc_text && strstr (desc_text, "PIN");
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
rc = start_pinentry (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETDESC %s", desc_text);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2005-05-24 14:37:36 +02:00
|
|
|
|
snprintf (line, DIM(line)-1, "SETPROMPT %s",
|
|
|
|
|
prompt_text? prompt_text : is_pin? "PIN:" : "Passphrase:");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2007-09-18 13:40:09 +02:00
|
|
|
|
/* If a passphrase quality indicator has been requested and a
|
|
|
|
|
minimum passphrase length has not been disabled, send the command
|
|
|
|
|
to the pinentry. */
|
|
|
|
|
if (pininfo->with_qualitybar && opt.min_passphrase_len )
|
|
|
|
|
{
|
2009-05-15 13:16:28 +02:00
|
|
|
|
rc = setup_qualitybar ();
|
|
|
|
|
if (rc)
|
2007-09-18 13:40:09 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
}
|
2004-02-21 14:05:22 +01:00
|
|
|
|
|
|
|
|
|
if (initial_errtext)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2004-02-21 14:05:22 +01:00
|
|
|
|
snprintf (line, DIM(line)-1, "SETERROR %s", initial_errtext);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2004-02-21 14:05:22 +01:00
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
for (;pininfo->failed_tries < pininfo->max_tries; pininfo->failed_tries++)
|
|
|
|
|
{
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.size = pininfo->max_length;
|
2007-08-27 20:10:27 +02:00
|
|
|
|
*pininfo->pin = 0; /* Reset the PIN. */
|
2005-06-16 10:12:03 +02:00
|
|
|
|
parm.buffer = (unsigned char*)pininfo->pin;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
if (errtext)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
{
|
2012-08-22 18:54:37 +02:00
|
|
|
|
/* TRANSLATORS: The string is appended to an error message in
|
2007-01-25 09:30:47 +01:00
|
|
|
|
the pinentry. The %s is the actual error message, the
|
|
|
|
|
two %d give the current and maximum number of tries. */
|
|
|
|
|
snprintf (line, DIM(line)-1, _("SETERROR %s (try %d of %d)"),
|
2003-06-05 09:14:21 +02:00
|
|
|
|
errtext, pininfo->failed_tries+1, pininfo->max_tries);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
2004-02-21 14:05:22 +01:00
|
|
|
|
rc = assuan_transact (entry_ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
errtext = NULL;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-08-12 13:43:46 +02:00
|
|
|
|
saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
|
|
|
|
|
assuan_begin_confidential (entry_ctx);
|
2010-10-01 22:33:53 +02:00
|
|
|
|
close_button = 0;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm,
|
2010-10-01 22:33:53 +02:00
|
|
|
|
inq_quality, entry_ctx,
|
|
|
|
|
close_button_status_cb, &close_button);
|
2010-08-12 13:43:46 +02:00
|
|
|
|
assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
|
2006-10-04 18:45:04 +02:00
|
|
|
|
/* Most pinentries out in the wild return the old Assuan error code
|
|
|
|
|
for canceled which gets translated to an assuan Cancel error and
|
|
|
|
|
not to the code for a user cancel. Fix this here. */
|
|
|
|
|
if (rc && gpg_err_source (rc)
|
|
|
|
|
&& gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
|
|
|
|
|
2010-10-13 17:57:08 +02:00
|
|
|
|
/* Change error code in case the window close button was clicked
|
|
|
|
|
to cancel the operation. */
|
|
|
|
|
if (close_button && gpg_err_code (rc) == GPG_ERR_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_FULLY_CANCELED);
|
2010-10-01 22:33:53 +02:00
|
|
|
|
|
2006-09-06 18:35:52 +02:00
|
|
|
|
if (gpg_err_code (rc) == GPG_ERR_ASS_TOO_MUCH_DATA)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
errtext = is_pin? _("PIN too long")
|
|
|
|
|
: _("Passphrase too long");
|
|
|
|
|
else if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
if (!errtext && pininfo->min_digits)
|
|
|
|
|
{
|
|
|
|
|
/* do some basic checks on the entered PIN. */
|
|
|
|
|
if (!all_digitsp (pininfo->pin))
|
|
|
|
|
errtext = _("Invalid characters in PIN");
|
|
|
|
|
else if (pininfo->max_digits
|
|
|
|
|
&& strlen (pininfo->pin) > pininfo->max_digits)
|
|
|
|
|
errtext = _("PIN too long");
|
|
|
|
|
else if (strlen (pininfo->pin) < pininfo->min_digits)
|
|
|
|
|
errtext = _("PIN too short");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!errtext && pininfo->check_cb)
|
|
|
|
|
{
|
|
|
|
|
/* More checks by utilizing the optional callback. */
|
|
|
|
|
pininfo->cb_errtext = NULL;
|
|
|
|
|
rc = pininfo->check_cb (pininfo);
|
|
|
|
|
if (rc == -1 && pininfo->cb_errtext)
|
|
|
|
|
errtext = pininfo->cb_errtext;
|
|
|
|
|
else if (gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE
|
|
|
|
|
|| gpg_err_code (rc) == GPG_ERR_BAD_PIN)
|
|
|
|
|
errtext = (is_pin? _("Bad PIN")
|
|
|
|
|
: _("Bad Passphrase"));
|
|
|
|
|
else if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!errtext)
|
|
|
|
|
return unlock_pinentry (0); /* okay, got a PIN or passphrase */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return unlock_pinentry (gpg_error (pininfo->min_digits? GPG_ERR_BAD_PIN
|
|
|
|
|
: GPG_ERR_BAD_PASSPHRASE));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-10-04 18:45:04 +02:00
|
|
|
|
/* Ask for the passphrase using the supplied arguments. The returned
|
|
|
|
|
passphrase needs to be freed by the caller. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int
|
2005-11-28 12:52:25 +01:00
|
|
|
|
agent_get_passphrase (ctrl_t ctrl,
|
2003-06-05 09:14:21 +02:00
|
|
|
|
char **retpass, const char *desc, const char *prompt,
|
2009-05-15 13:16:28 +02:00
|
|
|
|
const char *errtext, int with_qualitybar)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
struct entry_parm_s parm;
|
2010-08-12 13:43:46 +02:00
|
|
|
|
int saveflag;
|
2010-10-13 17:57:08 +02:00
|
|
|
|
int close_button;
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
*retpass = NULL;
|
|
|
|
|
if (opt.batch)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return gpg_error (GPG_ERR_BAD_PASSPHRASE);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2011-03-03 18:35:08 +01:00
|
|
|
|
if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
|
{
|
|
|
|
|
if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL)
|
|
|
|
|
return gpg_error (GPG_ERR_CANCELED);
|
|
|
|
|
|
2011-09-11 22:55:34 +02:00
|
|
|
|
if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
|
|
|
|
|
{
|
|
|
|
|
size_t size;
|
|
|
|
|
size_t len = ASSUAN_LINELENGTH/2;
|
|
|
|
|
unsigned char *buffer = gcry_malloc_secure (len);
|
|
|
|
|
|
|
|
|
|
rc = pinentry_loopback(ctrl, "PASSPHRASE", &buffer, &size, len);
|
|
|
|
|
if (rc)
|
|
|
|
|
xfree(buffer);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
buffer[size] = 0;
|
|
|
|
|
*retpass = buffer;
|
|
|
|
|
}
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
2011-03-03 18:35:08 +01:00
|
|
|
|
return gpg_error (GPG_ERR_NO_PIN_ENTRY);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
rc = start_pinentry (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!prompt)
|
|
|
|
|
prompt = desc && strstr (desc, "PIN")? "PIN": _("Passphrase");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (desc)
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETDESC %s", desc);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, DIM(line)-1, "RESET");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETPROMPT %s", prompt);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
2009-05-15 13:16:28 +02:00
|
|
|
|
if (with_qualitybar && opt.min_passphrase_len)
|
|
|
|
|
{
|
|
|
|
|
rc = setup_qualitybar ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (errtext)
|
|
|
|
|
{
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETERROR %s", errtext);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memset (&parm, 0, sizeof parm);
|
|
|
|
|
parm.size = ASSUAN_LINELENGTH/2 - 5;
|
|
|
|
|
parm.buffer = gcry_malloc_secure (parm.size+10);
|
|
|
|
|
if (!parm.buffer)
|
|
|
|
|
return unlock_pinentry (out_of_core ());
|
|
|
|
|
|
2010-08-12 13:43:46 +02:00
|
|
|
|
saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
assuan_begin_confidential (entry_ctx);
|
2010-10-13 17:57:08 +02:00
|
|
|
|
close_button = 0;
|
2006-10-04 18:45:04 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, &parm,
|
2010-10-13 17:57:08 +02:00
|
|
|
|
inq_quality, entry_ctx,
|
|
|
|
|
close_button_status_cb, &close_button);
|
2010-08-12 13:43:46 +02:00
|
|
|
|
assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
|
2006-10-04 18:45:04 +02:00
|
|
|
|
/* Most pinentries out in the wild return the old Assuan error code
|
|
|
|
|
for canceled which gets translated to an assuan Cancel error and
|
|
|
|
|
not to the code for a user cancel. Fix this here. */
|
|
|
|
|
if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
2010-10-13 17:57:08 +02:00
|
|
|
|
/* Change error code in case the window close button was clicked
|
|
|
|
|
to cancel the operation. */
|
|
|
|
|
if (close_button && gpg_err_code (rc) == GPG_ERR_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_FULLY_CANCELED);
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-10-04 18:45:04 +02:00
|
|
|
|
xfree (parm.buffer);
|
|
|
|
|
else
|
|
|
|
|
*retpass = parm.buffer;
|
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Pop up the PIN-entry, display the text and the prompt and ask the
|
2005-11-28 12:52:25 +01:00
|
|
|
|
user to confirm this. We return 0 for success, ie. the user
|
2003-06-05 09:14:21 +02:00
|
|
|
|
confirmed it, GPG_ERR_NOT_CONFIRMED for what the text says or an
|
2009-06-17 12:19:50 +02:00
|
|
|
|
other error. If WITH_CANCEL it true an extra cancel button is
|
|
|
|
|
displayed to allow the user to easily return a GPG_ERR_CANCELED.
|
|
|
|
|
if the Pinentry does not support this, the user can still cancel by
|
|
|
|
|
closing the Pinentry window. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int
|
2005-11-28 12:52:25 +01:00
|
|
|
|
agent_get_confirmation (ctrl_t ctrl,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
const char *desc, const char *ok,
|
2009-06-17 12:19:50 +02:00
|
|
|
|
const char *notok, int with_cancel)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
2011-03-03 18:35:08 +01:00
|
|
|
|
if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
|
{
|
|
|
|
|
if (ctrl->pinentry_mode == PINENTRY_MODE_CANCEL)
|
|
|
|
|
return gpg_error (GPG_ERR_CANCELED);
|
|
|
|
|
|
|
|
|
|
return gpg_error (GPG_ERR_NO_PIN_ENTRY);
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
rc = start_pinentry (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (desc)
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETDESC %s", desc);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, DIM(line)-1, "RESET");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2006-10-04 18:45:04 +02:00
|
|
|
|
/* Most pinentries out in the wild return the old Assuan error code
|
|
|
|
|
for canceled which gets translated to an assuan Cancel error and
|
|
|
|
|
not to the code for a user cancel. Fix this here. */
|
|
|
|
|
if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
|
|
|
|
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
|
|
|
|
|
if (ok)
|
|
|
|
|
{
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETOK %s", ok);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
2009-06-17 12:19:50 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx,
|
|
|
|
|
line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
2009-06-17 12:19:50 +02:00
|
|
|
|
if (notok)
|
2003-06-05 09:14:21 +02:00
|
|
|
|
{
|
2009-06-17 12:19:50 +02:00
|
|
|
|
/* Try to use the newer NOTOK feature if a cancel button is
|
2010-02-17 20:03:37 +01:00
|
|
|
|
requested. If no cancel button is requested we keep on using
|
2009-06-17 12:19:50 +02:00
|
|
|
|
the standard cancel. */
|
|
|
|
|
if (with_cancel)
|
|
|
|
|
{
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETNOTOK %s", notok);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx,
|
|
|
|
|
line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
rc = GPG_ERR_ASS_UNKNOWN_CMD;
|
|
|
|
|
|
2009-04-14 22:36:14 +02:00
|
|
|
|
if (gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
|
|
|
|
|
{
|
2009-06-17 12:19:50 +02:00
|
|
|
|
snprintf (line, DIM(line)-1, "SETCANCEL %s", notok);
|
2009-04-14 22:36:14 +02:00
|
|
|
|
line[DIM(line)-1] = 0;
|
2009-06-17 12:19:50 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx, line,
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2009-04-14 22:36:14 +02:00
|
|
|
|
}
|
2003-06-05 09:14:21 +02:00
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-06-17 12:19:50 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx, "CONFIRM",
|
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2006-10-16 19:36:44 +02:00
|
|
|
|
if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
|
|
|
|
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2003-06-05 09:14:21 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-08-27 20:10:27 +02:00
|
|
|
|
|
|
|
|
|
/* Pop up the PINentry, display the text DESC and a button with the
|
2011-03-03 18:35:08 +01:00
|
|
|
|
text OK_BTN (which may be NULL to use the default of "OK") and wait
|
2007-08-27 20:10:27 +02:00
|
|
|
|
for the user to hit this button. The return value is not
|
|
|
|
|
relevant. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int
|
2007-08-27 20:10:27 +02:00
|
|
|
|
agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
2011-03-03 18:35:08 +01:00
|
|
|
|
if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
|
return gpg_error (GPG_ERR_CANCELED);
|
|
|
|
|
|
2007-08-27 20:10:27 +02:00
|
|
|
|
rc = start_pinentry (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (desc)
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETDESC %s", desc);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, DIM(line)-1, "RESET");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
/* Most pinentries out in the wild return the old Assuan error code
|
|
|
|
|
for canceled which gets translated to an assuan Cancel error and
|
|
|
|
|
not to the code for a user cancel. Fix this here. */
|
|
|
|
|
if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
|
|
|
|
|
|
|
|
|
if (rc)
|
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
|
|
|
|
|
if (ok_btn)
|
|
|
|
|
{
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETOK %s", ok_btn);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-08-27 20:10:27 +02:00
|
|
|
|
rc = assuan_transact (entry_ctx, "CONFIRM --one-button", NULL, NULL, NULL,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (rc && gpg_err_source (rc) && gpg_err_code (rc) == GPG_ERR_ASS_CANCELED)
|
|
|
|
|
rc = gpg_err_make (gpg_err_source (rc), GPG_ERR_CANCELED);
|
|
|
|
|
|
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
/* The thread running the popup message. */
|
|
|
|
|
static void *
|
|
|
|
|
popup_message_thread (void *arg)
|
|
|
|
|
{
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)arg;
|
|
|
|
|
|
2007-01-25 09:30:47 +01:00
|
|
|
|
/* We use the --one-button hack instead of the MESSAGE command to
|
|
|
|
|
allow the use of old Pinentries. Those old Pinentries will then
|
|
|
|
|
show an additional Cancel button but that is mostly a visual
|
|
|
|
|
annoyance. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
assuan_transact (entry_ctx, "CONFIRM --one-button",
|
2007-01-25 09:30:47 +01:00
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2005-11-28 12:52:25 +01:00
|
|
|
|
popup_finished = 1;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Pop up a message window similar to the confirm one but keep it open
|
|
|
|
|
until agent_popup_message_stop has been called. It is crucial for
|
|
|
|
|
the caller to make sure that the stop function gets called as soon
|
2006-11-20 17:49:41 +01:00
|
|
|
|
as the message is not anymore required because the message is
|
2005-11-28 12:52:25 +01:00
|
|
|
|
system modal and all other attempts to use the pinentry will fail
|
|
|
|
|
(after a timeout). */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int
|
2007-01-25 09:30:47 +01:00
|
|
|
|
agent_popup_message_start (ctrl_t ctrl, const char *desc, const char *ok_btn)
|
2005-11-28 12:52:25 +01:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
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_attr_t tattr;
|
|
|
|
|
int err;
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
2011-03-03 18:35:08 +01:00
|
|
|
|
if (ctrl->pinentry_mode != PINENTRY_MODE_ASK)
|
|
|
|
|
return gpg_error (GPG_ERR_CANCELED);
|
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
rc = start_pinentry (ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (desc)
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETDESC %s", desc);
|
|
|
|
|
else
|
|
|
|
|
snprintf (line, DIM(line)-1, "RESET");
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
if (ok_btn)
|
|
|
|
|
{
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETOK %s", ok_btn);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
rc = assuan_transact (entry_ctx, line, NULL,NULL,NULL,NULL,NULL,NULL);
|
|
|
|
|
if (rc)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
return unlock_pinentry (rc);
|
2005-11-28 12:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_attr_init (&tattr);
|
|
|
|
|
if (err)
|
|
|
|
|
return unlock_pinentry (gpg_error_from_errno (err));
|
|
|
|
|
npth_attr_setdetachstate (&tattr, NPTH_CREATE_JOINABLE);
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
popup_finished = 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
|
|
|
|
err = npth_create (&popup_tid, &tattr, popup_message_thread, NULL);
|
|
|
|
|
npth_attr_destroy (&tattr);
|
|
|
|
|
if (err)
|
2005-11-28 12:52:25 +01:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = gpg_error_from_errno (err);
|
2005-11-28 12:52:25 +01:00
|
|
|
|
log_error ("error spawning popup message handler: %s\n",
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
strerror (err) );
|
2005-11-28 12:52:25 +01:00
|
|
|
|
return unlock_pinentry (rc);
|
|
|
|
|
}
|
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_setname_np (popup_tid, "popup-message");
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Close a popup window. */
|
|
|
|
|
void
|
|
|
|
|
agent_popup_message_stop (ctrl_t ctrl)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
|
2008-10-20 15:53:23 +02:00
|
|
|
|
(void)ctrl;
|
|
|
|
|
|
2005-11-28 12:52:25 +01:00
|
|
|
|
if (!popup_tid || !entry_ctx)
|
|
|
|
|
{
|
|
|
|
|
log_debug ("agent_popup_message_stop called with no active popup\n");
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return;
|
2005-11-28 12:52:25 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pid = assuan_get_pid (entry_ctx);
|
|
|
|
|
if (pid == (pid_t)(-1))
|
|
|
|
|
; /* No pid available can't send a kill. */
|
|
|
|
|
else if (popup_finished)
|
|
|
|
|
; /* Already finished and ready for joining. */
|
2007-06-14 19:05:07 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2007-09-14 16:25:02 +02:00
|
|
|
|
/* Older versions of assuan set PID to 0 on Windows to indicate an
|
|
|
|
|
invalid value. */
|
|
|
|
|
else if (pid != (pid_t) INVALID_HANDLE_VALUE
|
|
|
|
|
&& pid != 0)
|
|
|
|
|
{
|
|
|
|
|
HANDLE process = (HANDLE) pid;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-09-14 16:25:02 +02:00
|
|
|
|
/* Arbitrary error code. */
|
|
|
|
|
TerminateProcess (process, 1);
|
|
|
|
|
}
|
2007-06-14 19:05:07 +02:00
|
|
|
|
#else
|
2005-11-28 12:52:25 +01:00
|
|
|
|
else if (pid && ((rc=waitpid (pid, NULL, WNOHANG))==-1 || (rc == pid)) )
|
|
|
|
|
{ /* The daemon already died. No need to send a kill. However
|
|
|
|
|
because we already waited for the process, we need to tell
|
|
|
|
|
assuan that it should not wait again (done by
|
|
|
|
|
unlock_pinentry). */
|
|
|
|
|
if (rc == pid)
|
|
|
|
|
assuan_set_flag (entry_ctx, ASSUAN_NO_WAITPID, 1);
|
|
|
|
|
}
|
2006-11-20 17:49:41 +01:00
|
|
|
|
else if (pid > 0)
|
2011-12-16 01:07:56 +01:00
|
|
|
|
kill (pid, SIGINT);
|
2007-06-14 19:05:07 +02:00
|
|
|
|
#endif
|
2005-11-28 12:52:25 +01:00
|
|
|
|
|
|
|
|
|
/* Now wait for the thread to terminate. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
rc = npth_join (popup_tid, NULL);
|
2013-01-25 06:17:29 +01:00
|
|
|
|
if (rc)
|
2005-11-28 12:52:25 +01:00
|
|
|
|
log_debug ("agent_popup_message_stop: pth_join failed: %s\n",
|
2013-01-25 06:17:29 +01:00
|
|
|
|
strerror (rc));
|
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
|
|
|
|
/* Thread IDs are opaque, but we try our best here by resetting it
|
|
|
|
|
to the same content that a static global variable has. */
|
|
|
|
|
memset (&popup_tid, '\0', sizeof (popup_tid));
|
2005-11-28 12:52:25 +01:00
|
|
|
|
entry_owner = NULL;
|
|
|
|
|
|
|
|
|
|
/* Now we can close the connection. */
|
|
|
|
|
unlock_pinentry (0);
|
|
|
|
|
}
|