2003-08-05 17:11:04 +00:00
|
|
|
|
/* scdaemon.c - The GnuPG Smartcard Daemon
|
2007-08-02 18:12:43 +00:00
|
|
|
|
* Copyright (C) 2001, 2002, 2004, 2005,
|
2009-02-25 10:58:56 +00:00
|
|
|
|
* 2007, 2008, 2009 Free Software Foundation, Inc.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 17:11:04 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <fcntl.h>
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <sys/un.h>
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <signal.h>
|
2005-05-18 10:48:06 +00:00
|
|
|
|
#include <pth.h>
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
#define JNLIB_NEED_LOG_LOGV
|
2009-05-19 22:39:45 +00:00
|
|
|
|
#define JNLIB_NEED_AFLOCAL
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include "scdaemon.h"
|
|
|
|
|
#include <ksba.h>
|
|
|
|
|
#include <gcrypt.h>
|
|
|
|
|
|
|
|
|
|
#include <assuan.h> /* malloc hooks */
|
|
|
|
|
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
#include "sysutils.h"
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include "app-common.h"
|
2009-07-16 15:54:59 +00:00
|
|
|
|
#include "apdu.h"
|
2005-05-20 20:39:36 +00:00
|
|
|
|
#include "ccid-driver.h"
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 15:46:01 +00:00
|
|
|
|
#include "mkdtemp.h"
|
2007-08-02 18:12:43 +00:00
|
|
|
|
#include "gc-opt-flags.h"
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
enum cmd_and_opt_values
|
|
|
|
|
{ aNull = 0,
|
|
|
|
|
oCsh = 'c',
|
|
|
|
|
oQuiet = 'q',
|
|
|
|
|
oSh = 's',
|
|
|
|
|
oVerbose = 'v',
|
|
|
|
|
|
|
|
|
|
oNoVerbose = 500,
|
2004-02-18 17:00:11 +00:00
|
|
|
|
aGPGConfList,
|
2006-10-23 14:02:13 +00:00
|
|
|
|
aGPGConfTest,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
oOptions,
|
|
|
|
|
oDebug,
|
|
|
|
|
oDebugAll,
|
2004-02-18 17:00:11 +00:00
|
|
|
|
oDebugLevel,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
oDebugWait,
|
2005-06-07 19:09:18 +00:00
|
|
|
|
oDebugAllowCoreDump,
|
2005-05-20 20:39:36 +00:00
|
|
|
|
oDebugCCIDDriver,
|
2009-02-25 10:58:56 +00:00
|
|
|
|
oDebugLogTid,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
oNoGreeting,
|
|
|
|
|
oNoOptions,
|
|
|
|
|
oHomedir,
|
|
|
|
|
oNoDetach,
|
|
|
|
|
oNoGrab,
|
|
|
|
|
oLogFile,
|
|
|
|
|
oServer,
|
2005-05-18 10:48:06 +00:00
|
|
|
|
oMultiServer,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
oDaemon,
|
|
|
|
|
oBatch,
|
|
|
|
|
oReaderPort,
|
2008-12-05 12:01:01 +00:00
|
|
|
|
oCardTimeout,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
octapiDriver,
|
2003-08-19 09:36:48 +00:00
|
|
|
|
opcscDriver,
|
2003-09-02 19:06:34 +00:00
|
|
|
|
oDisableCCID,
|
2003-08-18 17:34:28 +00:00
|
|
|
|
oDisableOpenSC,
|
2005-11-28 11:52:25 +00:00
|
|
|
|
oDisableKeypad,
|
2003-12-01 10:54:09 +00:00
|
|
|
|
oAllowAdmin,
|
|
|
|
|
oDenyAdmin,
|
2004-08-05 09:24:36 +00:00
|
|
|
|
oDisableApplication,
|
2005-05-20 20:39:36 +00:00
|
|
|
|
oDebugDisableTicker
|
|
|
|
|
};
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ARGPARSE_OPTS opts[] = {
|
2008-12-05 12:01:01 +00:00
|
|
|
|
ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
|
|
|
|
|
ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2008-12-05 12:01:01 +00:00
|
|
|
|
ARGPARSE_group (301, N_("@Options:\n ")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oServer,"server", N_("run in server mode (foreground)")),
|
|
|
|
|
ARGPARSE_s_n (oMultiServer, "multi-server",
|
|
|
|
|
N_("run in multi server mode (foreground)")),
|
|
|
|
|
ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")),
|
|
|
|
|
ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
|
|
|
|
|
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
|
|
|
|
ARGPARSE_s_n (oSh, "sh", N_("sh-style command output")),
|
|
|
|
|
ARGPARSE_s_n (oCsh, "csh", N_("csh-style command output")),
|
|
|
|
|
ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
|
|
|
|
|
ARGPARSE_p_u (oDebug, "debug", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
|
|
|
|
|
ARGPARSE_s_s (oDebugLevel, "debug-level" ,
|
|
|
|
|
N_("|LEVEL|set the debugging level to LEVEL")),
|
|
|
|
|
ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugCCIDDriver, "debug-ccid-driver", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugDisableTicker, "debug-disable-ticker", "@"),
|
2009-02-25 10:58:56 +00:00
|
|
|
|
ARGPARSE_s_n (oDebugLogTid, "debug-log-tid", "@"),
|
2008-12-05 12:01:01 +00:00
|
|
|
|
ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
|
|
|
|
|
ARGPARSE_s_s (oLogFile, "log-file", N_("|FILE|write a log to FILE")),
|
|
|
|
|
ARGPARSE_s_s (oReaderPort, "reader-port",
|
|
|
|
|
N_("|N|connect to reader at port N")),
|
|
|
|
|
ARGPARSE_s_s (octapiDriver, "ctapi-driver",
|
|
|
|
|
N_("|NAME|use NAME as ct-API driver")),
|
|
|
|
|
ARGPARSE_s_s (opcscDriver, "pcsc-driver",
|
|
|
|
|
N_("|NAME|use NAME as PC/SC driver")),
|
|
|
|
|
ARGPARSE_s_n (oDisableCCID, "disable-ccid",
|
2003-09-02 19:06:34 +00:00
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
N_("do not use the internal CCID driver")
|
|
|
|
|
#else
|
|
|
|
|
"@"
|
|
|
|
|
#endif
|
2008-12-05 12:01:01 +00:00
|
|
|
|
/* end --disable-ccid */),
|
|
|
|
|
ARGPARSE_s_u (oCardTimeout, "card-timeout",
|
|
|
|
|
N_("|N|disconnect the card after N seconds of inactivity")),
|
|
|
|
|
ARGPARSE_s_n (oDisableKeypad, "disable-keypad",
|
|
|
|
|
N_("do not use a reader's keypad")),
|
2009-01-28 14:18:40 +00:00
|
|
|
|
ARGPARSE_s_n (oAllowAdmin, "allow-admin", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDenyAdmin, "deny-admin",
|
|
|
|
|
N_("deny the use of admin card commands")),
|
2008-12-05 12:01:01 +00:00
|
|
|
|
ARGPARSE_s_s (oDisableApplication, "disable-application", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_end ()
|
2003-08-05 17:11:04 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2007-02-18 13:48:03 +00:00
|
|
|
|
/* The card driver we use by default for PC/SC. */
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#define DEFAULT_PCSC_DRIVER "winscard.dll"
|
2007-02-18 13:48:03 +00:00
|
|
|
|
#elif defined(__APPLE__)
|
|
|
|
|
#define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
|
2006-04-11 13:53:21 +00:00
|
|
|
|
#elif defined(__GLIBC__)
|
|
|
|
|
#define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#else
|
2004-03-16 18:59:21 +00:00
|
|
|
|
#define DEFAULT_PCSC_DRIVER "libpcsclite.so"
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif
|
2004-03-16 18:59:21 +00:00
|
|
|
|
|
2008-12-08 19:10:42 +00:00
|
|
|
|
/* The timer tick used for housekeeping stuff. We poll every 500ms to
|
2008-10-14 18:18:21 +00:00
|
|
|
|
let the user immediately know a status change.
|
|
|
|
|
|
|
|
|
|
This is not too good for power saving but given that there is no
|
|
|
|
|
easy way to block on card status changes it is the best we can do.
|
|
|
|
|
For PC/SC we could in theory use an extra thread to wait for status
|
|
|
|
|
changes but that requires a native thread because there is no way
|
|
|
|
|
to make the underlying PC/SC card change function block using a Pth
|
|
|
|
|
mechanism. Given that a native thread could only be used under W32
|
|
|
|
|
we don't do that at all. */
|
|
|
|
|
#define TIMERTICK_INTERVAL_SEC (0)
|
2008-12-08 19:10:42 +00:00
|
|
|
|
#define TIMERTICK_INTERVAL_USEC (500000)
|
2004-03-16 18:59:21 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Flag to indicate that a shutdown was requested. */
|
|
|
|
|
static int shutdown_pending;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* It is possible that we are currently running under setuid permissions */
|
|
|
|
|
static int maybe_setuid = 1;
|
|
|
|
|
|
2008-10-15 13:23:10 +00:00
|
|
|
|
/* Flag telling whether we are running as a pipe server. */
|
|
|
|
|
static int pipe_server;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Name of the communication socket */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
static char *socket_name;
|
|
|
|
|
|
2007-10-01 14:48:39 +00:00
|
|
|
|
/* We need to keep track of the server's nonces (these are dummies for
|
|
|
|
|
POSIX systems). */
|
|
|
|
|
static assuan_sock_nonce_t socket_nonce;
|
2005-05-20 20:39:36 +00:00
|
|
|
|
|
|
|
|
|
/* Debug flag to disable the ticker. The ticker is in fact not
|
|
|
|
|
disabled but it won't perform any ticker specific actions. */
|
|
|
|
|
static int ticker_disabled;
|
|
|
|
|
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
static char *create_socket_name (int use_standard_socket,
|
|
|
|
|
char *standard_name, char *template);
|
2007-10-01 14:48:39 +00:00
|
|
|
|
static gnupg_fd_t create_server_socket (int is_standard_name, const char *name,
|
|
|
|
|
assuan_sock_nonce_t *nonce);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
static void *start_connection_thread (void *arg);
|
|
|
|
|
static void handle_connections (int listen_fd);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
/* Pth wrapper function definitions. */
|
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.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
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-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
|
ASSUAN_SYSTEM_PTH_IMPL;
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
GCRY_THREAD_OPTION_PTH_IMPL;
|
2007-07-04 19:49:40 +00:00
|
|
|
|
static int fixed_gcry_pth_init (void)
|
|
|
|
|
{
|
|
|
|
|
return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2008-11-18 18:01:03 +00:00
|
|
|
|
static char *
|
|
|
|
|
make_libversion (const char *libname, const char *(*getfnc)(const char*))
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
|
|
if (maybe_setuid)
|
|
|
|
|
{
|
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
|
|
|
|
|
maybe_setuid = 0;
|
|
|
|
|
}
|
|
|
|
|
s = getfnc (NULL);
|
|
|
|
|
result = xmalloc (strlen (libname) + 1 + strlen (s) + 1);
|
|
|
|
|
strcpy (stpcpy (stpcpy (result, libname), " "), s);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static const char *
|
|
|
|
|
my_strusage (int level)
|
|
|
|
|
{
|
2008-11-18 18:01:03 +00:00
|
|
|
|
static char *ver_gcry, *ver_ksba;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
const char *p;
|
2008-11-18 18:01:03 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
switch (level)
|
|
|
|
|
{
|
|
|
|
|
case 11: p = "scdaemon (GnuPG)";
|
|
|
|
|
break;
|
|
|
|
|
case 13: p = VERSION; break;
|
|
|
|
|
case 17: p = PRINTABLE_OS_NAME; break;
|
2009-07-21 14:21:05 +00:00
|
|
|
|
case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
|
|
|
|
|
|
2008-11-18 18:01:03 +00:00
|
|
|
|
case 20:
|
|
|
|
|
if (!ver_gcry)
|
|
|
|
|
ver_gcry = make_libversion ("libgcrypt", gcry_check_version);
|
|
|
|
|
p = ver_gcry;
|
|
|
|
|
break;
|
|
|
|
|
case 21:
|
|
|
|
|
if (!ver_ksba)
|
|
|
|
|
ver_ksba = make_libversion ("libksba", ksba_check_version);
|
|
|
|
|
p = ver_ksba;
|
|
|
|
|
break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 1:
|
|
|
|
|
case 40: p = _("Usage: scdaemon [options] (-h for help)");
|
|
|
|
|
break;
|
|
|
|
|
case 41: p = _("Syntax: scdaemon [options] [command [args]]\n"
|
|
|
|
|
"Smartcard daemon for GnuPG\n");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default: p = NULL;
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
static unsigned long
|
|
|
|
|
tid_log_callback (void)
|
|
|
|
|
{
|
|
|
|
|
#ifdef PTH_HAVE_PTH_THREAD_ID
|
|
|
|
|
return pth_thread_id ();
|
|
|
|
|
#else
|
|
|
|
|
return (unsigned long)pth_self ();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-02-18 17:00:11 +00:00
|
|
|
|
/* Setup the debugging. With a LEVEL of NULL only the active debug
|
|
|
|
|
flags are propagated to the subsystems. With LEVEL set, a specific
|
|
|
|
|
set of debug flags is set; thus overriding all flags already
|
|
|
|
|
set. */
|
|
|
|
|
static void
|
|
|
|
|
set_debug (const char *level)
|
|
|
|
|
{
|
2009-12-03 19:13:19 +00:00
|
|
|
|
int numok = (level && digitp (level));
|
|
|
|
|
int numlvl = numok? atoi (level) : 0;
|
|
|
|
|
|
2004-02-18 17:00:11 +00:00
|
|
|
|
if (!level)
|
|
|
|
|
;
|
2009-12-03 19:13:19 +00:00
|
|
|
|
else if (!strcmp (level, "none") || (numok && numlvl < 1))
|
2004-02-18 17:00:11 +00:00
|
|
|
|
opt.debug = 0;
|
2009-12-03 19:13:19 +00:00
|
|
|
|
else if (!strcmp (level, "basic") || (numok && numlvl <= 2))
|
2004-02-18 17:00:11 +00:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE;
|
2009-12-03 19:13:19 +00:00
|
|
|
|
else if (!strcmp (level, "advanced") || (numok && numlvl <= 5))
|
2004-02-18 17:00:11 +00:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE;
|
2009-12-03 19:13:19 +00:00
|
|
|
|
else if (!strcmp (level, "expert") || (numok && numlvl <= 8))
|
2004-02-18 17:00:11 +00:00
|
|
|
|
opt.debug = (DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE
|
|
|
|
|
|DBG_CACHE_VALUE|DBG_CARD_IO_VALUE);
|
2009-12-03 19:13:19 +00:00
|
|
|
|
else if (!strcmp (level, "guru") || numok)
|
|
|
|
|
{
|
|
|
|
|
opt.debug = ~0;
|
|
|
|
|
/* Unless the "guru" string has been used we don't want to allow
|
|
|
|
|
hashing debugging. The rationale is that people tend to
|
|
|
|
|
select the highest debug value and would then clutter their
|
|
|
|
|
disk with debug files which may reveal confidential data. */
|
|
|
|
|
if (numok)
|
|
|
|
|
opt.debug &= ~(DBG_HASHING_VALUE);
|
|
|
|
|
}
|
2004-02-18 17:00:11 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_error (_("invalid debug-level `%s' given\n"), level);
|
|
|
|
|
scd_exit(2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (opt.debug && !opt.verbose)
|
|
|
|
|
opt.verbose = 1;
|
|
|
|
|
if (opt.debug && opt.quiet)
|
|
|
|
|
opt.quiet = 0;
|
|
|
|
|
|
|
|
|
|
if (opt.debug & DBG_MPI_VALUE)
|
|
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 2);
|
|
|
|
|
if (opt.debug & DBG_CRYPTO_VALUE )
|
|
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
|
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
2009-12-03 19:13:19 +00:00
|
|
|
|
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
log_info ("enabled debug flags:%s%s%s%s%s%s%s%s%s\n",
|
|
|
|
|
(opt.debug & DBG_COMMAND_VALUE)? " command":"",
|
|
|
|
|
(opt.debug & DBG_MPI_VALUE )? " mpi":"",
|
|
|
|
|
(opt.debug & DBG_CRYPTO_VALUE )? " crypto":"",
|
|
|
|
|
(opt.debug & DBG_MEMORY_VALUE )? " memory":"",
|
|
|
|
|
(opt.debug & DBG_CACHE_VALUE )? " cache":"",
|
|
|
|
|
(opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"",
|
|
|
|
|
(opt.debug & DBG_HASHING_VALUE)? " hashing":"",
|
|
|
|
|
(opt.debug & DBG_ASSUAN_VALUE )? " assuan":"",
|
|
|
|
|
(opt.debug & DBG_CARD_IO_VALUE)? " cardio":"");
|
2004-02-18 17:00:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static void
|
|
|
|
|
cleanup (void)
|
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (socket_name && *socket_name)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
remove (socket_name);
|
|
|
|
|
p = strrchr (socket_name, '/');
|
|
|
|
|
if (p)
|
|
|
|
|
{
|
|
|
|
|
*p = 0;
|
|
|
|
|
rmdir (socket_name);
|
|
|
|
|
*p = '/';
|
|
|
|
|
}
|
|
|
|
|
*socket_name = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main (int argc, char **argv )
|
|
|
|
|
{
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
int orig_argc;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
gpg_error_t err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int may_coredump;
|
|
|
|
|
char **orig_argv;
|
|
|
|
|
FILE *configfp = NULL;
|
|
|
|
|
char *configname = NULL;
|
|
|
|
|
const char *shell;
|
2007-07-04 09:34:28 +00:00
|
|
|
|
unsigned int configlineno;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int parse_debug = 0;
|
2004-02-18 17:00:11 +00:00
|
|
|
|
const char *debug_level = NULL;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int default_config =1;
|
|
|
|
|
int greeting = 0;
|
|
|
|
|
int nogreeting = 0;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
int multi_server = 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int is_daemon = 0;
|
|
|
|
|
int nodetach = 0;
|
|
|
|
|
int csh_style = 0;
|
|
|
|
|
char *logfile = NULL;
|
|
|
|
|
int debug_wait = 0;
|
2004-02-18 17:00:11 +00:00
|
|
|
|
int gpgconf_list = 0;
|
2004-03-16 18:59:21 +00:00
|
|
|
|
const char *config_filename = NULL;
|
2005-06-07 19:09:18 +00:00
|
|
|
|
int allow_coredump = 0;
|
2007-09-14 17:23:34 +00:00
|
|
|
|
int standard_socket = 0;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
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-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
|
struct assuan_malloc_hooks malloc_hooks;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
set_strusage (my_strusage);
|
|
|
|
|
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
|
|
|
|
/* Please note that we may running SUID(ROOT), so be very CAREFUL
|
|
|
|
|
when adding any stuff between here and the call to INIT_SECMEM()
|
|
|
|
|
somewhere after the option parsing */
|
|
|
|
|
log_set_prefix ("scdaemon", 1|4);
|
2007-06-14 17:05:07 +00:00
|
|
|
|
|
|
|
|
|
/* Make sure that our subsystems are ready. */
|
2008-12-09 08:58:02 +00:00
|
|
|
|
i18n_init ();
|
2007-06-14 17:05:07 +00:00
|
|
|
|
init_common_subsystems ();
|
2004-02-18 17:00:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Libgcrypt requires us to register the threading model first.
|
|
|
|
|
Note that this will also do the pth_init. */
|
2007-07-04 19:49:40 +00:00
|
|
|
|
gcry_threads_pth.init = fixed_gcry_pth_init;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
|
|
|
|
|
gpg_strerror (err));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check that the libraries are suitable. Do it here because
|
2003-08-05 17:11:04 +00:00
|
|
|
|
the option parsing may need services of the library */
|
|
|
|
|
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
|
|
|
|
|
{
|
2007-04-20 16:59:37 +00:00
|
|
|
|
log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
|
2003-08-05 17:11:04 +00:00
|
|
|
|
NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
|
2003-12-16 16:30:55 +00:00
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
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-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
|
malloc_hooks.malloc = gcry_malloc;
|
|
|
|
|
malloc_hooks.realloc = gcry_realloc;
|
|
|
|
|
malloc_hooks.free = gcry_free;
|
|
|
|
|
assuan_set_malloc_hooks (&malloc_hooks);
|
2003-12-16 16:30:55 +00:00
|
|
|
|
assuan_set_assuan_log_prefix (log_get_prefix (NULL));
|
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.
Conflicts:
ChangeLog
agent/ChangeLog
agent/command.c
common/ChangeLog
g10/ChangeLog
scd/ChangeLog
sm/ChangeLog
sm/gpgsm.c
tools/ChangeLog
Somehow this slipped through. Really commit this time.
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-10-16 Marcus Brinkmann <marcus@g10code.com>
* configure.ac: Check for libassuan instead of libassuan-pth.
common/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* Makefile.am (libcommon_a_CFLAGS): Use LIBASSUAN_CFLAGS instead
of LIBASSUAN_PTH_CFLAGS.
scd/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth.
* scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
g13/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* AM_CFLAGS, g13_LDADD: Use libassuan instead of libassuan-pth.
* g13.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks.
agent/
2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
libassuan-pth.
* gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
(main): Call assuan_set_system_hooks and assuan_sock_init.
Fix invocation of assuan_socket_connect.
Conflicts:
ChangeLog
agent/ChangeLog
common/ChangeLog
configure.ac
g13/ChangeLog
g13/Makefile.am
g13/g13.c
scd/ChangeLog
agent/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Conflicts:
agent/ChangeLog
common/ChangeLog
g10/ChangeLog
g10/server.c
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Adjust for assuan_register_command change.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
Add hack for the HELP command.
Conflicts:
tools/ChangeLog
Add help strings for all commands.
Conflicts:
agent/ChangeLog
agent/command.c
Add help strings for all commands.
Conflicts:
scd/ChangeLog
Add help strings for all commands
Conflicts:
sm/ChangeLog
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/ChangeLog
g13/call-gpg.c
scd/ChangeLog
sm/ChangeLog
tools/ChangeLog
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
scd/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Use assuan_fd_t and
assuan_fdopen on fds.
sm/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on
fds.
g10/
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
Conflicts:
agent/ChangeLog
g10/ChangeLog
g13/server.c
scd/ChangeLog
sm/ChangeLog
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call
assuan_set_log_stream anymore.
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
Conflicts:
agent/ChangeLog
agent/command.c
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
argument in assuan_socket_connect invocation.
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
declaration.
Conflicts:
common/ChangeLog
common/iobuf.c
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
agent/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
* call-scd.c (start_scd): Likewise.
sm/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
tools/
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
Conflicts:
agent/ChangeLog
common/ChangeLog
g13/call-gpg.c
sm/ChangeLog
tools/ChangeLog
2010-02-12 15:15:34 +00:00
|
|
|
|
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
|
|
|
|
assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
|
|
|
|
|
assuan_sock_init ();
|
2006-09-06 16:35:52 +00:00
|
|
|
|
|
2007-04-20 16:59:37 +00:00
|
|
|
|
setup_libgcrypt_logging ();
|
2003-08-05 17:11:04 +00:00
|
|
|
|
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
|
|
|
|
|
|
|
|
|
|
may_coredump = disable_core_dumps ();
|
|
|
|
|
|
2003-08-19 09:36:48 +00:00
|
|
|
|
/* Set default options. */
|
2009-01-28 14:18:40 +00:00
|
|
|
|
opt.allow_admin = 1;
|
2004-03-16 18:59:21 +00:00
|
|
|
|
opt.pcsc_driver = DEFAULT_PCSC_DRIVER;
|
2003-08-19 09:36:48 +00:00
|
|
|
|
|
2007-09-14 17:23:34 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
standard_socket = 1; /* Under Windows we always use a standard
|
|
|
|
|
socket. */
|
|
|
|
|
#endif
|
|
|
|
|
|
2003-08-19 09:36:48 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
shell = getenv ("SHELL");
|
|
|
|
|
if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
|
|
|
|
|
csh_style = 1;
|
|
|
|
|
|
2004-12-21 10:03:00 +00:00
|
|
|
|
opt.homedir = default_homedir ();
|
|
|
|
|
|
|
|
|
|
/* Check whether we have a config file on the commandline */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
orig_argc = argc;
|
|
|
|
|
orig_argv = argv;
|
|
|
|
|
pargs.argc = &argc;
|
|
|
|
|
pargs.argv = &argv;
|
|
|
|
|
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
|
|
|
|
|
while (arg_parse( &pargs, opts))
|
|
|
|
|
{
|
|
|
|
|
if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
|
|
|
|
|
parse_debug++;
|
|
|
|
|
else if (pargs.r_opt == oOptions)
|
|
|
|
|
{ /* yes there is one, so we do not try the default one, but
|
|
|
|
|
read the option file when it is encountered at the
|
|
|
|
|
commandline */
|
|
|
|
|
default_config = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (pargs.r_opt == oNoOptions)
|
|
|
|
|
default_config = 0; /* --no-options */
|
|
|
|
|
else if (pargs.r_opt == oHomedir)
|
|
|
|
|
opt.homedir = pargs.r.ret_str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* initialize the secure memory. */
|
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
|
|
|
|
|
maybe_setuid = 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Now we are working under our real uid
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (default_config)
|
|
|
|
|
configname = make_filename (opt.homedir, "scdaemon.conf", NULL );
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
argc = orig_argc;
|
|
|
|
|
argv = orig_argv;
|
|
|
|
|
pargs.argc = &argc;
|
|
|
|
|
pargs.argv = &argv;
|
|
|
|
|
pargs.flags= 1; /* do not remove the args */
|
|
|
|
|
next_pass:
|
|
|
|
|
if (configname)
|
|
|
|
|
{
|
|
|
|
|
configlineno = 0;
|
|
|
|
|
configfp = fopen (configname, "r");
|
|
|
|
|
if (!configfp)
|
|
|
|
|
{
|
|
|
|
|
if (default_config)
|
|
|
|
|
{
|
|
|
|
|
if( parse_debug )
|
|
|
|
|
log_info (_("NOTE: no default option file `%s'\n"),
|
|
|
|
|
configname );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_error (_("option file `%s': %s\n"),
|
|
|
|
|
configname, strerror(errno) );
|
|
|
|
|
exit(2);
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (parse_debug && configname )
|
|
|
|
|
log_info (_("reading options from `%s'\n"), configname );
|
|
|
|
|
default_config = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
|
|
|
|
|
{
|
|
|
|
|
switch (pargs.r_opt)
|
|
|
|
|
{
|
2004-02-18 17:00:11 +00:00
|
|
|
|
case aGPGConfList: gpgconf_list = 1; break;
|
2006-10-23 14:02:13 +00:00
|
|
|
|
case aGPGConfTest: gpgconf_list = 2; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
|
case oVerbose: opt.verbose++; break;
|
|
|
|
|
case oBatch: opt.batch=1; break;
|
|
|
|
|
|
|
|
|
|
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
|
|
|
|
|
case oDebugAll: opt.debug = ~0; break;
|
2004-02-18 17:00:11 +00:00
|
|
|
|
case oDebugLevel: debug_level = pargs.r.ret_str; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case oDebugWait: debug_wait = pargs.r.ret_int; break;
|
2005-06-07 19:09:18 +00:00
|
|
|
|
case oDebugAllowCoreDump:
|
|
|
|
|
enable_core_dumps ();
|
|
|
|
|
allow_coredump = 1;
|
|
|
|
|
break;
|
2005-05-20 20:39:36 +00:00
|
|
|
|
case oDebugCCIDDriver:
|
2005-07-20 15:05:05 +00:00
|
|
|
|
#ifdef HAVE_LIBUSB
|
2005-05-20 20:39:36 +00:00
|
|
|
|
ccid_set_debug_level (ccid_set_debug_level (-1)+1);
|
2005-07-20 15:05:05 +00:00
|
|
|
|
#endif /*HAVE_LIBUSB*/
|
2005-05-20 20:39:36 +00:00
|
|
|
|
break;
|
|
|
|
|
case oDebugDisableTicker: ticker_disabled = 1; break;
|
2009-02-25 10:58:56 +00:00
|
|
|
|
case oDebugLogTid:
|
|
|
|
|
log_set_get_tid_callback (tid_log_callback);
|
|
|
|
|
break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
case oOptions:
|
|
|
|
|
/* config files may not be nested (silently ignore them) */
|
|
|
|
|
if (!configfp)
|
|
|
|
|
{
|
|
|
|
|
xfree(configname);
|
|
|
|
|
configname = xstrdup(pargs.r.ret_str);
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case oNoGreeting: nogreeting = 1; break;
|
|
|
|
|
case oNoVerbose: opt.verbose = 0; break;
|
|
|
|
|
case oNoOptions: break; /* no-options */
|
|
|
|
|
case oHomedir: opt.homedir = pargs.r.ret_str; break;
|
|
|
|
|
case oNoDetach: nodetach = 1; break;
|
|
|
|
|
case oLogFile: logfile = pargs.r.ret_str; break;
|
|
|
|
|
case oCsh: csh_style = 1; break;
|
|
|
|
|
case oSh: csh_style = 0; break;
|
|
|
|
|
case oServer: pipe_server = 1; break;
|
2005-05-20 20:39:36 +00:00
|
|
|
|
case oMultiServer: pipe_server = 1; multi_server = 1; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case oDaemon: is_daemon = 1; break;
|
|
|
|
|
|
2004-01-27 16:40:42 +00:00
|
|
|
|
case oReaderPort: opt.reader_port = pargs.r.ret_str; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
|
2003-08-19 09:36:48 +00:00
|
|
|
|
case opcscDriver: opt.pcsc_driver = pargs.r.ret_str; break;
|
2003-09-02 19:06:34 +00:00
|
|
|
|
case oDisableCCID: opt.disable_ccid = 1; break;
|
2005-04-27 12:09:21 +00:00
|
|
|
|
case oDisableOpenSC: break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
case oDisableKeypad: opt.disable_keypad = 1; break;
|
|
|
|
|
|
2009-01-28 14:18:40 +00:00
|
|
|
|
case oAllowAdmin: /* Dummy because allow is now the default. */
|
|
|
|
|
break;
|
2003-12-01 10:54:09 +00:00
|
|
|
|
case oDenyAdmin: opt.allow_admin = 0; break;
|
2008-12-05 12:01:01 +00:00
|
|
|
|
|
|
|
|
|
case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break;
|
2003-12-01 10:54:09 +00:00
|
|
|
|
|
2004-08-05 09:24:36 +00:00
|
|
|
|
case oDisableApplication:
|
|
|
|
|
add_to_strlist (&opt.disabled_applications, pargs.r.ret_str);
|
|
|
|
|
break;
|
|
|
|
|
|
2008-12-05 12:01:01 +00:00
|
|
|
|
default:
|
|
|
|
|
pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
|
|
|
|
|
break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (configfp)
|
|
|
|
|
{
|
|
|
|
|
fclose( configfp );
|
|
|
|
|
configfp = NULL;
|
2004-03-16 18:59:21 +00:00
|
|
|
|
/* Keep a copy of the config name for use by --gpgconf-list. */
|
|
|
|
|
config_filename = configname;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
configname = NULL;
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
if (log_get_errorcount(0))
|
|
|
|
|
exit(2);
|
|
|
|
|
if (nogreeting )
|
|
|
|
|
greeting = 0;
|
|
|
|
|
|
|
|
|
|
if (greeting)
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "%s %s; %s\n",
|
|
|
|
|
strusage(11), strusage(13), strusage(14) );
|
|
|
|
|
fprintf (stderr, "%s\n", strusage(15) );
|
|
|
|
|
}
|
|
|
|
|
#ifdef IS_DEVELOPMENT_VERSION
|
|
|
|
|
log_info ("NOTE: this is a development version!\n");
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-02-18 17:00:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (atexit (cleanup))
|
|
|
|
|
{
|
|
|
|
|
log_error ("atexit failed\n");
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-18 17:00:11 +00:00
|
|
|
|
set_debug (debug_level);
|
|
|
|
|
|
2007-06-14 17:05:07 +00:00
|
|
|
|
initialize_module_command ();
|
|
|
|
|
|
2006-10-23 14:02:13 +00:00
|
|
|
|
if (gpgconf_list == 2)
|
|
|
|
|
scd_exit (0);
|
2004-02-18 17:00:11 +00:00
|
|
|
|
if (gpgconf_list)
|
2004-04-26 13:07:08 +00:00
|
|
|
|
{
|
|
|
|
|
/* List options and default values in the GPG Conf format. */
|
2007-06-18 20:15:01 +00:00
|
|
|
|
char *filename = NULL;
|
|
|
|
|
char *filename_esc;
|
2004-03-16 18:59:21 +00:00
|
|
|
|
|
2008-02-09 00:13:43 +00:00
|
|
|
|
if (config_filename)
|
|
|
|
|
filename = xstrdup (config_filename);
|
|
|
|
|
else
|
|
|
|
|
filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
|
2007-06-19 09:11:11 +00:00
|
|
|
|
filename_esc = percent_escape (filename, NULL);
|
2004-03-16 18:59:21 +00:00
|
|
|
|
|
2004-03-17 13:01:16 +00:00
|
|
|
|
printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",
|
2007-06-18 20:15:01 +00:00
|
|
|
|
GC_OPT_FLAG_DEFAULT, filename_esc);
|
|
|
|
|
xfree (filename_esc);
|
|
|
|
|
xfree (filename);
|
|
|
|
|
|
2004-03-16 18:59:21 +00:00
|
|
|
|
printf ("verbose:%lu:\n"
|
|
|
|
|
"quiet:%lu:\n"
|
2004-03-17 13:01:16 +00:00
|
|
|
|
"debug-level:%lu:\"none:\n"
|
2004-03-16 18:59:21 +00:00
|
|
|
|
"log-file:%lu:\n",
|
|
|
|
|
GC_OPT_FLAG_NONE,
|
|
|
|
|
GC_OPT_FLAG_NONE,
|
|
|
|
|
GC_OPT_FLAG_DEFAULT,
|
|
|
|
|
GC_OPT_FLAG_NONE );
|
|
|
|
|
|
|
|
|
|
printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE );
|
|
|
|
|
printf ("ctapi-driver:%lu:\n", GC_OPT_FLAG_NONE );
|
2004-03-23 12:33:20 +00:00
|
|
|
|
printf ("pcsc-driver:%lu:\"%s:\n",
|
2004-03-16 18:59:21 +00:00
|
|
|
|
GC_OPT_FLAG_DEFAULT, DEFAULT_PCSC_DRIVER );
|
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
printf ("disable-ccid:%lu:\n", GC_OPT_FLAG_NONE );
|
|
|
|
|
#endif
|
2009-01-28 14:18:40 +00:00
|
|
|
|
printf ("deny-admin:%lu:\n", GC_OPT_FLAG_NONE );
|
2006-11-20 16:49:41 +00:00
|
|
|
|
printf ("disable-keypad:%lu:\n", GC_OPT_FLAG_NONE );
|
2008-12-05 12:01:01 +00:00
|
|
|
|
printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0);
|
2004-02-18 17:00:11 +00:00
|
|
|
|
|
|
|
|
|
scd_exit (0);
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
/* Now start with logging to a file if this is desired. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (logfile)
|
|
|
|
|
{
|
|
|
|
|
log_set_file (logfile);
|
|
|
|
|
log_set_prefix (NULL, 1|2|4);
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
if (debug_wait && pipe_server)
|
|
|
|
|
{
|
|
|
|
|
log_debug ("waiting for debugger - my pid is %u .....\n",
|
|
|
|
|
(unsigned int)getpid());
|
|
|
|
|
gnupg_sleep (debug_wait);
|
|
|
|
|
log_debug ("... okay\n");
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (pipe_server)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
/* This is the simple pipe based server */
|
2006-11-20 16:49:41 +00:00
|
|
|
|
ctrl_t ctrl;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
pth_attr_t tattr;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
int fd = -1;
|
|
|
|
|
|
2007-06-14 17:05:07 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
struct sigaction sa;
|
|
|
|
|
|
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
|
|
|
sigemptyset (&sa.sa_mask);
|
|
|
|
|
sa.sa_flags = 0;
|
|
|
|
|
sigaction (SIGPIPE, &sa, NULL);
|
|
|
|
|
}
|
2007-06-14 17:05:07 +00:00
|
|
|
|
#endif
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2005-06-07 19:09:18 +00:00
|
|
|
|
/* If --debug-allow-core-dump has been given we also need to
|
|
|
|
|
switch the working directory to a place where we can actually
|
|
|
|
|
write. */
|
|
|
|
|
if (allow_coredump)
|
|
|
|
|
{
|
|
|
|
|
if (chdir("/tmp"))
|
|
|
|
|
log_debug ("chdir to `/tmp' failed: %s\n", strerror (errno));
|
|
|
|
|
else
|
|
|
|
|
log_debug ("changed working directory to `/tmp'\n");
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* In multi server mode we need to listen on an additional
|
|
|
|
|
socket. Create that socket now before starting the handler
|
|
|
|
|
for the pipe connection. This allows that handler to send
|
|
|
|
|
back the name of that socket. */
|
|
|
|
|
if (multi_server)
|
|
|
|
|
{
|
2007-09-14 17:23:34 +00:00
|
|
|
|
socket_name = create_socket_name (standard_socket,
|
2005-05-18 10:48:06 +00:00
|
|
|
|
"S.scdaemon",
|
|
|
|
|
"/tmp/gpg-XXXXXX/S.scdaemon");
|
|
|
|
|
|
2007-11-19 16:03:50 +00:00
|
|
|
|
fd = FD2INT(create_server_socket (standard_socket,
|
|
|
|
|
socket_name, &socket_nonce));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
tattr = pth_attr_new();
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
|
2004-07-22 09:37:36 +00:00
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 512*1024);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, "pipe-connection");
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
ctrl = xtrycalloc (1, sizeof *ctrl);
|
|
|
|
|
if ( !ctrl )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating connection control data: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
2007-10-01 14:48:39 +00:00
|
|
|
|
ctrl->thread_startup.fd = GNUPG_INVALID_FD;
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if ( !pth_spawn (tattr, start_connection_thread, ctrl) )
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
log_error ("error spawning pipe connection handler: %s\n",
|
|
|
|
|
strerror (errno) );
|
2006-11-20 16:49:41 +00:00
|
|
|
|
xfree (ctrl);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2007-11-19 16:03:50 +00:00
|
|
|
|
/* We run handle_connection to wait for the shutdown signal and
|
|
|
|
|
to run the ticker stuff. */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
handle_connections (fd);
|
|
|
|
|
if (fd != -1)
|
|
|
|
|
close (fd);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
else if (!is_daemon)
|
|
|
|
|
{
|
|
|
|
|
log_info (_("please use the option `--daemon'"
|
|
|
|
|
" to run the program in the background\n"));
|
|
|
|
|
}
|
|
|
|
|
else
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{ /* Regular server mode */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int fd;
|
2007-10-01 14:48:39 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pid_t pid;
|
|
|
|
|
int i;
|
2007-10-01 14:48:39 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Create the socket. */
|
2007-09-14 17:23:34 +00:00
|
|
|
|
socket_name = create_socket_name (standard_socket,
|
2005-05-18 10:48:06 +00:00
|
|
|
|
"S.scdaemon",
|
|
|
|
|
"/tmp/gpg-XXXXXX/S.scdaemon");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2007-11-19 16:03:50 +00:00
|
|
|
|
fd = FD2INT (create_server_socket (standard_socket,
|
|
|
|
|
socket_name, &socket_nonce));
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fflush (NULL);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pid = fork ();
|
|
|
|
|
if (pid == (pid_t)-1)
|
|
|
|
|
{
|
|
|
|
|
log_fatal ("fork failed: %s\n", strerror (errno) );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
else if (pid)
|
|
|
|
|
{ /* we are the parent */
|
|
|
|
|
char *infostr;
|
|
|
|
|
|
|
|
|
|
close (fd);
|
|
|
|
|
|
|
|
|
|
/* create the info string: <name>:<pid>:<protocol_version> */
|
2008-08-31 11:55:09 +00:00
|
|
|
|
if (estream_asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1",
|
|
|
|
|
socket_name, (ulong) pid) < 0)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("out of core\n");
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
*socket_name = 0; /* don't let cleanup() remove the socket -
|
|
|
|
|
the child should do this from now on */
|
|
|
|
|
if (argc)
|
|
|
|
|
{ /* run the program given on the commandline */
|
|
|
|
|
if (putenv (infostr))
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to set environment: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
kill (pid, SIGTERM );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
execvp (argv[0], argv);
|
|
|
|
|
log_error ("failed to run the command: %s\n", strerror (errno));
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Print the environment string, so that the caller can use
|
2003-08-05 17:11:04 +00:00
|
|
|
|
shell's eval to set it */
|
|
|
|
|
if (csh_style)
|
|
|
|
|
{
|
|
|
|
|
*strchr (infostr, '=') = ' ';
|
|
|
|
|
printf ( "setenv %s\n", infostr);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf ( "%s; export SCDAEMON_INFO;\n", infostr);
|
|
|
|
|
}
|
2008-08-31 11:55:09 +00:00
|
|
|
|
xfree (infostr);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
exit (0);
|
|
|
|
|
}
|
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
} /* end parent */
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* This is the child. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Detach from tty and put process into a new session. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!nodetach )
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
/* Close stdin, stdout and stderr unless it is the log stream. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
for (i=0; i <= 2; i++)
|
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if ( log_test_fd (i) && i != fd)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
close (i);
|
|
|
|
|
}
|
|
|
|
|
if (setsid() == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("setsid() failed: %s\n", strerror(errno) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
struct sigaction sa;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
|
|
|
sigemptyset (&sa.sa_mask);
|
|
|
|
|
sa.sa_flags = 0;
|
|
|
|
|
sigaction (SIGPIPE, &sa, NULL);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (chdir("/"))
|
|
|
|
|
{
|
|
|
|
|
log_error ("chdir to / failed: %s\n", strerror (errno));
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
handle_connections (fd);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
close (fd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
scd_exit (int rc)
|
|
|
|
|
{
|
2009-07-16 15:54:59 +00:00
|
|
|
|
apdu_prepare_exit ();
|
2004-02-18 17:00:11 +00:00
|
|
|
|
#if 0
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#warning no update_random_seed_file
|
|
|
|
|
update_random_seed_file();
|
2004-02-18 17:00:11 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#if 0
|
|
|
|
|
/* at this time a bit annoying */
|
|
|
|
|
if (opt.debug & DBG_MEMSTAT_VALUE)
|
|
|
|
|
{
|
|
|
|
|
gcry_control( GCRYCTL_DUMP_MEMORY_STATS );
|
|
|
|
|
gcry_control( GCRYCTL_DUMP_RANDOM_STATS );
|
|
|
|
|
}
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
gcry_control (GCRYCTL_DUMP_SECMEM_STATS );
|
|
|
|
|
#endif
|
|
|
|
|
gcry_control (GCRYCTL_TERM_SECMEM );
|
|
|
|
|
rc = rc? rc : log_get_errorcount(0)? 2 : 0;
|
|
|
|
|
exit (rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
static void
|
2005-05-18 10:48:06 +00:00
|
|
|
|
scd_init_default_ctrl (ctrl_t ctrl)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-04-20 14:17:10 +00:00
|
|
|
|
ctrl->reader_slot = -1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
static void
|
|
|
|
|
scd_deinit_default_ctrl (ctrl_t ctrl)
|
|
|
|
|
{
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)ctrl;
|
2006-11-20 16:49:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* Return the name of the socket to be used to connect to this
|
|
|
|
|
process. If no socket is available, return NULL. */
|
|
|
|
|
const char *
|
|
|
|
|
scd_get_socket_name ()
|
|
|
|
|
{
|
|
|
|
|
if (socket_name && *socket_name)
|
|
|
|
|
return socket_name;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
handle_signal (int signo)
|
|
|
|
|
{
|
|
|
|
|
switch (signo)
|
|
|
|
|
{
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2004-04-20 14:17:10 +00:00
|
|
|
|
case SIGHUP:
|
|
|
|
|
log_info ("SIGHUP received - "
|
|
|
|
|
"re-reading configuration and resetting cards\n");
|
|
|
|
|
/* reread_configuration (); */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGUSR1:
|
2005-05-21 18:49:00 +00:00
|
|
|
|
log_info ("SIGUSR1 received - printing internal information:\n");
|
|
|
|
|
pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ());
|
2005-06-03 13:57:24 +00:00
|
|
|
|
app_dump_state ();
|
2004-04-20 14:17:10 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGUSR2:
|
2004-04-21 14:44:09 +00:00
|
|
|
|
log_info ("SIGUSR2 received - no action defined\n");
|
2004-04-20 14:17:10 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGTERM:
|
|
|
|
|
if (!shutdown_pending)
|
|
|
|
|
log_info ("SIGTERM received - shutting down ...\n");
|
|
|
|
|
else
|
|
|
|
|
log_info ("SIGTERM received - still %ld running threads\n",
|
|
|
|
|
pth_ctrl( PTH_CTRL_GETTHREADS ));
|
|
|
|
|
shutdown_pending++;
|
|
|
|
|
if (shutdown_pending > 2)
|
|
|
|
|
{
|
|
|
|
|
log_info ("shutdown forced\n");
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
scd_exit (0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGINT:
|
|
|
|
|
log_info ("SIGINT received - immediate shutdown\n");
|
|
|
|
|
log_info( "%s %s stopped\n", strusage(11), strusage(13));
|
|
|
|
|
cleanup ();
|
|
|
|
|
scd_exit (0);
|
|
|
|
|
break;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
default:
|
|
|
|
|
log_info ("signal %d received - no action defined\n", signo);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static void
|
|
|
|
|
handle_tick (void)
|
|
|
|
|
{
|
2005-05-20 20:39:36 +00:00
|
|
|
|
if (!ticker_disabled)
|
|
|
|
|
scd_update_reader_status_file ();
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
/* Create a name for the socket. With USE_STANDARD_SOCKET given as
|
|
|
|
|
true using STANDARD_NAME in the home directory or if given has
|
|
|
|
|
false from the mkdir type name TEMPLATE. In the latter case a
|
|
|
|
|
unique name in a unique new directory will be created. In both
|
|
|
|
|
cases check for valid characters as well as against a maximum
|
|
|
|
|
allowed length for a unix domain socket is done. The function
|
|
|
|
|
terminates the process in case of an error. Retunrs: Pointer to an
|
|
|
|
|
allcoated string with the absolute name of the socket used. */
|
|
|
|
|
static char *
|
|
|
|
|
create_socket_name (int use_standard_socket,
|
|
|
|
|
char *standard_name, char *template)
|
|
|
|
|
{
|
|
|
|
|
char *name, *p;
|
|
|
|
|
|
|
|
|
|
if (use_standard_socket)
|
|
|
|
|
name = make_filename (opt.homedir, standard_name, NULL);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
name = xstrdup (template);
|
|
|
|
|
p = strrchr (name, '/');
|
|
|
|
|
if (!p)
|
|
|
|
|
BUG ();
|
|
|
|
|
*p = 0;
|
|
|
|
|
if (!mkdtemp (name))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("can't create directory `%s': %s\n"),
|
|
|
|
|
name, strerror (errno));
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
*p = '/';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strchr (name, PATHSEP_C))
|
|
|
|
|
{
|
|
|
|
|
log_error (("`%s' are not allowed in the socket name\n"), PATHSEP_S);
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
if (strlen (name) + 1 >= DIMof (struct sockaddr_un, sun_path) )
|
|
|
|
|
{
|
|
|
|
|
log_error (_("name of socket too long\n"));
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a Unix domain socket with NAME. IS_STANDARD_NAME indicates
|
|
|
|
|
whether a non-random socket is used. Returns the file descriptor
|
|
|
|
|
or terminates the process in case of an error. */
|
2007-10-01 14:48:39 +00:00
|
|
|
|
static gnupg_fd_t
|
|
|
|
|
create_server_socket (int is_standard_name, const char *name,
|
|
|
|
|
assuan_sock_nonce_t *nonce)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
struct sockaddr_un *serv_addr;
|
|
|
|
|
socklen_t len;
|
2007-10-01 14:48:39 +00:00
|
|
|
|
gnupg_fd_t fd;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
int rc;
|
|
|
|
|
|
2007-10-01 14:48:39 +00:00
|
|
|
|
fd = assuan_sock_new (AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
|
if (fd == GNUPG_INVALID_FD)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
log_error (_("can't create socket: %s\n"), strerror (errno));
|
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
serv_addr = xmalloc (sizeof (*serv_addr));
|
|
|
|
|
memset (serv_addr, 0, sizeof *serv_addr);
|
|
|
|
|
serv_addr->sun_family = AF_UNIX;
|
|
|
|
|
assert (strlen (name) + 1 < sizeof (serv_addr->sun_path));
|
|
|
|
|
strcpy (serv_addr->sun_path, name);
|
2009-05-19 22:39:45 +00:00
|
|
|
|
len = SUN_LEN (serv_addr);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2007-10-01 14:48:39 +00:00
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (is_standard_name && rc == -1 && errno == EADDRINUSE)
|
|
|
|
|
{
|
|
|
|
|
remove (name);
|
2007-10-01 14:48:39 +00:00
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
2007-10-01 14:48:39 +00:00
|
|
|
|
if (rc != -1
|
|
|
|
|
&& (rc=assuan_sock_get_nonce ((struct sockaddr*)serv_addr, len, nonce)))
|
|
|
|
|
log_error (_("error getting nonce for the socket\n"));
|
|
|
|
|
if (rc == -1)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
|
|
|
|
log_error (_("error binding socket to `%s': %s\n"),
|
2007-11-19 16:03:50 +00:00
|
|
|
|
serv_addr->sun_path,
|
|
|
|
|
gpg_strerror (gpg_error_from_syserror ()));
|
2007-10-01 14:48:39 +00:00
|
|
|
|
assuan_sock_close (fd);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-01 14:48:39 +00:00
|
|
|
|
if (listen (FD2INT(fd), 5 ) == -1)
|
2005-05-18 10:48:06 +00:00
|
|
|
|
{
|
2007-11-19 16:03:50 +00:00
|
|
|
|
log_error (_("listen() failed: %s\n"),
|
|
|
|
|
gpg_strerror (gpg_error_from_syserror ()));
|
2007-10-01 14:48:39 +00:00
|
|
|
|
assuan_sock_close (fd);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
scd_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info (_("listening on socket `%s'\n"), serv_addr->sun_path);
|
|
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This is the standard connection thread's main function. */
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static void *
|
2005-05-18 10:48:06 +00:00
|
|
|
|
start_connection_thread (void *arg)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2006-11-20 16:49:41 +00:00
|
|
|
|
ctrl_t ctrl = arg;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2007-11-19 16:03:50 +00:00
|
|
|
|
if (ctrl->thread_startup.fd != GNUPG_INVALID_FD
|
|
|
|
|
&& assuan_sock_check_nonce (ctrl->thread_startup.fd, &socket_nonce))
|
2007-10-01 14:48:39 +00:00
|
|
|
|
{
|
|
|
|
|
log_info (_("error reading nonce on fd %d: %s\n"),
|
|
|
|
|
FD2INT(ctrl->thread_startup.fd), strerror (errno));
|
|
|
|
|
assuan_sock_close (ctrl->thread_startup.fd);
|
|
|
|
|
xfree (ctrl);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
scd_init_default_ctrl (ctrl);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (opt.verbose)
|
2007-10-01 14:48:39 +00:00
|
|
|
|
log_info (_("handler for fd %d started\n"),
|
|
|
|
|
FD2INT(ctrl->thread_startup.fd));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2008-10-15 13:23:10 +00:00
|
|
|
|
/* If this is a pipe server, we request a shutdown if the command
|
2009-02-19 16:19:16 +00:00
|
|
|
|
handler asked for it. With the next ticker event and given that
|
2008-10-15 13:23:10 +00:00
|
|
|
|
no other connections are running the shutdown will then
|
|
|
|
|
happen. */
|
|
|
|
|
if (scd_command_handler (ctrl, FD2INT(ctrl->thread_startup.fd))
|
|
|
|
|
&& pipe_server)
|
|
|
|
|
shutdown_pending = 1;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
2007-10-01 14:48:39 +00:00
|
|
|
|
log_info (_("handler for fd %d terminated\n"),
|
|
|
|
|
FD2INT (ctrl->thread_startup.fd));
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
scd_deinit_default_ctrl (ctrl);
|
|
|
|
|
xfree (ctrl);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Connection handler loop. Wait for connection requests and spawn a
|
|
|
|
|
thread after accepting a connection. LISTEN_FD is allowed to be -1
|
|
|
|
|
in which case this code will only do regular timeouts and handle
|
|
|
|
|
signals. */
|
|
|
|
|
static void
|
|
|
|
|
handle_connections (int listen_fd)
|
|
|
|
|
{
|
|
|
|
|
pth_attr_t tattr;
|
|
|
|
|
pth_event_t ev, time_ev;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
sigset_t sigs;
|
|
|
|
|
int signo;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
struct sockaddr_un paddr;
|
|
|
|
|
socklen_t plen;
|
|
|
|
|
fd_set fdset, read_fdset;
|
|
|
|
|
int ret;
|
|
|
|
|
int fd;
|
2007-07-04 09:34:28 +00:00
|
|
|
|
int nfd;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
tattr = pth_attr_new();
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 512*1024);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM /* fixme */
|
2004-04-20 14:17:10 +00:00
|
|
|
|
sigemptyset (&sigs );
|
|
|
|
|
sigaddset (&sigs, SIGHUP);
|
|
|
|
|
sigaddset (&sigs, SIGUSR1);
|
|
|
|
|
sigaddset (&sigs, SIGUSR2);
|
|
|
|
|
sigaddset (&sigs, SIGINT);
|
|
|
|
|
sigaddset (&sigs, SIGTERM);
|
2005-06-03 13:57:24 +00:00
|
|
|
|
pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#else
|
2007-07-04 09:34:28 +00:00
|
|
|
|
sigs = 0;
|
|
|
|
|
ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif
|
2005-05-18 10:48:06 +00:00
|
|
|
|
time_ev = NULL;
|
|
|
|
|
|
|
|
|
|
FD_ZERO (&fdset);
|
2007-07-04 09:34:28 +00:00
|
|
|
|
nfd = 0;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (listen_fd != -1)
|
2007-07-04 09:34:28 +00:00
|
|
|
|
{
|
|
|
|
|
FD_SET (listen_fd, &fdset);
|
|
|
|
|
nfd = listen_fd;
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
for (;;)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2005-06-03 13:57:24 +00:00
|
|
|
|
sigset_t oldsigs;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (shutdown_pending)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1)
|
|
|
|
|
break; /* ready */
|
|
|
|
|
|
|
|
|
|
/* Do not accept anymore connections but wait for existing
|
|
|
|
|
connections to terminate. We do this by clearing out all
|
|
|
|
|
file descriptors to wait for, so that the select will be
|
|
|
|
|
used to just wait on a signal or timeout event. */
|
|
|
|
|
FD_ZERO (&fdset);
|
2008-10-15 13:23:10 +00:00
|
|
|
|
listen_fd = -1;
|
2005-05-18 10:48:06 +00:00
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2008-12-08 19:10:42 +00:00
|
|
|
|
/* Create a timeout event if needed. Round it up to the next
|
|
|
|
|
microsecond interval to help with power saving. */
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (!time_ev)
|
2008-12-08 19:10:42 +00:00
|
|
|
|
{
|
|
|
|
|
pth_time_t nexttick = pth_timeout (TIMERTICK_INTERVAL_SEC,
|
|
|
|
|
TIMERTICK_INTERVAL_USEC/2);
|
|
|
|
|
if ((nexttick.tv_usec % (TIMERTICK_INTERVAL_USEC/2)) > 10)
|
|
|
|
|
{
|
|
|
|
|
nexttick.tv_usec = ((nexttick.tv_usec
|
|
|
|
|
/(TIMERTICK_INTERVAL_USEC/2))
|
|
|
|
|
+ 1) * (TIMERTICK_INTERVAL_USEC/2);
|
|
|
|
|
if (nexttick.tv_usec >= 1000000)
|
|
|
|
|
{
|
|
|
|
|
nexttick.tv_sec++;
|
|
|
|
|
nexttick.tv_usec = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
time_ev = pth_event (PTH_EVENT_TIME, nexttick);
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
/* POSIX says that fd_set should be implemented as a structure,
|
|
|
|
|
thus a simple assignment is fine to copy the entire set. */
|
|
|
|
|
read_fdset = fdset;
|
|
|
|
|
|
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_concat (ev, time_ev, NULL);
|
2007-07-04 09:34:28 +00:00
|
|
|
|
ret = pth_select_ev (nfd+1, &read_fdset, NULL, NULL, NULL, ev);
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_isolate (time_ev);
|
|
|
|
|
|
|
|
|
|
if (ret == -1)
|
|
|
|
|
{
|
|
|
|
|
if (pth_event_occurred (ev)
|
|
|
|
|
|| (time_ev && pth_event_occurred (time_ev)))
|
|
|
|
|
{
|
|
|
|
|
if (pth_event_occurred (ev))
|
|
|
|
|
handle_signal (signo);
|
|
|
|
|
if (time_ev && pth_event_occurred (time_ev))
|
|
|
|
|
{
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
|
|
|
|
time_ev = NULL;
|
|
|
|
|
handle_tick ();
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
log_error (_("pth_select failed: %s - waiting 1s\n"),
|
|
|
|
|
strerror (errno));
|
|
|
|
|
pth_sleep (1);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (pth_event_occurred (ev))
|
|
|
|
|
{
|
|
|
|
|
handle_signal (signo);
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (time_ev && pth_event_occurred (time_ev))
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
|
|
|
|
time_ev = NULL;
|
|
|
|
|
handle_tick ();
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
2005-06-03 13:57:24 +00:00
|
|
|
|
/* We now might create new threads and because we don't want any
|
|
|
|
|
signals - we are handling here - to be delivered to a new
|
|
|
|
|
thread. Thus we need to block those signals. */
|
|
|
|
|
pth_sigmask (SIG_BLOCK, &sigs, &oldsigs);
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
if (listen_fd != -1 && FD_ISSET (listen_fd, &read_fdset))
|
|
|
|
|
{
|
2006-11-20 16:49:41 +00:00
|
|
|
|
ctrl_t ctrl;
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
plen = sizeof paddr;
|
|
|
|
|
fd = pth_accept (listen_fd, (struct sockaddr *)&paddr, &plen);
|
|
|
|
|
if (fd == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("accept failed: %s\n", strerror (errno));
|
|
|
|
|
}
|
2006-11-20 16:49:41 +00:00
|
|
|
|
else if ( !(ctrl = xtrycalloc (1, sizeof *ctrl)) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating connection control data: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
close (fd);
|
|
|
|
|
}
|
2005-06-03 13:57:24 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char threadname[50];
|
2006-11-20 16:49:41 +00:00
|
|
|
|
|
2005-06-03 13:57:24 +00:00
|
|
|
|
snprintf (threadname, sizeof threadname-1, "conn fd=%d", fd);
|
|
|
|
|
threadname[sizeof threadname -1] = 0;
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, threadname);
|
2007-10-01 14:48:39 +00:00
|
|
|
|
ctrl->thread_startup.fd = INT2FD (fd);
|
2006-11-20 16:49:41 +00:00
|
|
|
|
if (!pth_spawn (tattr, start_connection_thread, ctrl))
|
2005-06-03 13:57:24 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("error spawning connection handler: %s\n",
|
|
|
|
|
strerror (errno) );
|
2006-11-20 16:49:41 +00:00
|
|
|
|
xfree (ctrl);
|
2005-06-03 13:57:24 +00:00
|
|
|
|
close (fd);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
fd = -1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-03 13:57:24 +00:00
|
|
|
|
/* Restore the signal mask. */
|
|
|
|
|
pth_sigmask (SIG_SETMASK, &oldsigs, NULL);
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
pth_event_free (ev, PTH_FREE_ALL);
|
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
|
|
|
|
cleanup ();
|
|
|
|
|
log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
2005-05-18 10:48:06 +00:00
|
|
|
|
|
|
|
|
|
|