2003-08-05 19:11:04 +02:00
|
|
|
|
/* gpg-agent.c - The GnuPG Agent
|
2010-04-14 13:24:02 +02:00
|
|
|
|
* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
|
|
|
|
|
* 2010 Free Software Foundation, Inc.
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 19:11:04 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include <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-06-20 13:35:13 +02:00
|
|
|
|
#include <sys/stat.h>
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2007-06-14 19:05:07 +02:00
|
|
|
|
# include <sys/socket.h>
|
|
|
|
|
# include <sys/un.h>
|
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include <unistd.h>
|
2010-04-14 13:24:02 +02:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
2005-05-18 12:48:06 +02:00
|
|
|
|
#include <pth.h>
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
#define JNLIB_NEED_LOG_LOGV
|
2009-05-20 00:39:45 +02:00
|
|
|
|
#define JNLIB_NEED_AFLOCAL
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include "agent.h"
|
2007-10-01 16:48:39 +02:00
|
|
|
|
#include <assuan.h> /* Malloc hooks and socket wrappers. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
#include "i18n.h"
|
2007-10-01 16:48:39 +02:00
|
|
|
|
#include "mkdtemp.h" /* Gnulib replacement. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#include "sysutils.h"
|
2007-08-02 20:12:43 +02:00
|
|
|
|
#include "gc-opt-flags.h"
|
2009-03-19 08:09:31 +01:00
|
|
|
|
#include "exechelp.h"
|
2010-03-11 13:34:11 +01:00
|
|
|
|
#include "asshelp.h"
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
enum cmd_and_opt_values
|
|
|
|
|
{ aNull = 0,
|
|
|
|
|
oCsh = 'c',
|
|
|
|
|
oQuiet = 'q',
|
|
|
|
|
oSh = 's',
|
|
|
|
|
oVerbose = 'v',
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oNoVerbose = 500,
|
2004-02-18 17:57:38 +01:00
|
|
|
|
aGPGConfList,
|
2006-10-23 16:02:13 +02:00
|
|
|
|
aGPGConfTest,
|
2010-05-03 17:23:10 +02:00
|
|
|
|
aUseStandardSocketP,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oOptions,
|
|
|
|
|
oDebug,
|
|
|
|
|
oDebugAll,
|
2004-02-18 17:57:38 +01:00
|
|
|
|
oDebugLevel,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oDebugWait,
|
|
|
|
|
oNoGreeting,
|
|
|
|
|
oNoOptions,
|
|
|
|
|
oHomedir,
|
|
|
|
|
oNoDetach,
|
|
|
|
|
oNoGrab,
|
|
|
|
|
oLogFile,
|
|
|
|
|
oServer,
|
|
|
|
|
oDaemon,
|
|
|
|
|
oBatch,
|
|
|
|
|
|
|
|
|
|
oPinentryProgram,
|
2007-02-14 17:27:55 +01:00
|
|
|
|
oPinentryTouchFile,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oDisplay,
|
|
|
|
|
oTTYname,
|
|
|
|
|
oTTYtype,
|
|
|
|
|
oLCctype,
|
|
|
|
|
oLCmessages,
|
2007-11-19 17:03:50 +01:00
|
|
|
|
oXauthority,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oScdaemonProgram,
|
2004-08-20 15:43:14 +02:00
|
|
|
|
oDefCacheTTL,
|
2005-06-07 21:09:18 +02:00
|
|
|
|
oDefCacheTTLSSH,
|
2004-08-20 15:43:14 +02:00
|
|
|
|
oMaxCacheTTL,
|
2005-06-16 10:12:03 +02:00
|
|
|
|
oMaxCacheTTLSSH,
|
2007-08-27 20:10:27 +02:00
|
|
|
|
oEnforcePassphraseConstraints,
|
2007-01-25 09:30:47 +01:00
|
|
|
|
oMinPassphraseLen,
|
2007-08-27 20:10:27 +02:00
|
|
|
|
oMinPassphraseNonalpha,
|
|
|
|
|
oCheckPassphrasePattern,
|
2007-08-28 19:48:13 +02:00
|
|
|
|
oMaxPassphraseDays,
|
|
|
|
|
oEnablePassphraseHistory,
|
2004-12-20 17:17:25 +01:00
|
|
|
|
oUseStandardSocket,
|
|
|
|
|
oNoUseStandardSocket,
|
2007-08-28 19:48:13 +02:00
|
|
|
|
oFakedSystemTime,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
oIgnoreCacheForSigning,
|
2004-05-03 15:37:38 +02:00
|
|
|
|
oAllowMarkTrusted,
|
2004-12-21 20:05:15 +01:00
|
|
|
|
oAllowPresetPassphrase,
|
2003-08-05 19:11:04 +02:00
|
|
|
|
oKeepTTY,
|
2005-01-26 23:20:21 +01:00
|
|
|
|
oKeepDISPLAY,
|
2005-04-20 21:19:24 +02:00
|
|
|
|
oSSHSupport,
|
2005-06-03 15:57:24 +02:00
|
|
|
|
oDisableScdaemon,
|
|
|
|
|
oWriteEnvFile
|
2004-12-20 17:17:25 +01:00
|
|
|
|
};
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ARGPARSE_OPTS opts[] = {
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
|
|
|
|
{ aGPGConfList, "gpgconf-list", 256, "@" },
|
2006-10-23 16:02:13 +02:00
|
|
|
|
{ aGPGConfTest, "gpgconf-test", 256, "@" },
|
2010-05-03 17:23:10 +02:00
|
|
|
|
{ aUseStandardSocketP, "use-standard-socket-p", 256, "@" },
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
{ 301, NULL, 0, N_("@Options:\n ") },
|
|
|
|
|
|
|
|
|
|
{ oServer, "server", 0, N_("run in server mode (foreground)") },
|
|
|
|
|
{ oDaemon, "daemon", 0, N_("run in daemon mode (background)") },
|
|
|
|
|
{ oVerbose, "verbose", 0, N_("verbose") },
|
|
|
|
|
{ oQuiet, "quiet", 0, N_("be somewhat more quiet") },
|
|
|
|
|
{ oSh, "sh", 0, N_("sh-style command output") },
|
|
|
|
|
{ oCsh, "csh", 0, N_("csh-style command output") },
|
2004-03-16 11:48:42 +01:00
|
|
|
|
{ oOptions, "options" , 2, N_("|FILE|read options from FILE")},
|
2004-02-18 17:57:38 +01:00
|
|
|
|
{ oDebug, "debug" ,4|16, "@"},
|
|
|
|
|
{ oDebugAll, "debug-all" ,0, "@"},
|
|
|
|
|
{ oDebugLevel, "debug-level" ,2, "@"},
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ oDebugWait,"debug-wait",1, "@"},
|
|
|
|
|
{ oNoDetach, "no-detach" ,0, N_("do not detach from the console")},
|
|
|
|
|
{ oNoGrab, "no-grab" ,0, N_("do not grab keyboard and mouse")},
|
|
|
|
|
{ oLogFile, "log-file" ,2, N_("use a log file for the server")},
|
2004-12-20 17:17:25 +01:00
|
|
|
|
{ oUseStandardSocket, "use-standard-socket", 0,
|
|
|
|
|
N_("use a standard location for the socket")},
|
|
|
|
|
{ oNoUseStandardSocket, "no-use-standard-socket", 0, "@"},
|
2004-05-03 15:37:38 +02:00
|
|
|
|
{ oPinentryProgram, "pinentry-program", 2 ,
|
|
|
|
|
N_("|PGM|use PGM as the PIN-Entry program") },
|
2007-02-14 17:27:55 +01:00
|
|
|
|
{ oPinentryTouchFile, "pinentry-touch-file", 2 , "@" },
|
2004-05-03 15:37:38 +02:00
|
|
|
|
{ oScdaemonProgram, "scdaemon-program", 2 ,
|
|
|
|
|
N_("|PGM|use PGM as the SCdaemon program") },
|
2005-04-20 21:19:24 +02:00
|
|
|
|
{ oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") },
|
2007-08-28 19:48:13 +02:00
|
|
|
|
{ oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2009-03-02 13:32:54 +01:00
|
|
|
|
{ oBatch, "batch", 0, "@" },
|
|
|
|
|
{ oHomedir, "homedir", 2, "@"},
|
|
|
|
|
|
2004-05-03 15:37:38 +02:00
|
|
|
|
{ oDisplay, "display", 2, "@" },
|
|
|
|
|
{ oTTYname, "ttyname", 2, "@" },
|
|
|
|
|
{ oTTYtype, "ttytype", 2, "@" },
|
|
|
|
|
{ oLCctype, "lc-ctype", 2, "@" },
|
|
|
|
|
{ oLCmessages, "lc-messages", 2, "@" },
|
2007-11-19 17:03:50 +01:00
|
|
|
|
{ oXauthority, "xauthority", 2, "@" },
|
|
|
|
|
{ oKeepTTY, "keep-tty", 0, N_("ignore requests to change the TTY")},
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{ oKeepDISPLAY, "keep-display",
|
|
|
|
|
0, N_("ignore requests to change the X display")},
|
2004-05-03 15:37:38 +02:00
|
|
|
|
|
|
|
|
|
{ oDefCacheTTL, "default-cache-ttl", 4,
|
|
|
|
|
N_("|N|expire cached PINs after N seconds")},
|
2005-06-07 21:09:18 +02:00
|
|
|
|
{ oDefCacheTTLSSH, "default-cache-ttl-ssh", 4, "@" },
|
2004-08-20 15:43:14 +02:00
|
|
|
|
{ oMaxCacheTTL, "max-cache-ttl", 4, "@" },
|
2005-06-16 10:12:03 +02:00
|
|
|
|
{ oMaxCacheTTLSSH, "max-cache-ttl-ssh", 4, "@" },
|
2007-08-27 20:10:27 +02:00
|
|
|
|
|
|
|
|
|
{ oEnforcePassphraseConstraints, "enforce-passphrase-constraints", 0, "@"},
|
2007-01-25 09:30:47 +01:00
|
|
|
|
{ oMinPassphraseLen, "min-passphrase-len", 4, "@" },
|
2007-08-27 20:10:27 +02:00
|
|
|
|
{ oMinPassphraseNonalpha, "min-passphrase-nonalpha", 4, "@" },
|
|
|
|
|
{ oCheckPassphrasePattern, "check-passphrase-pattern", 2, "@" },
|
2007-08-28 19:48:13 +02:00
|
|
|
|
{ oMaxPassphraseDays, "max-passphrase-days", 4, "@" },
|
|
|
|
|
{ oEnablePassphraseHistory, "enable-passphrase-history", 0, "@" },
|
2007-08-27 20:10:27 +02:00
|
|
|
|
|
2004-05-03 15:37:38 +02:00
|
|
|
|
{ oIgnoreCacheForSigning, "ignore-cache-for-signing", 0,
|
|
|
|
|
N_("do not use the PIN cache when signing")},
|
|
|
|
|
{ oAllowMarkTrusted, "allow-mark-trusted", 0,
|
|
|
|
|
N_("allow clients to mark keys as \"trusted\"")},
|
2004-12-21 20:05:15 +01:00
|
|
|
|
{ oAllowPresetPassphrase, "allow-preset-passphrase", 0,
|
|
|
|
|
N_("allow presetting passphrase")},
|
2005-02-23 22:06:32 +01:00
|
|
|
|
{ oSSHSupport, "enable-ssh-support", 0, N_("enable ssh-agent emulation") },
|
2005-08-16 11:15:09 +02:00
|
|
|
|
{ oWriteEnvFile, "write-env-file", 2|8,
|
2005-06-03 15:57:24 +02:00
|
|
|
|
N_("|FILE|write environment settings also to FILE")},
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-06-16 10:12:03 +02:00
|
|
|
|
#define DEFAULT_CACHE_TTL (10*60) /* 10 minutes */
|
|
|
|
|
#define DEFAULT_CACHE_TTL_SSH (30*60) /* 30 minutes */
|
|
|
|
|
#define MAX_CACHE_TTL (120*60) /* 2 hours */
|
2007-03-06 21:44:41 +01:00
|
|
|
|
#define MAX_CACHE_TTL_SSH (120*60) /* 2 hours */
|
2007-01-25 09:30:47 +01:00
|
|
|
|
#define MIN_PASSPHRASE_LEN (8)
|
2007-08-27 20:10:27 +02:00
|
|
|
|
#define MIN_PASSPHRASE_NONALPHA (1)
|
2007-08-28 19:48:13 +02:00
|
|
|
|
#define MAX_PASSPHRASE_DAYS (0)
|
2004-03-16 11:48:42 +01:00
|
|
|
|
|
2007-07-04 11:34:28 +02:00
|
|
|
|
/* The timer tick used for housekeeping stuff. For Windows we use a
|
|
|
|
|
longer period as the SetWaitableTimer seems to signal earlier than
|
|
|
|
|
the 2 seconds. */
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
#define TIMERTICK_INTERVAL (4)
|
|
|
|
|
#else
|
|
|
|
|
#define TIMERTICK_INTERVAL (2) /* Seconds. */
|
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2009-03-19 08:09:31 +01:00
|
|
|
|
|
|
|
|
|
/* The list of open file descriptors at startup. Note that this list
|
|
|
|
|
has been allocated using the standard malloc. */
|
|
|
|
|
static int *startup_fd_list;
|
|
|
|
|
|
|
|
|
|
/* The signal mask at startup and a flag telling whether it is valid. */
|
|
|
|
|
#ifdef HAVE_SIGPROCMASK
|
|
|
|
|
static sigset_t startup_signal_mask;
|
|
|
|
|
static int startup_signal_mask_valid;
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
/* Flag to indicate that a shutdown was requested. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static int shutdown_pending;
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
/* Counter for the currently running own socket checks. */
|
|
|
|
|
static int check_own_socket_running;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* It is possible that we are currently running under setuid permissions */
|
|
|
|
|
static int maybe_setuid = 1;
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* Name of the communication socket used for native gpg-agent requests. */
|
2004-12-20 17:17:25 +01:00
|
|
|
|
static char *socket_name;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-01-26 23:20:21 +01:00
|
|
|
|
/* Name of the communication socket used for ssh-agent-emulation. */
|
|
|
|
|
static char *socket_name_ssh;
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
/* We need to keep track of the server's nonces (these are dummies for
|
|
|
|
|
POSIX systems). */
|
|
|
|
|
static assuan_sock_nonce_t socket_nonce;
|
|
|
|
|
static assuan_sock_nonce_t socket_nonce_ssh;
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* Default values for options passed to the pinentry. */
|
|
|
|
|
static char *default_display;
|
|
|
|
|
static char *default_ttyname;
|
|
|
|
|
static char *default_ttytype;
|
|
|
|
|
static char *default_lc_ctype;
|
|
|
|
|
static char *default_lc_messages;
|
2007-11-19 17:03:50 +01:00
|
|
|
|
static char *default_xauthority;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
/* Name of a config file, which will be reread on a HUP if it is not NULL. */
|
|
|
|
|
static char *config_filename;
|
|
|
|
|
|
2004-02-18 17:57:38 +01:00
|
|
|
|
/* Helper to implement --debug-level */
|
|
|
|
|
static const char *debug_level;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-30 05:58:21 +02:00
|
|
|
|
/* Keep track of the current log file so that we can avoid updating
|
2004-10-22 11:39:47 +02:00
|
|
|
|
the log file after a SIGHUP if it didn't changed. Malloced. */
|
2004-04-30 05:58:21 +02:00
|
|
|
|
static char *current_logfile;
|
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
/* The handle_tick() function may test whether a parent is still
|
2005-05-18 12:48:06 +02:00
|
|
|
|
running. We record the PID of the parent here or -1 if it should be
|
2005-04-20 21:19:24 +02:00
|
|
|
|
watched. */
|
|
|
|
|
static pid_t parent_pid = (pid_t)(-1);
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/*
|
|
|
|
|
Local prototypes.
|
|
|
|
|
*/
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
static char *create_socket_name (char *standard_name, char *template);
|
|
|
|
|
static gnupg_fd_t create_server_socket (char *name, int is_ssh,
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_nonce_t *nonce);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void create_directories (void);
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
static void agent_init_default_ctrl (ctrl_t ctrl);
|
|
|
|
|
static void agent_deinit_default_ctrl (ctrl_t ctrl);
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
static void handle_connections (gnupg_fd_t listen_fd,
|
|
|
|
|
gnupg_fd_t listen_fd_ssh);
|
2008-10-29 18:24:27 +01:00
|
|
|
|
static void check_own_socket (void);
|
2007-06-21 20:44:48 +02:00
|
|
|
|
static int check_for_running_agent (int silent, int mode);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
/* Pth wrapper function definitions. */
|
2009-10-16 20:35:03 +02:00
|
|
|
|
ASSUAN_SYSTEM_PTH_IMPL;
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
GCRY_THREAD_OPTION_PTH_IMPL;
|
2007-07-04 21:49:40 +02:00
|
|
|
|
static int fixed_gcry_pth_init (void)
|
|
|
|
|
{
|
|
|
|
|
return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
|
2008-05-27 14:03:50 +02:00
|
|
|
|
#ifndef PTH_HAVE_PTH_THREAD_ID
|
|
|
|
|
static unsigned long pth_thread_id (void)
|
|
|
|
|
{
|
|
|
|
|
return (unsigned long)pth_self ();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/*
|
|
|
|
|
Functions.
|
|
|
|
|
*/
|
|
|
|
|
|
2008-11-18 19:01:03 +01: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;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static const char *
|
|
|
|
|
my_strusage (int level)
|
|
|
|
|
{
|
2008-11-18 19:01:03 +01:00
|
|
|
|
static char *ver_gcry;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
const char *p;
|
2008-11-18 19:01:03 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
switch (level)
|
|
|
|
|
{
|
|
|
|
|
case 11: p = "gpg-agent (GnuPG)";
|
|
|
|
|
break;
|
|
|
|
|
case 13: p = VERSION; break;
|
|
|
|
|
case 17: p = PRINTABLE_OS_NAME; break;
|
2009-07-21 16:21:05 +02:00
|
|
|
|
/* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
|
|
|
|
|
reporting address. This is so that we can change the
|
|
|
|
|
reporting address without breaking the translations. */
|
|
|
|
|
case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
|
|
|
|
|
|
2008-11-18 19:01:03 +01:00
|
|
|
|
case 20:
|
|
|
|
|
if (!ver_gcry)
|
|
|
|
|
ver_gcry = make_libversion ("libgcrypt", gcry_check_version);
|
|
|
|
|
p = ver_gcry;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case 1:
|
|
|
|
|
case 40: p = _("Usage: gpg-agent [options] (-h for help)");
|
|
|
|
|
break;
|
|
|
|
|
case 41: p = _("Syntax: gpg-agent [options] [command [args]]\n"
|
|
|
|
|
"Secret key management for GnuPG\n");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default: p = NULL;
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-12-02 08:48:09 +01:00
|
|
|
|
/* Setup the debugging. With the global variable DEBUG_LEVEL set to NULL
|
|
|
|
|
only the active debug flags are propagated to the subsystems. With
|
|
|
|
|
DEBUG_LEVEL set, a specific set of debug flags is set; thus overriding
|
|
|
|
|
all flags already set. Note that we don't fail here, because it is
|
|
|
|
|
important to keep gpg-agent running even after re-reading the
|
|
|
|
|
options due to a SIGHUP. */
|
2004-02-18 17:57:38 +01:00
|
|
|
|
static void
|
|
|
|
|
set_debug (void)
|
|
|
|
|
{
|
2009-12-03 19:04:40 +01:00
|
|
|
|
int numok = (debug_level && digitp (debug_level));
|
|
|
|
|
int numlvl = numok? atoi (debug_level) : 0;
|
|
|
|
|
|
2004-02-18 17:57:38 +01:00
|
|
|
|
if (!debug_level)
|
|
|
|
|
;
|
2009-12-03 19:04:40 +01:00
|
|
|
|
else if (!strcmp (debug_level, "none") || (numok && numlvl < 1))
|
2004-02-18 17:57:38 +01:00
|
|
|
|
opt.debug = 0;
|
2009-12-03 19:04:40 +01:00
|
|
|
|
else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
|
2004-02-18 17:57:38 +01:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE;
|
2009-12-03 19:04:40 +01:00
|
|
|
|
else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5))
|
2004-02-18 17:57:38 +01:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE;
|
2009-12-03 19:04:40 +01:00
|
|
|
|
else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8))
|
2004-02-18 17:57:38 +01:00
|
|
|
|
opt.debug = (DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE
|
|
|
|
|
|DBG_CACHE_VALUE);
|
2009-12-03 19:04:40 +01:00
|
|
|
|
else if (!strcmp (debug_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:57:38 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_error (_("invalid debug-level `%s' given\n"), debug_level);
|
|
|
|
|
opt.debug = 0; /* Reset debugging, so that prior debug
|
|
|
|
|
statements won't have an undesired effect. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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:04:40 +01:00
|
|
|
|
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
log_info ("enabled debug flags:%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":"");
|
2004-02-18 17:57:38 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* Helper for cleanup to remove one socket with NAME. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void
|
2005-02-03 18:40:02 +01:00
|
|
|
|
remove_socket (char *name)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (name && *name)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
2010-04-14 13:24:02 +02:00
|
|
|
|
gnupg_remove (name);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
p = strrchr (name, '/');
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (p)
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
|
|
|
|
*p = 0;
|
|
|
|
|
rmdir (name);
|
|
|
|
|
*p = '/';
|
|
|
|
|
}
|
|
|
|
|
*name = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cleanup (void)
|
|
|
|
|
{
|
2005-02-03 18:40:02 +01:00
|
|
|
|
remove_socket (socket_name);
|
|
|
|
|
remove_socket (socket_name_ssh);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle options which are allowed to be reset after program start.
|
|
|
|
|
Return true when the current option in PARGS could be handled and
|
|
|
|
|
false if not. As a special feature, passing a value of NULL for
|
2004-04-30 05:58:21 +02:00
|
|
|
|
PARGS, resets the options to the default. REREAD should be set
|
|
|
|
|
true if it is not the initial option parsing. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static int
|
2004-04-30 05:58:21 +02:00
|
|
|
|
parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
if (!pargs)
|
|
|
|
|
{ /* reset mode */
|
|
|
|
|
opt.quiet = 0;
|
|
|
|
|
opt.verbose = 0;
|
|
|
|
|
opt.debug = 0;
|
|
|
|
|
opt.no_grab = 0;
|
|
|
|
|
opt.pinentry_program = NULL;
|
2007-02-14 17:27:55 +01:00
|
|
|
|
opt.pinentry_touch_file = NULL;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
opt.scdaemon_program = NULL;
|
2004-03-16 11:48:42 +01:00
|
|
|
|
opt.def_cache_ttl = DEFAULT_CACHE_TTL;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
opt.def_cache_ttl_ssh = DEFAULT_CACHE_TTL_SSH;
|
2004-08-20 15:43:14 +02:00
|
|
|
|
opt.max_cache_ttl = MAX_CACHE_TTL;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
opt.max_cache_ttl_ssh = MAX_CACHE_TTL_SSH;
|
2007-08-27 20:10:27 +02:00
|
|
|
|
opt.enforce_passphrase_constraints = 0;
|
2007-01-25 09:30:47 +01:00
|
|
|
|
opt.min_passphrase_len = MIN_PASSPHRASE_LEN;
|
2007-08-27 20:10:27 +02:00
|
|
|
|
opt.min_passphrase_nonalpha = MIN_PASSPHRASE_NONALPHA;
|
|
|
|
|
opt.check_passphrase_pattern = NULL;
|
2007-08-28 19:48:13 +02:00
|
|
|
|
opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
|
|
|
|
|
opt.enable_passhrase_history = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
opt.ignore_cache_for_signing = 0;
|
2004-05-03 15:37:38 +02:00
|
|
|
|
opt.allow_mark_trusted = 0;
|
2005-04-20 21:19:24 +02:00
|
|
|
|
opt.disable_scdaemon = 0;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (pargs->r_opt)
|
|
|
|
|
{
|
|
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
|
case oVerbose: opt.verbose++; break;
|
|
|
|
|
|
|
|
|
|
case oDebug: opt.debug |= pargs->r.ret_ulong; break;
|
|
|
|
|
case oDebugAll: opt.debug = ~0; break;
|
2004-02-18 17:57:38 +01:00
|
|
|
|
case oDebugLevel: debug_level = pargs->r.ret_str; break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-30 05:58:21 +02:00
|
|
|
|
case oLogFile:
|
2004-10-22 11:39:47 +02:00
|
|
|
|
if (!reread)
|
|
|
|
|
return 0; /* not handeld */
|
|
|
|
|
if (!current_logfile || !pargs->r.ret_str
|
|
|
|
|
|| strcmp (current_logfile, pargs->r.ret_str))
|
2004-04-30 05:58:21 +02:00
|
|
|
|
{
|
|
|
|
|
log_set_file (pargs->r.ret_str);
|
|
|
|
|
xfree (current_logfile);
|
|
|
|
|
current_logfile = xtrystrdup (pargs->r.ret_str);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case oNoGrab: opt.no_grab = 1; break;
|
|
|
|
|
|
|
|
|
|
case oPinentryProgram: opt.pinentry_program = pargs->r.ret_str; break;
|
2007-02-14 17:27:55 +01:00
|
|
|
|
case oPinentryTouchFile: opt.pinentry_touch_file = pargs->r.ret_str; break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case oScdaemonProgram: opt.scdaemon_program = pargs->r.ret_str; break;
|
2005-04-20 21:19:24 +02:00
|
|
|
|
case oDisableScdaemon: opt.disable_scdaemon = 1; break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
case oDefCacheTTL: opt.def_cache_ttl = pargs->r.ret_ulong; break;
|
2005-06-07 21:09:18 +02:00
|
|
|
|
case oDefCacheTTLSSH: opt.def_cache_ttl_ssh = pargs->r.ret_ulong; break;
|
2004-08-20 15:43:14 +02:00
|
|
|
|
case oMaxCacheTTL: opt.max_cache_ttl = pargs->r.ret_ulong; break;
|
2005-06-16 10:12:03 +02:00
|
|
|
|
case oMaxCacheTTLSSH: opt.max_cache_ttl_ssh = pargs->r.ret_ulong; break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2007-08-27 20:10:27 +02:00
|
|
|
|
case oEnforcePassphraseConstraints:
|
|
|
|
|
opt.enforce_passphrase_constraints=1;
|
|
|
|
|
break;
|
2007-01-25 09:30:47 +01:00
|
|
|
|
case oMinPassphraseLen: opt.min_passphrase_len = pargs->r.ret_ulong; break;
|
2007-08-27 20:10:27 +02:00
|
|
|
|
case oMinPassphraseNonalpha:
|
|
|
|
|
opt.min_passphrase_nonalpha = pargs->r.ret_ulong;
|
|
|
|
|
break;
|
|
|
|
|
case oCheckPassphrasePattern:
|
|
|
|
|
opt.check_passphrase_pattern = pargs->r.ret_str;
|
|
|
|
|
break;
|
2007-08-28 19:48:13 +02:00
|
|
|
|
case oMaxPassphraseDays:
|
|
|
|
|
opt.max_passphrase_days = pargs->r.ret_ulong;
|
|
|
|
|
break;
|
|
|
|
|
case oEnablePassphraseHistory:
|
|
|
|
|
opt.enable_passhrase_history = 1;
|
|
|
|
|
break;
|
2007-01-25 09:30:47 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
|
|
|
|
|
|
2004-05-03 15:37:38 +02:00
|
|
|
|
case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
|
|
|
|
|
|
2004-12-21 20:05:15 +01:00
|
|
|
|
case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
default:
|
|
|
|
|
return 0; /* not handled */
|
|
|
|
|
}
|
2005-06-07 21:09:18 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return 1; /* handled */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-07-04 11:34:28 +02:00
|
|
|
|
/* The main entry point. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
int
|
|
|
|
|
main (int argc, char **argv )
|
|
|
|
|
{
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
int orig_argc;
|
|
|
|
|
int may_coredump;
|
|
|
|
|
char **orig_argv;
|
|
|
|
|
FILE *configfp = NULL;
|
|
|
|
|
char *configname = NULL;
|
|
|
|
|
const char *shell;
|
|
|
|
|
unsigned configlineno;
|
|
|
|
|
int parse_debug = 0;
|
|
|
|
|
int default_config =1;
|
|
|
|
|
int greeting = 0;
|
|
|
|
|
int nogreeting = 0;
|
|
|
|
|
int pipe_server = 0;
|
|
|
|
|
int is_daemon = 0;
|
|
|
|
|
int nodetach = 0;
|
|
|
|
|
int csh_style = 0;
|
|
|
|
|
char *logfile = NULL;
|
|
|
|
|
int debug_wait = 0;
|
2004-02-18 17:57:38 +01:00
|
|
|
|
int gpgconf_list = 0;
|
2004-04-06 09:36:44 +02:00
|
|
|
|
gpg_error_t err;
|
2005-06-03 15:57:24 +02:00
|
|
|
|
const char *env_file_name = 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.
2009-09-23 02:01:25 +02:00
|
|
|
|
struct assuan_malloc_hooks malloc_hooks;
|
2007-06-14 19:05:07 +02:00
|
|
|
|
|
2009-03-19 08:09:31 +01:00
|
|
|
|
/* Before we do anything else we save the list of currently open
|
|
|
|
|
file descriptors and the signal mask. This info is required to
|
|
|
|
|
do the exec call properly. */
|
|
|
|
|
startup_fd_list = get_all_open_fds ();
|
|
|
|
|
#ifdef HAVE_SIGPROCMASK
|
|
|
|
|
if (!sigprocmask (SIG_UNBLOCK, NULL, &startup_signal_mask))
|
|
|
|
|
startup_signal_mask_valid = 1;
|
|
|
|
|
#endif /*HAVE_SIGPROCMASK*/
|
|
|
|
|
|
|
|
|
|
/* Set program name etc. */
|
2003-08-05 19:11:04 +02: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 */
|
2004-04-16 11:46:54 +02:00
|
|
|
|
log_set_prefix ("gpg-agent", JNLIB_LOG_WITH_PREFIX|JNLIB_LOG_WITH_PID);
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
2007-06-14 19:05:07 +02:00
|
|
|
|
/* Make sure that our subsystems are ready. */
|
2008-12-09 09:58:02 +01:00
|
|
|
|
i18n_init ();
|
2010-03-22 13:46:05 +01:00
|
|
|
|
init_common_subsystems (&argc, &argv);
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-06 09:36:44 +02:00
|
|
|
|
/* Libgcrypt requires us to register the threading model first.
|
|
|
|
|
Note that this will also do the pth_init. */
|
2007-07-04 21:49:40 +02:00
|
|
|
|
gcry_threads_pth.init = fixed_gcry_pth_init;
|
2004-04-06 09:36:44 +02:00
|
|
|
|
err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
|
|
|
|
|
if (err)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
2004-04-06 09:36:44 +02:00
|
|
|
|
log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
|
|
|
|
|
gpg_strerror (err));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-12-19 14:38:24 +01:00
|
|
|
|
|
2004-04-06 09:36:44 +02:00
|
|
|
|
/* Check that the libraries are suitable. Do it here because
|
|
|
|
|
the option parsing may need services of the library. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
|
|
|
|
|
{
|
2007-04-20 18:59:37 +02:00
|
|
|
|
log_fatal( _("%s is too old (need %s, have %s)\n"), "libgcrypt",
|
2003-08-05 19:11:04 +02:00
|
|
|
|
NEED_LIBGCRYPT_VERSION, gcry_check_version (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.
2009-09-23 02:01:25 +02:00
|
|
|
|
malloc_hooks.malloc = gcry_malloc;
|
|
|
|
|
malloc_hooks.realloc = gcry_realloc;
|
|
|
|
|
malloc_hooks.free = gcry_free;
|
|
|
|
|
assuan_set_malloc_hooks (&malloc_hooks);
|
2010-04-14 13:24:02 +02:00
|
|
|
|
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
2009-10-16 20:35:03 +02:00
|
|
|
|
assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
|
|
|
|
|
assuan_sock_init ();
|
2010-03-11 13:34:11 +01:00
|
|
|
|
setup_libassuan_logging (&opt.debug);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2007-04-20 18:59:37 +02:00
|
|
|
|
setup_libgcrypt_logging ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
|
|
|
|
|
|
|
|
|
|
may_coredump = disable_core_dumps ();
|
|
|
|
|
|
2004-12-20 17:17:25 +01:00
|
|
|
|
/* Set default options. */
|
2004-04-30 05:58:21 +02:00
|
|
|
|
parse_rereadable_options (NULL, 0); /* Reset them to default values. */
|
2010-05-04 17:21:47 +02:00
|
|
|
|
#ifdef USE_STANDARD_SOCKET
|
2010-05-11 20:00:31 +02:00
|
|
|
|
opt.use_standard_socket = 1;
|
2004-12-20 17:17:25 +01:00
|
|
|
|
#endif
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
shell = getenv ("SHELL");
|
|
|
|
|
if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
|
|
|
|
|
csh_style = 1;
|
2004-12-20 17:17:25 +01:00
|
|
|
|
|
2004-12-21 11:03:00 +01:00
|
|
|
|
opt.homedir = default_homedir ();
|
2004-12-20 17:17:25 +01:00
|
|
|
|
|
2005-05-31 22:03:04 +02:00
|
|
|
|
/* Record some of the original environment strings. */
|
2009-07-07 12:02:41 +02:00
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
int idx;
|
|
|
|
|
static const char *names[] =
|
|
|
|
|
{ "DISPLAY", "TERM", "XAUTHORITY", "PINENTRY_USER_DATA", NULL };
|
|
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
|
opt.startup_env = session_env_new ();
|
|
|
|
|
if (!opt.startup_env)
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
for (idx=0; !err && names[idx]; idx++)
|
|
|
|
|
{
|
|
|
|
|
s = getenv (names[idx]);
|
|
|
|
|
if (s)
|
|
|
|
|
err = session_env_setenv (opt.startup_env, names[idx], s);
|
|
|
|
|
}
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
s = ttyname (0);
|
|
|
|
|
if (s)
|
|
|
|
|
err = session_env_setenv (opt.startup_env, "GPG_TTY", s);
|
|
|
|
|
}
|
|
|
|
|
if (err)
|
|
|
|
|
log_fatal ("error recording startup environment: %s\n",
|
|
|
|
|
gpg_strerror (err));
|
|
|
|
|
|
|
|
|
|
/* Fixme: Better use the locale function here. */
|
|
|
|
|
opt.startup_lc_ctype = getenv ("LC_CTYPE");
|
|
|
|
|
if (opt.startup_lc_ctype)
|
|
|
|
|
opt.startup_lc_ctype = xstrdup (opt.startup_lc_ctype);
|
|
|
|
|
opt.startup_lc_messages = getenv ("LC_MESSAGES");
|
|
|
|
|
if (opt.startup_lc_messages)
|
|
|
|
|
opt.startup_lc_messages = xstrdup (opt.startup_lc_messages);
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-12-20 17:17:25 +01:00
|
|
|
|
/* Check whether we have a config file on the commandline */
|
2003-08-05 19:11:04 +02: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;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-29 15:12:01 +02:00
|
|
|
|
/* Initialize the secure memory. */
|
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
maybe_setuid = 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Now we are now working under our real uid
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if (default_config)
|
|
|
|
|
configname = make_filename (opt.homedir, "gpg-agent.conf", NULL );
|
|
|
|
|
|
|
|
|
|
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) )
|
|
|
|
|
{
|
2004-04-30 05:58:21 +02:00
|
|
|
|
if (parse_rereadable_options (&pargs, 0))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
continue; /* Already handled */
|
|
|
|
|
switch (pargs.r_opt)
|
|
|
|
|
{
|
2004-02-18 17:57:38 +01:00
|
|
|
|
case aGPGConfList: gpgconf_list = 1; break;
|
2006-10-23 16:02:13 +02:00
|
|
|
|
case aGPGConfTest: gpgconf_list = 2; break;
|
2010-05-03 17:23:10 +02:00
|
|
|
|
case aUseStandardSocketP: gpgconf_list = 3; break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case oBatch: opt.batch=1; break;
|
|
|
|
|
|
|
|
|
|
case oDebugWait: debug_wait = pargs.r.ret_int; break;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
case oDaemon: is_daemon = 1; break;
|
|
|
|
|
|
|
|
|
|
case oDisplay: default_display = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oTTYtype: default_ttytype = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oLCctype: default_lc_ctype = xstrdup (pargs.r.ret_str); break;
|
2004-04-06 09:36:44 +02:00
|
|
|
|
case oLCmessages: default_lc_messages = xstrdup (pargs.r.ret_str);
|
2007-11-19 17:03:50 +01:00
|
|
|
|
case oXauthority: default_xauthority = xstrdup (pargs.r.ret_str);
|
2004-04-06 09:36:44 +02:00
|
|
|
|
break;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2010-05-11 20:00:31 +02:00
|
|
|
|
case oUseStandardSocket: opt.use_standard_socket = 1; break;
|
|
|
|
|
case oNoUseStandardSocket: opt.use_standard_socket = 0; break;
|
2004-12-20 17:17:25 +01:00
|
|
|
|
|
2007-08-28 19:48:13 +02:00
|
|
|
|
case oFakedSystemTime:
|
|
|
|
|
{
|
|
|
|
|
time_t faked_time = isotime2epoch (pargs.r.ret_str);
|
|
|
|
|
if (faked_time == (time_t)(-1))
|
|
|
|
|
faked_time = (time_t)strtoul (pargs.r.ret_str, NULL, 10);
|
|
|
|
|
gnupg_set_time (faked_time, 0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case oKeepTTY: opt.keep_tty = 1; break;
|
|
|
|
|
case oKeepDISPLAY: opt.keep_display = 1; break;
|
|
|
|
|
|
2005-02-23 22:06:32 +01:00
|
|
|
|
case oSSHSupport: opt.ssh_support = 1; break;
|
2005-08-16 11:15:09 +02:00
|
|
|
|
case oWriteEnvFile:
|
|
|
|
|
if (pargs.r_type)
|
|
|
|
|
env_file_name = pargs.r.ret_str;
|
|
|
|
|
else
|
|
|
|
|
env_file_name = make_filename ("~/.gpg-agent-info", NULL);
|
|
|
|
|
break;
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
default : pargs.err = configfp? 1:2; break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (configfp)
|
|
|
|
|
{
|
|
|
|
|
fclose( configfp );
|
|
|
|
|
configfp = NULL;
|
|
|
|
|
/* Keep a copy of the name so that it can be read on SIGHUP. */
|
|
|
|
|
config_filename = configname;
|
|
|
|
|
configname = NULL;
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
if (log_get_errorcount(0))
|
|
|
|
|
exit(2);
|
|
|
|
|
if (nogreeting )
|
|
|
|
|
greeting = 0;
|
|
|
|
|
|
|
|
|
|
if (greeting)
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (es_stderr, "%s %s; %s\n",
|
|
|
|
|
strusage(11), strusage(13), strusage(14) );
|
|
|
|
|
es_fprintf (es_stderr, "%s\n", strusage(15) );
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
#ifdef IS_DEVELOPMENT_VERSION
|
2004-09-09 09:27:57 +02:00
|
|
|
|
/* We don't want to print it here because gpg-agent is useful of its
|
|
|
|
|
own and quite matured. */
|
|
|
|
|
/*log_info ("NOTE: this is a development version!\n");*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-02-18 17:57:38 +01:00
|
|
|
|
set_debug ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (atexit (cleanup))
|
|
|
|
|
{
|
|
|
|
|
log_error ("atexit failed\n");
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-14 19:05:07 +02:00
|
|
|
|
initialize_module_call_pinentry ();
|
2004-12-19 18:44:20 +01:00
|
|
|
|
initialize_module_call_scd ();
|
2007-06-14 19:05:07 +02:00
|
|
|
|
initialize_module_trustlist ();
|
2004-12-19 18:44:20 +01:00
|
|
|
|
|
|
|
|
|
/* Try to create missing directories. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
create_directories ();
|
|
|
|
|
|
|
|
|
|
if (debug_wait && pipe_server)
|
|
|
|
|
{
|
|
|
|
|
log_debug ("waiting for debugger - my pid is %u .....\n",
|
|
|
|
|
(unsigned int)getpid());
|
2007-06-20 13:16:42 +02:00
|
|
|
|
gnupg_sleep (debug_wait);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_debug ("... okay\n");
|
|
|
|
|
}
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
2010-05-03 17:23:10 +02:00
|
|
|
|
if (gpgconf_list == 3)
|
2010-05-04 17:21:47 +02:00
|
|
|
|
{
|
2010-05-11 20:00:31 +02:00
|
|
|
|
if (opt.use_standard_socket && !opt.quiet)
|
2010-05-04 17:21:47 +02:00
|
|
|
|
log_info ("configured to use the standard socket\n");
|
2010-05-11 20:00:31 +02:00
|
|
|
|
agent_exit (!opt.use_standard_socket);
|
2010-05-04 17:21:47 +02:00
|
|
|
|
}
|
2010-05-03 17:23:10 +02:00
|
|
|
|
else if (gpgconf_list == 2)
|
2006-10-23 16:02:13 +02:00
|
|
|
|
agent_exit (0);
|
2010-05-03 17:23:10 +02:00
|
|
|
|
else if (gpgconf_list)
|
2004-03-23 13:21:29 +01:00
|
|
|
|
{
|
|
|
|
|
char *filename;
|
2007-06-18 22:15:01 +02:00
|
|
|
|
char *filename_esc;
|
2004-03-23 13:21:29 +01:00
|
|
|
|
|
|
|
|
|
/* List options and default values in the GPG Conf format. */
|
|
|
|
|
filename = make_filename (opt.homedir, "gpg-agent.conf", NULL );
|
2007-06-19 11:11:11 +02:00
|
|
|
|
filename_esc = percent_escape (filename, NULL);
|
2007-06-18 22:15:01 +02:00
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("gpgconf-gpg-agent.conf:%lu:\"%s\n",
|
2007-06-18 22:15:01 +02:00
|
|
|
|
GC_OPT_FLAG_DEFAULT, filename_esc);
|
2004-03-23 13:21:29 +01:00
|
|
|
|
xfree (filename);
|
2007-06-18 22:15:01 +02:00
|
|
|
|
xfree (filename_esc);
|
2004-03-16 19:59:35 +01:00
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("verbose:%lu:\n"
|
2004-03-16 11:48:42 +01:00
|
|
|
|
"quiet:%lu:\n"
|
2004-03-17 14:01:16 +01:00
|
|
|
|
"debug-level:%lu:\"none:\n"
|
2004-03-16 11:48:42 +01:00
|
|
|
|
"log-file:%lu:\n",
|
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME,
|
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME,
|
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
|
2004-04-30 05:58:21 +02:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("default-cache-ttl:%lu:%d:\n",
|
2004-03-16 11:48:42 +01:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, DEFAULT_CACHE_TTL );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("default-cache-ttl-ssh:%lu:%d:\n",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, DEFAULT_CACHE_TTL_SSH );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("max-cache-ttl:%lu:%d:\n",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MAX_CACHE_TTL );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("max-cache-ttl-ssh:%lu:%d:\n",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MAX_CACHE_TTL_SSH );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("enforce-passphrase-constraints:%lu:\n",
|
2007-08-27 20:10:27 +02:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("min-passphrase-len:%lu:%d:\n",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MIN_PASSPHRASE_LEN );
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("min-passphrase-nonalpha:%lu:%d:\n",
|
2007-08-27 20:10:27 +02:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
|
|
|
|
|
MIN_PASSPHRASE_NONALPHA);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("check-passphrase-pattern:%lu:\n",
|
2007-08-27 20:10:27 +02:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("max-passphrase-days:%lu:%d:\n",
|
2007-08-28 19:48:13 +02:00
|
|
|
|
GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
|
|
|
|
|
MAX_PASSPHRASE_DAYS);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("enable-passphrase-history:%lu:\n",
|
2007-08-28 19:48:13 +02:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("no-grab:%lu:\n",
|
2004-03-16 11:48:42 +01:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("ignore-cache-for-signing:%lu:\n",
|
2004-05-03 15:37:38 +02:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("allow-mark-trusted:%lu:\n",
|
2004-03-16 11:48:42 +01:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("disable-scdaemon:%lu:\n",
|
2005-04-20 21:19:24 +02:00
|
|
|
|
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
|
2004-02-18 17:57:38 +01:00
|
|
|
|
|
|
|
|
|
agent_exit (0);
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-09-09 09:27:57 +02:00
|
|
|
|
/* If this has been called without any options, we merely check
|
|
|
|
|
whether an agent is already running. We do this here so that we
|
|
|
|
|
don't clobber a logfile but print it directly to stderr. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!pipe_server && !is_daemon)
|
2004-09-09 09:27:57 +02:00
|
|
|
|
{
|
|
|
|
|
log_set_prefix (NULL, JNLIB_LOG_WITH_PREFIX);
|
2007-06-21 20:44:48 +02:00
|
|
|
|
check_for_running_agent (0, 0);
|
2004-09-09 09:27:57 +02:00
|
|
|
|
agent_exit (0);
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
#ifdef ENABLE_NLS
|
2004-03-16 11:48:42 +01:00
|
|
|
|
/* gpg-agent usually does not output any messages because it runs in
|
|
|
|
|
the background. For log files it is acceptable to have messages
|
|
|
|
|
always encoded in utf-8. We switch here to utf-8, so that
|
|
|
|
|
commands like --help still give native messages. It is far
|
|
|
|
|
easier to switch only once instead of for every message and it
|
|
|
|
|
actually helps when more then one thread is active (avoids an
|
|
|
|
|
extra copy step). */
|
2004-04-06 12:01:04 +02:00
|
|
|
|
bind_textdomain_codeset (PACKAGE_GT, "UTF-8");
|
2003-08-05 19:11:04 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
|
/* Now start with logging to a file if this is desired. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (logfile)
|
|
|
|
|
{
|
|
|
|
|
log_set_file (logfile);
|
2004-04-16 11:46:54 +02:00
|
|
|
|
log_set_prefix (NULL, (JNLIB_LOG_WITH_PREFIX
|
|
|
|
|
|JNLIB_LOG_WITH_TIME
|
|
|
|
|
|JNLIB_LOG_WITH_PID));
|
2004-04-30 05:58:21 +02:00
|
|
|
|
current_logfile = xstrdup (logfile);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make sure that we have a default ttyname. */
|
|
|
|
|
if (!default_ttyname && ttyname (1))
|
|
|
|
|
default_ttyname = xstrdup (ttyname (1));
|
|
|
|
|
if (!default_ttytype && getenv ("TERM"))
|
|
|
|
|
default_ttytype = xstrdup (getenv ("TERM"));
|
2004-12-15 15:15:54 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
if (pipe_server)
|
2006-11-20 17:49:41 +01:00
|
|
|
|
{
|
|
|
|
|
/* This is the simple pipe based server */
|
|
|
|
|
ctrl_t ctrl;
|
|
|
|
|
|
|
|
|
|
ctrl = xtrycalloc (1, sizeof *ctrl);
|
|
|
|
|
if (!ctrl)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating connection control data: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
agent_exit (1);
|
|
|
|
|
}
|
2009-07-07 12:02:41 +02:00
|
|
|
|
ctrl->session_env = session_env_new ();
|
|
|
|
|
if (!ctrl->session_env)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating session environment block: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
xfree (ctrl);
|
|
|
|
|
agent_exit (1);
|
|
|
|
|
}
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_init_default_ctrl (ctrl);
|
2007-10-01 16:48:39 +02:00
|
|
|
|
start_command_handler (ctrl, GNUPG_INVALID_FD, GNUPG_INVALID_FD);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_deinit_default_ctrl (ctrl);
|
|
|
|
|
xfree (ctrl);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if (!is_daemon)
|
2004-09-09 09:27:57 +02:00
|
|
|
|
; /* NOTREACHED */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else
|
2004-09-09 09:27:57 +02:00
|
|
|
|
{ /* Regular server mode */
|
2007-10-01 16:48:39 +02:00
|
|
|
|
gnupg_fd_t fd;
|
|
|
|
|
gnupg_fd_t fd_ssh;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
pid_t pid;
|
|
|
|
|
|
|
|
|
|
/* Remove the DISPLAY variable so that a pinentry does not
|
|
|
|
|
default to a specific display. There is still a default
|
2005-02-23 22:06:32 +01:00
|
|
|
|
display when gpg-agent was started using --display or a
|
2005-05-31 22:03:04 +02:00
|
|
|
|
client requested this using an OPTION command. Note, that we
|
|
|
|
|
don't do this when running in reverse daemon mode (i.e. when
|
|
|
|
|
exec the program given as arguments). */
|
2004-12-14 15:49:21 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2005-05-31 22:03:04 +02:00
|
|
|
|
if (!opt.keep_display && !argc)
|
2010-04-14 13:24:02 +02:00
|
|
|
|
gnupg_unsetenv ("DISPLAY");
|
2004-12-14 15:49:21 +01:00
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
|
|
|
|
/* Create the sockets. */
|
2008-10-29 18:24:27 +01:00
|
|
|
|
socket_name = create_socket_name
|
|
|
|
|
("S.gpg-agent", "/tmp/gpg-XXXXXX/S.gpg-agent");
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
2008-10-29 18:24:27 +01:00
|
|
|
|
socket_name_ssh = create_socket_name
|
|
|
|
|
("S.gpg-agent.ssh", "/tmp/gpg-XXXXXX/S.gpg-agent.ssh");
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
fd = create_server_socket (socket_name, 0, &socket_nonce);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
2008-10-29 18:24:27 +01:00
|
|
|
|
fd_ssh = create_server_socket (socket_name_ssh, 1, &socket_nonce_ssh);
|
2004-12-20 17:17:25 +01:00
|
|
|
|
else
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd_ssh = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
/* If we are going to exec a program in the parent, we record
|
|
|
|
|
the PID, so that the child may check whether the program is
|
|
|
|
|
still alive. */
|
|
|
|
|
if (argc)
|
|
|
|
|
parent_pid = getpid ();
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
fflush (NULL);
|
2004-12-20 17:17:25 +01:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
pid = getpid ();
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("set GPG_AGENT_INFO=%s;%lu;1\n", socket_name, (ulong)pid);
|
2004-12-20 17:17:25 +01:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
pid = fork ();
|
|
|
|
|
if (pid == (pid_t)-1)
|
|
|
|
|
{
|
|
|
|
|
log_fatal ("fork failed: %s\n", strerror (errno) );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
else if (pid)
|
2004-04-16 11:46:54 +02:00
|
|
|
|
{ /* We are the parent */
|
2005-01-26 23:20:21 +01:00
|
|
|
|
char *infostr, *infostr_ssh_sock, *infostr_ssh_pid;
|
2009-03-25 15:58:31 +01:00
|
|
|
|
|
|
|
|
|
/* Close the socket FD. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
close (fd);
|
2009-03-25 15:58:31 +01:00
|
|
|
|
|
2009-03-19 08:09:31 +01:00
|
|
|
|
/* Note that we used a standard fork so that Pth runs in
|
|
|
|
|
both the parent and the child. The pth_fork would
|
|
|
|
|
terminate Pth in the child but that is not the way we
|
|
|
|
|
want it. Thus we use a plain fork and terminate Pth here
|
|
|
|
|
in the parent. The pth_kill may or may not work reliable
|
|
|
|
|
but it should not harm to call it. Because Pth fiddles
|
|
|
|
|
with the signal mask the signal mask might not be correct
|
|
|
|
|
right now and thus we restore it. That is not strictly
|
|
|
|
|
necessary but some programs falsely assume a cleared
|
|
|
|
|
signal mask. */
|
2009-06-02 17:46:59 +02:00
|
|
|
|
if ( !pth_kill () )
|
2009-06-17 13:57:24 +02:00
|
|
|
|
log_error ("pth_kill failed in forked process\n");
|
2009-06-02 17:46:59 +02:00
|
|
|
|
|
2009-03-19 08:09:31 +01:00
|
|
|
|
#ifdef HAVE_SIGPROCMASK
|
|
|
|
|
if (startup_signal_mask_valid)
|
|
|
|
|
{
|
|
|
|
|
if (sigprocmask (SIG_SETMASK, &startup_signal_mask, NULL))
|
|
|
|
|
log_error ("error restoring signal mask: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
log_info ("no saved signal mask\n");
|
|
|
|
|
#endif /*HAVE_SIGPROCMASK*/
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* Create the info string: <name>:<pid>:<protocol_version> */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (asprintf (&infostr, "GPG_AGENT_INFO=%s:%lu:1",
|
|
|
|
|
socket_name, (ulong)pid ) < 0)
|
|
|
|
|
{
|
|
|
|
|
log_error ("out of core\n");
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
{
|
|
|
|
|
if (asprintf (&infostr_ssh_sock, "SSH_AUTH_SOCK=%s",
|
|
|
|
|
socket_name_ssh) < 0)
|
|
|
|
|
{
|
|
|
|
|
log_error ("out of core\n");
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
if (asprintf (&infostr_ssh_pid, "SSH_AGENT_PID=%u",
|
|
|
|
|
pid) < 0)
|
|
|
|
|
{
|
|
|
|
|
log_error ("out of core\n");
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
*socket_name = 0; /* Don't let cleanup() remove the socket -
|
2003-08-05 19:11:04 +02:00
|
|
|
|
the child should do this from now on */
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
*socket_name_ssh = 0;
|
|
|
|
|
|
2005-06-03 15:57:24 +02:00
|
|
|
|
if (env_file_name)
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
estream_t fp;
|
2005-06-03 15:57:24 +02:00
|
|
|
|
|
2010-08-26 10:47:42 +02:00
|
|
|
|
fp = es_fopen (env_file_name, "w,mode=-rw");
|
2005-06-03 15:57:24 +02:00
|
|
|
|
if (!fp)
|
|
|
|
|
log_error (_("error creating `%s': %s\n"),
|
|
|
|
|
env_file_name, strerror (errno));
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fputs (infostr, fp);
|
|
|
|
|
es_putc ('\n', fp);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fputs (infostr_ssh_sock, fp);
|
|
|
|
|
es_putc ('\n', fp);
|
|
|
|
|
es_fputs (infostr_ssh_pid, fp);
|
|
|
|
|
es_putc ('\n', fp);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
}
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fclose (fp);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (argc)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{ /* Run the program given on the commandline. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (putenv (infostr))
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to set environment: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
kill (pid, SIGTERM );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (opt.ssh_support && putenv (infostr_ssh_sock))
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
|
|
|
|
log_error ("failed to set environment: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
kill (pid, SIGTERM );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (opt.ssh_support && putenv (infostr_ssh_pid))
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
|
|
|
|
log_error ("failed to set environment: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
kill (pid, SIGTERM );
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2009-03-19 08:09:31 +01:00
|
|
|
|
|
|
|
|
|
/* Close all the file descriptors except the standard
|
|
|
|
|
ones and those open at startup. We explicitly don't
|
|
|
|
|
close 0,1,2 in case something went wrong collecting
|
|
|
|
|
them at startup. */
|
|
|
|
|
close_all_fds (3, startup_fd_list);
|
|
|
|
|
|
|
|
|
|
/* Run the command. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
execvp (argv[0], argv);
|
|
|
|
|
log_error ("failed to run the command: %s\n", strerror (errno));
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* Print the environment string, so that the caller can use
|
2003-08-05 19:11:04 +02:00
|
|
|
|
shell's eval to set it */
|
|
|
|
|
if (csh_style)
|
|
|
|
|
{
|
|
|
|
|
*strchr (infostr, '=') = ' ';
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("setenv %s\n", infostr);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
{
|
|
|
|
|
*strchr (infostr_ssh_sock, '=') = ' ';
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("setenv %s\n", infostr_ssh_sock);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
*strchr (infostr_ssh_pid, '=') = ' ';
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("setenv %s\n", infostr_ssh_pid);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ( "%s; export GPG_AGENT_INFO;\n", infostr);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_printf ("%s; export SSH_AUTH_SOCK;\n",
|
|
|
|
|
infostr_ssh_sock);
|
|
|
|
|
es_printf ("%s; export SSH_AGENT_PID;\n",
|
|
|
|
|
infostr_ssh_pid);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (infostr);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.ssh_support)
|
|
|
|
|
{
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (infostr_ssh_sock);
|
|
|
|
|
xfree (infostr_ssh_pid);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
exit (0);
|
|
|
|
|
}
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/*NOTREACHED*/
|
|
|
|
|
} /* End parent */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
|
/*
|
|
|
|
|
This is the child
|
|
|
|
|
*/
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
|
/* Detach from tty and put process into a new session */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (!nodetach )
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2004-04-16 11:46:54 +02:00
|
|
|
|
unsigned int oldflags;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
|
/* Close stdin, stdout and stderr unless it is the log stream */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
for (i=0; i <= 2; i++)
|
|
|
|
|
{
|
2004-10-22 11:39:47 +02:00
|
|
|
|
if (!log_test_fd (i) && i != fd )
|
2006-11-09 17:09:46 +01:00
|
|
|
|
{
|
|
|
|
|
if ( ! close (i)
|
|
|
|
|
&& open ("/dev/null", i? O_WRONLY : O_RDONLY) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to open `%s': %s\n",
|
|
|
|
|
"/dev/null", strerror (errno));
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
if (setsid() == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("setsid() failed: %s\n", strerror(errno) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2004-04-16 11:46:54 +02:00
|
|
|
|
|
|
|
|
|
log_get_prefix (&oldflags);
|
|
|
|
|
log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
opt.running_detached = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (chdir("/"))
|
|
|
|
|
{
|
|
|
|
|
log_error ("chdir to / failed: %s\n", strerror (errno));
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
{
|
|
|
|
|
struct sigaction sa;
|
|
|
|
|
|
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
|
|
|
sigemptyset (&sa.sa_mask);
|
|
|
|
|
sa.sa_flags = 0;
|
|
|
|
|
sigaction (SIGPIPE, &sa, NULL);
|
|
|
|
|
}
|
2004-12-14 15:49:21 +01:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
|
|
|
|
|
2009-03-25 15:58:31 +01:00
|
|
|
|
log_info ("%s %s started\n", strusage(11), strusage(13) );
|
2007-10-01 16:48:39 +02:00
|
|
|
|
handle_connections (fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD);
|
|
|
|
|
assuan_sock_close (fd);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-14 19:05:07 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
void
|
|
|
|
|
agent_exit (int rc)
|
|
|
|
|
{
|
|
|
|
|
/*FIXME: update_random_seed_file();*/
|
|
|
|
|
#if 1
|
|
|
|
|
/* 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);
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
static void
|
|
|
|
|
agent_init_default_ctrl (ctrl_t ctrl)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
/* Note we ignore malloc errors because we can't do much about it
|
|
|
|
|
and the request will fail anyway shortly after this
|
|
|
|
|
initialization. */
|
2009-07-07 12:02:41 +02:00
|
|
|
|
session_env_setenv (ctrl->session_env, "DISPLAY", default_display);
|
|
|
|
|
session_env_setenv (ctrl->session_env, "GPG_TTY", default_ttyname);
|
|
|
|
|
session_env_setenv (ctrl->session_env, "TERM", default_ttytype);
|
|
|
|
|
session_env_setenv (ctrl->session_env, "XAUTHORITY", default_xauthority);
|
|
|
|
|
session_env_setenv (ctrl->session_env, "PINENTRY_USER_DATA", NULL);
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (ctrl->lc_ctype)
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (ctrl->lc_ctype);
|
|
|
|
|
ctrl->lc_ctype = default_lc_ctype? xtrystrdup (default_lc_ctype) : NULL;
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (ctrl->lc_messages)
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (ctrl->lc_messages);
|
|
|
|
|
ctrl->lc_messages = default_lc_messages? xtrystrdup (default_lc_messages)
|
|
|
|
|
/**/ : NULL;
|
2007-11-19 17:03:50 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
static void
|
|
|
|
|
agent_deinit_default_ctrl (ctrl_t ctrl)
|
|
|
|
|
{
|
2009-07-07 12:02:41 +02:00
|
|
|
|
session_env_release (ctrl->session_env);
|
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (ctrl->lc_ctype)
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (ctrl->lc_ctype);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
if (ctrl->lc_messages)
|
2008-05-27 14:03:50 +02:00
|
|
|
|
xfree (ctrl->lc_messages);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-07 12:02:41 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
/* Reread parts of the configuration. Note, that this function is
|
|
|
|
|
obviously not thread-safe and should only be called from the PTH
|
|
|
|
|
signal handler.
|
|
|
|
|
|
|
|
|
|
Fixme: Due to the way the argument parsing works, we create a
|
|
|
|
|
memory leak here for all string type arguments. There is currently
|
|
|
|
|
no clean way to tell whether the memory for the argument has been
|
|
|
|
|
allocated or points into the process' original arguments. Unless
|
|
|
|
|
we have a mechanism to tell this, we need to live on with this. */
|
|
|
|
|
static void
|
|
|
|
|
reread_configuration (void)
|
|
|
|
|
{
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
FILE *fp;
|
|
|
|
|
unsigned int configlineno = 0;
|
|
|
|
|
int dummy;
|
|
|
|
|
|
|
|
|
|
if (!config_filename)
|
|
|
|
|
return; /* No config file. */
|
|
|
|
|
|
|
|
|
|
fp = fopen (config_filename, "r");
|
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("option file `%s': %s\n"),
|
|
|
|
|
config_filename, strerror(errno) );
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-30 05:58:21 +02:00
|
|
|
|
parse_rereadable_options (NULL, 1); /* Start from the default values. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
memset (&pargs, 0, sizeof pargs);
|
|
|
|
|
dummy = 0;
|
|
|
|
|
pargs.argc = &dummy;
|
|
|
|
|
pargs.flags = 1; /* do not remove the args */
|
|
|
|
|
while (optfile_parse (fp, config_filename, &configlineno, &pargs, opts) )
|
|
|
|
|
{
|
|
|
|
|
if (pargs.r_opt < -1)
|
|
|
|
|
pargs.err = 1; /* Print a warning. */
|
|
|
|
|
else /* Try to parse this option - ignore unchangeable ones. */
|
2004-04-30 05:58:21 +02:00
|
|
|
|
parse_rereadable_options (&pargs, 1);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
fclose (fp);
|
2004-02-18 17:57:38 +01:00
|
|
|
|
set_debug ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-02-14 17:27:55 +01:00
|
|
|
|
/* Return the file name of the socket we are using for native
|
|
|
|
|
requests. */
|
|
|
|
|
const char *
|
|
|
|
|
get_agent_socket_name (void)
|
|
|
|
|
{
|
|
|
|
|
const char *s = socket_name;
|
|
|
|
|
|
|
|
|
|
return (s && *s)? s : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-18 12:33:12 +02:00
|
|
|
|
/* Return the file name of the socket we are using for SSH
|
|
|
|
|
requests. */
|
|
|
|
|
const char *
|
|
|
|
|
get_agent_ssh_socket_name (void)
|
|
|
|
|
{
|
|
|
|
|
const char *s = socket_name_ssh;
|
|
|
|
|
|
|
|
|
|
return (s && *s)? s : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2007-11-27 09:01:19 +01:00
|
|
|
|
/* Under W32, this function returns the handle of the scdaemon
|
|
|
|
|
notification event. Calling it the first time creates that
|
|
|
|
|
event. */
|
2010-04-14 13:24:02 +02:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
|
2007-11-27 09:01:19 +01:00
|
|
|
|
void *
|
|
|
|
|
get_agent_scd_notify_event (void)
|
|
|
|
|
{
|
|
|
|
|
static HANDLE the_event;
|
|
|
|
|
|
|
|
|
|
if (!the_event)
|
|
|
|
|
{
|
2008-10-14 20:18:21 +02:00
|
|
|
|
HANDLE h, h2;
|
2007-11-27 09:01:19 +01:00
|
|
|
|
SECURITY_ATTRIBUTES sa = { sizeof (SECURITY_ATTRIBUTES), NULL, TRUE};
|
|
|
|
|
|
2010-03-22 13:46:05 +01:00
|
|
|
|
/* We need to use a manual reset event object due to the way our
|
2008-10-14 20:18:21 +02:00
|
|
|
|
w32-pth wait function works: If we would use an automatic
|
|
|
|
|
reset event we are not able to figure out which handle has
|
|
|
|
|
been signaled because at the time we single out the signaled
|
|
|
|
|
handles using WFSO the event has already been reset due to
|
|
|
|
|
the WFMO. */
|
|
|
|
|
h = CreateEvent (&sa, TRUE, FALSE, NULL);
|
|
|
|
|
if (!h)
|
2007-11-27 09:01:19 +01:00
|
|
|
|
log_error ("can't create scd notify event: %s\n", w32_strerror (-1) );
|
2008-10-14 20:18:21 +02:00
|
|
|
|
else if (!DuplicateHandle (GetCurrentProcess(), h,
|
|
|
|
|
GetCurrentProcess(), &h2,
|
|
|
|
|
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
|
|
|
|
|
{
|
|
|
|
|
log_error ("setting syncronize for scd notify event failed: %s\n",
|
|
|
|
|
w32_strerror (-1) );
|
|
|
|
|
CloseHandle (h);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
CloseHandle (h);
|
|
|
|
|
the_event = h2;
|
|
|
|
|
}
|
2007-11-27 09:01:19 +01:00
|
|
|
|
}
|
2008-10-14 20:18:21 +02:00
|
|
|
|
|
|
|
|
|
log_debug ("returning notify handle %p\n", the_event);
|
2007-11-27 09:01:19 +01:00
|
|
|
|
return the_event;
|
|
|
|
|
}
|
2010-04-14 13:24:02 +02:00
|
|
|
|
#endif /*HAVE_W32_SYSTEM && !HAVE_W32CE_SYSTEM*/
|
2007-11-27 09:01:19 +01:00
|
|
|
|
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
|
|
|
|
/* Create a name for the socket. With USE_STANDARD_SOCKET given as
|
2007-06-14 19:05:07 +02:00
|
|
|
|
true using STANDARD_NAME in the home directory or if given as
|
2005-02-03 18:40:02 +01:00
|
|
|
|
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
|
2006-09-06 13:53:24 +02:00
|
|
|
|
terminates the process in case of an error. Returns: Pointer to an
|
2007-06-14 19:05:07 +02:00
|
|
|
|
allocated string with the absolute name of the socket used. */
|
2005-02-03 18:40:02 +01:00
|
|
|
|
static char *
|
2008-10-29 18:24:27 +01:00
|
|
|
|
create_socket_name (char *standard_name, char *template)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{
|
|
|
|
|
char *name, *p;
|
|
|
|
|
|
2010-05-11 20:00:31 +02:00
|
|
|
|
if (opt.use_standard_socket)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
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));
|
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
*p = '/';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strchr (name, PATHSEP_C))
|
|
|
|
|
{
|
|
|
|
|
log_error (("`%s' are not allowed in the socket name\n"), PATHSEP_S);
|
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
if (strlen (name) + 1 >= DIMof (struct sockaddr_un, sun_path) )
|
|
|
|
|
{
|
|
|
|
|
log_error (_("name of socket too long\n"));
|
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
/* Create a Unix domain socket with NAME. Returns the file descriptor
|
2007-12-03 15:02:06 +01:00
|
|
|
|
or terminates the process in case of an error. Not that this
|
2008-10-29 18:24:27 +01:00
|
|
|
|
function needs to be used for the regular socket first and only
|
|
|
|
|
then for the ssh socket. */
|
2007-10-01 16:48:39 +02:00
|
|
|
|
static gnupg_fd_t
|
2008-10-29 18:24:27 +01:00
|
|
|
|
create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{
|
|
|
|
|
struct sockaddr_un *serv_addr;
|
|
|
|
|
socklen_t len;
|
2007-10-01 16:48:39 +02:00
|
|
|
|
gnupg_fd_t fd;
|
2005-02-03 18:40:02 +01:00
|
|
|
|
int rc;
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd = assuan_sock_new (AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
|
if (fd == ASSUAN_INVALID_FD)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{
|
|
|
|
|
log_error (_("can't create socket: %s\n"), strerror (errno));
|
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-18 12:48:06 +02:00
|
|
|
|
serv_addr = xmalloc (sizeof (*serv_addr));
|
2005-02-03 18:40:02 +01:00
|
|
|
|
memset (serv_addr, 0, sizeof *serv_addr);
|
|
|
|
|
serv_addr->sun_family = AF_UNIX;
|
2007-10-01 16:48:39 +02:00
|
|
|
|
if (strlen (name) + 1 >= sizeof (serv_addr->sun_path))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("socket name `%s' is too long\n"), name);
|
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
2005-02-03 18:40:02 +01:00
|
|
|
|
strcpy (serv_addr->sun_path, name);
|
2009-05-20 00:39:45 +02:00
|
|
|
|
len = SUN_LEN (serv_addr);
|
2007-10-01 16:48:39 +02:00
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
|
2010-04-26 16:51:38 +02:00
|
|
|
|
|
|
|
|
|
/* Our error code mapping on W32CE returns EEXIST thus we also test
|
|
|
|
|
for this. */
|
2010-05-11 20:00:31 +02:00
|
|
|
|
if (opt.use_standard_socket && rc == -1
|
2010-04-26 16:51:38 +02:00
|
|
|
|
&& (errno == EADDRINUSE
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
|| errno == EEXIST
|
|
|
|
|
#endif
|
|
|
|
|
))
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{
|
2007-12-03 15:02:06 +01:00
|
|
|
|
/* Check whether a gpg-agent is already running on the standard
|
|
|
|
|
socket. We do this test only if this is not the ssh socket.
|
|
|
|
|
For ssh we assume that a test for gpg-agent has already been
|
|
|
|
|
done and reuse the requested ssh socket. Testing the
|
|
|
|
|
ssh-socket is not possible because at this point, though we
|
|
|
|
|
know the new Assuan socket, the Assuan server and thus the
|
|
|
|
|
ssh-agent server is not yet operational. This would lead to
|
|
|
|
|
a hang. */
|
|
|
|
|
if (!is_ssh && !check_for_running_agent (1, 1))
|
2007-06-21 20:44:48 +02:00
|
|
|
|
{
|
|
|
|
|
log_error (_("a gpg-agent is already running - "
|
2007-10-01 16:48:39 +02:00
|
|
|
|
"not starting a new one\n"));
|
2007-06-21 20:44:48 +02:00
|
|
|
|
*name = 0; /* Inhibit removal of the socket by cleanup(). */
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2007-06-21 20:44:48 +02:00
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
2010-04-14 13:24:02 +02:00
|
|
|
|
gnupg_remove (name);
|
2007-10-01 16:48:39 +02:00
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len);
|
2005-02-03 18:40:02 +01:00
|
|
|
|
}
|
2007-10-01 16:48:39 +02:00
|
|
|
|
if (rc != -1
|
|
|
|
|
&& (rc=assuan_sock_get_nonce ((struct sockaddr*)serv_addr, len, nonce)))
|
|
|
|
|
log_error (_("error getting nonce for the socket\n"));
|
2005-02-03 18:40:02 +01:00
|
|
|
|
if (rc == -1)
|
|
|
|
|
{
|
2007-06-19 11:11:11 +02:00
|
|
|
|
/* We use gpg_strerror here because it allows us to get strings
|
|
|
|
|
for some W32 socket error codes. */
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error (_("error binding socket to `%s': %s\n"),
|
2007-06-19 11:11:11 +02:00
|
|
|
|
serv_addr->sun_path,
|
|
|
|
|
gpg_strerror (gpg_error_from_errno (errno)));
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2010-05-11 20:00:31 +02:00
|
|
|
|
if (opt.use_standard_socket)
|
2007-06-19 11:11:11 +02:00
|
|
|
|
*name = 0; /* Inhibit removal of the socket by cleanup(). */
|
2005-02-03 18:40:02 +01:00
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
if (listen (FD2INT(fd), 5 ) == -1)
|
2005-02-03 18:40:02 +01:00
|
|
|
|
{
|
|
|
|
|
log_error (_("listen() failed: %s\n"), strerror (errno));
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2005-02-03 18:40:02 +01:00
|
|
|
|
agent_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info (_("listening on socket `%s'\n"), serv_addr->sun_path);
|
|
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check that the directory for storing the private keys exists and
|
|
|
|
|
create it if not. This function won't fail as it is only a
|
|
|
|
|
convenience function and not strictly necessary. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void
|
|
|
|
|
create_private_keys_directory (const char *home)
|
|
|
|
|
{
|
|
|
|
|
char *fname;
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
|
|
|
|
|
fname = make_filename (home, GNUPG_PRIVATE_KEYS_DIR, NULL);
|
|
|
|
|
if (stat (fname, &statbuf) && errno == ENOENT)
|
|
|
|
|
{
|
2010-04-14 13:24:02 +02:00
|
|
|
|
if (gnupg_mkdir (fname, "-rwx"))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_error (_("can't create directory `%s': %s\n"),
|
2004-12-13 16:49:56 +01:00
|
|
|
|
fname, strerror (errno) );
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else if (!opt.quiet)
|
|
|
|
|
log_info (_("directory `%s' created\n"), fname);
|
|
|
|
|
}
|
|
|
|
|
xfree (fname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create the directory only if the supplied directory name is the
|
|
|
|
|
same as the default one. This way we avoid to create arbitrary
|
|
|
|
|
directories when a non-default home directory is used. To cope
|
|
|
|
|
with HOME, we compare only the suffix if we see that the default
|
|
|
|
|
homedir does start with a tilde. We don't stop here in case of
|
|
|
|
|
problems because other functions will throw an error anyway.*/
|
|
|
|
|
static void
|
|
|
|
|
create_directories (void)
|
|
|
|
|
{
|
|
|
|
|
struct stat statbuf;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
const char *defhome = standard_homedir ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
char *home;
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
home = make_filename (opt.homedir, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if ( stat (home, &statbuf) )
|
|
|
|
|
{
|
|
|
|
|
if (errno == ENOENT)
|
|
|
|
|
{
|
2007-06-26 15:48:44 +02:00
|
|
|
|
if (
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
( !compare_filenames (home, defhome) )
|
|
|
|
|
#else
|
|
|
|
|
(*defhome == '~'
|
2003-08-05 19:11:04 +02:00
|
|
|
|
&& (strlen (home) >= strlen (defhome+1)
|
|
|
|
|
&& !strcmp (home + strlen(home)
|
|
|
|
|
- strlen (defhome+1), defhome+1)))
|
|
|
|
|
|| (*defhome != '~' && !strcmp (home, defhome) )
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
)
|
|
|
|
|
{
|
2010-04-14 13:24:02 +02:00
|
|
|
|
if (gnupg_mkdir (home, "-rwx"))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
log_error (_("can't create directory `%s': %s\n"),
|
2004-12-13 16:49:56 +01:00
|
|
|
|
home, strerror (errno) );
|
2003-08-05 19:11:04 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (!opt.quiet)
|
|
|
|
|
log_info (_("directory `%s' created\n"), home);
|
|
|
|
|
create_private_keys_directory (home);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error (_("stat() failed for `%s': %s\n"), home, strerror (errno));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else if ( !S_ISDIR(statbuf.st_mode))
|
|
|
|
|
{
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error (_("can't use `%s' as home directory\n"), home);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
else /* exists and is a directory. */
|
|
|
|
|
{
|
|
|
|
|
create_private_keys_directory (home);
|
|
|
|
|
}
|
|
|
|
|
xfree (home);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
/* This is the worker for the ticker. It is called every few seconds
|
|
|
|
|
and may only do fast operations. */
|
|
|
|
|
static void
|
|
|
|
|
handle_tick (void)
|
|
|
|
|
{
|
2008-10-29 18:24:27 +01:00
|
|
|
|
static time_t last_minute;
|
|
|
|
|
|
|
|
|
|
if (!last_minute)
|
|
|
|
|
last_minute = time (NULL);
|
|
|
|
|
|
2005-06-03 15:57:24 +02:00
|
|
|
|
/* Check whether the scdaemon has died and cleanup in this case. */
|
2005-05-21 20:49:00 +02:00
|
|
|
|
agent_scd_check_aliveness ();
|
|
|
|
|
|
|
|
|
|
/* If we are running as a child of another process, check whether
|
2006-02-09 19:29:31 +01:00
|
|
|
|
the parent is still alive and shutdown if not. */
|
2005-04-20 21:19:24 +02:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
if (parent_pid != (pid_t)(-1))
|
|
|
|
|
{
|
|
|
|
|
if (kill (parent_pid, 0))
|
|
|
|
|
{
|
|
|
|
|
shutdown_pending = 2;
|
|
|
|
|
log_info ("parent process died - shutting down\n");
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
agent_exit (0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2008-10-29 18:24:27 +01:00
|
|
|
|
|
|
|
|
|
/* Code to be run every minute. */
|
|
|
|
|
if (last_minute + 60 <= time (NULL))
|
|
|
|
|
{
|
|
|
|
|
check_own_socket ();
|
|
|
|
|
last_minute = time (NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-11-27 09:01:19 +01:00
|
|
|
|
/* A global function which allows us to call the reload stuff from
|
|
|
|
|
other places too. This is only used when build for W32. */
|
2007-07-04 11:34:28 +02:00
|
|
|
|
void
|
|
|
|
|
agent_sighup_action (void)
|
|
|
|
|
{
|
2007-11-27 09:01:19 +01:00
|
|
|
|
log_info ("SIGHUP received - "
|
|
|
|
|
"re-reading configuration and flushing cache\n");
|
2007-07-04 11:34:28 +02:00
|
|
|
|
agent_flush_cache ();
|
|
|
|
|
reread_configuration ();
|
|
|
|
|
agent_reload_trustlist ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-11-27 09:01:19 +01:00
|
|
|
|
static void
|
|
|
|
|
agent_sigusr2_action (void)
|
|
|
|
|
{
|
|
|
|
|
if (opt.verbose)
|
2008-12-18 17:34:28 +01:00
|
|
|
|
log_info ("SIGUSR2 received - updating card event counter\n");
|
2007-11-27 09:01:19 +01:00
|
|
|
|
/* Nothing to check right now. We only increment a counter. */
|
|
|
|
|
bump_card_eventcounter ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void
|
|
|
|
|
handle_signal (int signo)
|
|
|
|
|
{
|
|
|
|
|
switch (signo)
|
|
|
|
|
{
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case SIGHUP:
|
2007-07-04 11:34:28 +02:00
|
|
|
|
agent_sighup_action ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGUSR1:
|
2005-05-21 20:49:00 +02:00
|
|
|
|
log_info ("SIGUSR1 received - printing internal information:\n");
|
2010-03-11 13:34:11 +01:00
|
|
|
|
/* Fixme: We need to see how to integrate pth dumping into our
|
|
|
|
|
logging system. */
|
|
|
|
|
/* pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); */
|
2005-06-07 21:09:18 +02:00
|
|
|
|
agent_query_dump_state ();
|
2005-06-03 15:57:24 +02:00
|
|
|
|
agent_scd_dump_state ();
|
2003-08-05 19:11:04 +02:00
|
|
|
|
break;
|
2004-04-21 16:43:51 +02:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
case SIGUSR2:
|
2007-11-27 09:01:19 +01:00
|
|
|
|
agent_sigusr2_action ();
|
2003-08-05 19:11:04 +02: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 ();
|
|
|
|
|
agent_exit (0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGINT:
|
|
|
|
|
log_info ("SIGINT received - immediate shutdown\n");
|
|
|
|
|
log_info( "%s %s stopped\n", strusage(11), strusage(13));
|
|
|
|
|
cleanup ();
|
|
|
|
|
agent_exit (0);
|
|
|
|
|
break;
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#endif
|
2003-08-05 19:11:04 +02:00
|
|
|
|
default:
|
|
|
|
|
log_info ("signal %d received - no action defined\n", signo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
/* Check the nonce on a new connection. This is a NOP unless we we
|
|
|
|
|
are using our Unix domain socket emulation under Windows. */
|
|
|
|
|
static int
|
|
|
|
|
check_nonce (ctrl_t ctrl, assuan_sock_nonce_t *nonce)
|
|
|
|
|
{
|
|
|
|
|
if (assuan_sock_check_nonce (ctrl->thread_startup.fd, nonce))
|
|
|
|
|
{
|
|
|
|
|
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 -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* This is the standard connection thread's main function. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void *
|
|
|
|
|
start_connection_thread (void *arg)
|
|
|
|
|
{
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl_t ctrl = arg;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
if (check_nonce (ctrl, &socket_nonce))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_init_default_ctrl (ctrl);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (opt.verbose)
|
2005-06-03 15:57:24 +02:00
|
|
|
|
log_info (_("handler 0x%lx for fd %d started\n"),
|
2008-05-27 14:03:50 +02:00
|
|
|
|
pth_thread_id (), FD2INT(ctrl->thread_startup.fd));
|
2004-05-11 21:11:53 +02:00
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (opt.verbose)
|
2005-06-03 15:57:24 +02:00
|
|
|
|
log_info (_("handler 0x%lx for fd %d terminated\n"),
|
2008-05-27 14:03:50 +02:00
|
|
|
|
pth_thread_id (), FD2INT(ctrl->thread_startup.fd));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_deinit_default_ctrl (ctrl);
|
|
|
|
|
xfree (ctrl);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
|
|
|
|
/* This is the ssh connection thread's main function. */
|
2005-01-26 23:20:21 +01:00
|
|
|
|
static void *
|
|
|
|
|
start_connection_thread_ssh (void *arg)
|
|
|
|
|
{
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl_t ctrl = arg;
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2007-10-01 16:48:39 +02:00
|
|
|
|
if (check_nonce (ctrl, &socket_nonce_ssh))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_init_default_ctrl (ctrl);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.verbose)
|
2005-06-03 15:57:24 +02:00
|
|
|
|
log_info (_("ssh handler 0x%lx for fd %d started\n"),
|
2008-05-27 14:03:50 +02:00
|
|
|
|
pth_thread_id (), FD2INT(ctrl->thread_startup.fd));
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
start_command_handler_ssh (ctrl, ctrl->thread_startup.fd);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (opt.verbose)
|
2005-06-03 15:57:24 +02:00
|
|
|
|
log_info (_("ssh handler 0x%lx for fd %d terminated\n"),
|
2008-05-27 14:03:50 +02:00
|
|
|
|
pth_thread_id (), FD2INT(ctrl->thread_startup.fd));
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2006-11-20 17:49:41 +01:00
|
|
|
|
agent_deinit_default_ctrl (ctrl);
|
|
|
|
|
xfree (ctrl);
|
2005-01-26 23:20:21 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2007-06-14 19:05:07 +02:00
|
|
|
|
/* Connection handler loop. Wait for connection requests and spawn a
|
2005-02-03 18:40:02 +01:00
|
|
|
|
thread after accepting a connection. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
static void
|
2007-10-01 16:48:39 +02:00
|
|
|
|
handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
|
2003-08-05 19:11:04 +02:00
|
|
|
|
{
|
|
|
|
|
pth_attr_t tattr;
|
2005-04-20 21:19:24 +02:00
|
|
|
|
pth_event_t ev, time_ev;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
sigset_t sigs;
|
|
|
|
|
int signo;
|
|
|
|
|
struct sockaddr_un paddr;
|
2005-02-03 18:40:02 +01:00
|
|
|
|
socklen_t plen;
|
2005-01-26 23:20:21 +01:00
|
|
|
|
fd_set fdset, read_fdset;
|
|
|
|
|
int ret;
|
2007-10-01 16:48:39 +02:00
|
|
|
|
gnupg_fd_t fd;
|
2007-07-04 11:34:28 +02:00
|
|
|
|
int nfd;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
|
tattr = pth_attr_new();
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
|
2004-07-22 11:37:36 +02:00
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM /* fixme */
|
2005-06-03 15:57:24 +02:00
|
|
|
|
/* Make sure that the signals we are going to handle are not blocked
|
2008-12-17 20:42:17 +01:00
|
|
|
|
and create an event object for them. We also set the default
|
|
|
|
|
action to ignore because we use an Pth event to get notified
|
|
|
|
|
about signals. This avoids that the default action is taken in
|
|
|
|
|
case soemthing goes wrong within Pth. The problem might also be
|
|
|
|
|
a Pth bug. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
sigemptyset (&sigs );
|
2008-12-17 20:42:17 +01:00
|
|
|
|
{
|
|
|
|
|
static const int mysigs[] = { SIGHUP, SIGUSR1, SIGUSR2, SIGINT, SIGTERM };
|
|
|
|
|
struct sigaction sa;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i=0; i < DIM (mysigs); i++)
|
|
|
|
|
{
|
|
|
|
|
sigemptyset (&sa.sa_mask);
|
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
|
|
|
sa.sa_flags = 0;
|
|
|
|
|
sigaction (mysigs[i], &sa, NULL);
|
|
|
|
|
|
|
|
|
|
sigaddset (&sigs, mysigs[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-03 15:57:24 +02:00
|
|
|
|
pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#else
|
2010-04-14 13:24:02 +02:00
|
|
|
|
# ifdef HAVE_W32CE_SYSTEM
|
2007-11-27 09:01:19 +01:00
|
|
|
|
/* Use a dummy event. */
|
2007-07-04 11:34:28 +02:00
|
|
|
|
sigs = 0;
|
|
|
|
|
ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
|
2010-04-14 13:24:02 +02:00
|
|
|
|
# else
|
|
|
|
|
sigs = 0;
|
|
|
|
|
ev = pth_event (PTH_EVENT_HANDLE, get_agent_scd_notify_event ());
|
|
|
|
|
signo = 0;
|
2007-11-27 09:01:19 +01:00
|
|
|
|
# endif
|
2004-12-13 16:49:56 +01:00
|
|
|
|
#endif
|
2005-04-20 21:19:24 +02:00
|
|
|
|
time_ev = NULL;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
2005-01-26 23:20:21 +01:00
|
|
|
|
FD_ZERO (&fdset);
|
2007-10-01 16:48:39 +02:00
|
|
|
|
FD_SET (FD2INT (listen_fd), &fdset);
|
|
|
|
|
nfd = FD2INT (listen_fd);
|
|
|
|
|
if (listen_fd_ssh != GNUPG_INVALID_FD)
|
2007-07-04 11:34:28 +02:00
|
|
|
|
{
|
2007-10-01 16:48:39 +02:00
|
|
|
|
FD_SET ( FD2INT(listen_fd_ssh), &fdset);
|
|
|
|
|
if (FD2INT (listen_fd_ssh) > nfd)
|
|
|
|
|
nfd = FD2INT (listen_fd_ssh);
|
2007-07-04 11:34:28 +02:00
|
|
|
|
}
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
for (;;)
|
|
|
|
|
{
|
2008-12-17 20:42:17 +01:00
|
|
|
|
/* Make sure that our signals are not blocked. */
|
|
|
|
|
pth_sigmask (SIG_UNBLOCK, &sigs, NULL);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
|
2008-12-17 20:42:17 +01:00
|
|
|
|
/* Shutdown test. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
if (shutdown_pending)
|
|
|
|
|
{
|
|
|
|
|
if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1)
|
|
|
|
|
break; /* ready */
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
/* Do not accept new connections but keep on running the
|
|
|
|
|
loop to cope with the timer events. */
|
|
|
|
|
FD_ZERO (&fdset);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
2008-12-08 20:10:42 +01:00
|
|
|
|
/* Create a timeout event if needed. To help with power saving
|
|
|
|
|
we syncronize the ticks to the next full second. */
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (!time_ev)
|
2008-12-08 20:10:42 +01:00
|
|
|
|
{
|
|
|
|
|
pth_time_t nexttick;
|
|
|
|
|
|
|
|
|
|
nexttick = pth_timeout (TIMERTICK_INTERVAL, 0);
|
|
|
|
|
if (nexttick.tv_usec > 10) /* Use a 10 usec threshhold. */
|
|
|
|
|
{
|
|
|
|
|
nexttick.tv_sec++;
|
|
|
|
|
nexttick.tv_usec = 0;
|
|
|
|
|
}
|
|
|
|
|
time_ev = pth_event (PTH_EVENT_TIME, nexttick);
|
|
|
|
|
}
|
2005-04-20 21:19:24 +02:00
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
/* POSIX says that fd_set should be implemented as a structure,
|
|
|
|
|
thus a simple assignment is fine to copy the entire set. */
|
2005-01-26 23:20:21 +01:00
|
|
|
|
read_fdset = fdset;
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_concat (ev, time_ev, NULL);
|
2007-07-04 11:34:28 +02:00
|
|
|
|
ret = pth_select_ev (nfd+1, &read_fdset, NULL, NULL, NULL, ev);
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_isolate (time_ev);
|
|
|
|
|
|
2005-01-26 23:20:21 +01:00
|
|
|
|
if (ret == -1)
|
|
|
|
|
{
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (pth_event_occurred (ev)
|
|
|
|
|
|| (time_ev && pth_event_occurred (time_ev)))
|
2005-02-24 18:36:11 +01:00
|
|
|
|
{
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (pth_event_occurred (ev))
|
2007-11-27 09:01:19 +01:00
|
|
|
|
{
|
|
|
|
|
#if defined(HAVE_W32_SYSTEM) && defined(PTH_EVENT_HANDLE)
|
|
|
|
|
agent_sigusr2_action ();
|
|
|
|
|
#else
|
|
|
|
|
handle_signal (signo);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (time_ev && pth_event_occurred (time_ev))
|
|
|
|
|
{
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
|
|
|
|
time_ev = NULL;
|
|
|
|
|
handle_tick ();
|
|
|
|
|
}
|
2005-02-24 18:36:11 +01:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error (_("pth_select failed: %s - waiting 1s\n"),
|
|
|
|
|
strerror (errno));
|
|
|
|
|
pth_sleep (1);
|
2008-12-17 20:42:17 +01:00
|
|
|
|
continue;
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
|
|
|
|
if (pth_event_occurred (ev))
|
|
|
|
|
{
|
2007-11-27 09:01:19 +01:00
|
|
|
|
#if defined(HAVE_W32_SYSTEM) && defined(PTH_EVENT_HANDLE)
|
|
|
|
|
agent_sigusr2_action ();
|
|
|
|
|
#else
|
2005-02-03 18:40:02 +01:00
|
|
|
|
handle_signal (signo);
|
2007-11-27 09:01:19 +01:00
|
|
|
|
#endif
|
2005-02-03 18:40:02 +01:00
|
|
|
|
}
|
2005-01-26 23:20:21 +01:00
|
|
|
|
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (time_ev && pth_event_occurred (time_ev))
|
|
|
|
|
{
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
|
|
|
|
time_ev = NULL;
|
|
|
|
|
handle_tick ();
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-17 20:42:17 +01:00
|
|
|
|
|
2005-06-03 15:57:24 +02:00
|
|
|
|
/* We now might create new threads and because we don't want any
|
2007-07-04 11:34:28 +02:00
|
|
|
|
signals (as we are handling them here) to be delivered to a
|
|
|
|
|
new thread. Thus we need to block those signals. */
|
2008-12-17 20:42:17 +01:00
|
|
|
|
pth_sigmask (SIG_BLOCK, &sigs, NULL);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
if (!shutdown_pending && FD_ISSET (FD2INT (listen_fd), &read_fdset))
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl_t ctrl;
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
plen = sizeof paddr;
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd = INT2FD (pth_accept (FD2INT(listen_fd),
|
|
|
|
|
(struct sockaddr *)&paddr, &plen));
|
|
|
|
|
if (fd == GNUPG_INVALID_FD)
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error ("accept failed: %s\n", strerror (errno));
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2006-11-20 17:49:41 +01:00
|
|
|
|
else if ( !(ctrl = xtrycalloc (1, sizeof *ctrl)) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating connection control data: %s\n",
|
|
|
|
|
strerror (errno) );
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
}
|
2009-07-07 12:02:41 +02:00
|
|
|
|
else if ( !(ctrl->session_env = session_env_new ()) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating session environment block: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
xfree (ctrl);
|
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
}
|
2005-06-03 15:57:24 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char threadname[50];
|
2006-11-20 17:49:41 +01:00
|
|
|
|
|
2005-06-03 15:57:24 +02:00
|
|
|
|
snprintf (threadname, sizeof threadname-1,
|
2007-10-01 16:48:39 +02:00
|
|
|
|
"conn fd=%d (gpg)", FD2INT(fd));
|
2005-06-03 15:57:24 +02:00
|
|
|
|
threadname[sizeof threadname -1] = 0;
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, threadname);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl->thread_startup.fd = fd;
|
|
|
|
|
if (!pth_spawn (tattr, start_connection_thread, ctrl))
|
2005-06-03 15:57:24 +02:00
|
|
|
|
{
|
|
|
|
|
log_error ("error spawning connection handler: %s\n",
|
|
|
|
|
strerror (errno) );
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
xfree (ctrl);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2005-02-03 18:40:02 +01:00
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
if (!shutdown_pending && listen_fd_ssh != GNUPG_INVALID_FD
|
2007-10-01 16:48:39 +02:00
|
|
|
|
&& FD_ISSET ( FD2INT (listen_fd_ssh), &read_fdset))
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl_t ctrl;
|
|
|
|
|
|
2005-02-03 18:40:02 +01:00
|
|
|
|
plen = sizeof paddr;
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd = INT2FD(pth_accept (FD2INT(listen_fd_ssh),
|
|
|
|
|
(struct sockaddr *)&paddr, &plen));
|
|
|
|
|
if (fd == GNUPG_INVALID_FD)
|
2005-01-26 23:20:21 +01:00
|
|
|
|
{
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_error ("accept failed for ssh: %s\n", strerror (errno));
|
2005-01-26 23:20:21 +01:00
|
|
|
|
}
|
2006-11-20 17:49:41 +01:00
|
|
|
|
else if ( !(ctrl = xtrycalloc (1, sizeof *ctrl)) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating connection control data: %s\n",
|
|
|
|
|
strerror (errno) );
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
}
|
2009-07-07 12:02:41 +02:00
|
|
|
|
else if ( !(ctrl->session_env = session_env_new ()) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating session environment block: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
xfree (ctrl);
|
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
}
|
2005-06-03 15:57:24 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char threadname[50];
|
2006-11-20 17:49:41 +01:00
|
|
|
|
|
|
|
|
|
agent_init_default_ctrl (ctrl);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
snprintf (threadname, sizeof threadname-1,
|
2007-10-01 16:48:39 +02:00
|
|
|
|
"conn fd=%d (ssh)", FD2INT(fd));
|
2005-06-03 15:57:24 +02:00
|
|
|
|
threadname[sizeof threadname -1] = 0;
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, threadname);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
ctrl->thread_startup.fd = fd;
|
|
|
|
|
if (!pth_spawn (tattr, start_connection_thread_ssh, ctrl) )
|
2005-06-03 15:57:24 +02:00
|
|
|
|
{
|
|
|
|
|
log_error ("error spawning ssh connection handler: %s\n",
|
|
|
|
|
strerror (errno) );
|
2007-10-01 16:48:39 +02:00
|
|
|
|
assuan_sock_close (fd);
|
2006-11-20 17:49:41 +01:00
|
|
|
|
xfree (ctrl);
|
2005-06-03 15:57:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2007-10-01 16:48:39 +02:00
|
|
|
|
fd = GNUPG_INVALID_FD;
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pth_event_free (ev, PTH_FREE_ALL);
|
2005-04-20 21:19:24 +02:00
|
|
|
|
if (time_ev)
|
|
|
|
|
pth_event_free (time_ev, PTH_FREE_ALL);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
cleanup ();
|
2005-02-03 18:40:02 +01:00
|
|
|
|
log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
|
2003-08-05 19:11:04 +02:00
|
|
|
|
}
|
2004-09-09 09:27:57 +02:00
|
|
|
|
|
|
|
|
|
|
2008-10-29 18:24:27 +01:00
|
|
|
|
|
|
|
|
|
/* Helper for check_own_socket. */
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
static gpg_error_t
|
2008-10-29 18:24:27 +01:00
|
|
|
|
check_own_socket_pid_cb (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
|
|
|
|
membuf_t *mb = opaque;
|
|
|
|
|
put_membuf (mb, buffer, length);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The thread running the actual check. We need to run this in a
|
|
|
|
|
separate thread so that check_own_thread can be called from the
|
|
|
|
|
timer tick. */
|
|
|
|
|
static void *
|
|
|
|
|
check_own_socket_thread (void *arg)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *sockname = arg;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
assuan_context_t ctx = NULL;
|
2008-10-29 18:24:27 +01:00
|
|
|
|
membuf_t mb;
|
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
|
|
check_own_socket_running++;
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't allocate assuan context: %s\n", gpg_strerror (rc));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
2009-11-05 13:06:45 +01:00
|
|
|
|
rc = assuan_socket_connect (ctx, sockname, (pid_t)(-1), 0);
|
2008-10-29 18:24:27 +01:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't connect my own socket: %s\n", gpg_strerror (rc));
|
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_membuf (&mb, 100);
|
|
|
|
|
rc = assuan_transact (ctx, "GETINFO pid", check_own_socket_pid_cb, &mb,
|
|
|
|
|
NULL, NULL, NULL, NULL);
|
|
|
|
|
put_membuf (&mb, "", 1);
|
|
|
|
|
buffer = get_membuf (&mb, NULL);
|
|
|
|
|
if (rc || !buffer)
|
|
|
|
|
{
|
|
|
|
|
log_error ("sending command \"%s\" to my own socket failed: %s\n",
|
|
|
|
|
"GETINFO pid", gpg_strerror (rc));
|
|
|
|
|
rc = 1;
|
|
|
|
|
}
|
|
|
|
|
else if ( (pid_t)strtoul (buffer, NULL, 10) != getpid ())
|
|
|
|
|
{
|
|
|
|
|
log_error ("socket is now serviced by another server\n");
|
|
|
|
|
rc = 1;
|
|
|
|
|
}
|
2009-03-03 10:02:58 +01:00
|
|
|
|
else if (opt.verbose > 1)
|
2008-10-29 18:24:27 +01:00
|
|
|
|
log_error ("socket is still served by this server\n");
|
|
|
|
|
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
|
|
|
|
|
leave:
|
2010-05-03 17:23:10 +02:00
|
|
|
|
xfree (sockname);
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
if (ctx)
|
|
|
|
|
assuan_release (ctx);
|
2008-10-29 18:24:27 +01:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
/* We may not remove the socket as it is now in use by another
|
|
|
|
|
server. Setting the name to empty does this. */
|
|
|
|
|
if (socket_name)
|
|
|
|
|
*socket_name = 0;
|
|
|
|
|
if (socket_name_ssh)
|
|
|
|
|
*socket_name_ssh = 0;
|
|
|
|
|
shutdown_pending = 2;
|
|
|
|
|
log_info ("this process is useless - shutting down\n");
|
|
|
|
|
}
|
|
|
|
|
check_own_socket_running--;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check whether we are still listening on our own socket. In case
|
|
|
|
|
another gpg-agent process started after us has taken ownership of
|
2010-05-03 17:23:10 +02:00
|
|
|
|
our socket, we woulf linger around without any real task. Thus we
|
2008-10-29 18:24:27 +01:00
|
|
|
|
better check once in a while whether we are really needed. */
|
|
|
|
|
static void
|
|
|
|
|
check_own_socket (void)
|
|
|
|
|
{
|
|
|
|
|
char *sockname;
|
|
|
|
|
pth_attr_t tattr;
|
|
|
|
|
|
2010-05-11 20:00:31 +02:00
|
|
|
|
if (!opt.use_standard_socket)
|
2008-10-29 18:24:27 +01:00
|
|
|
|
return; /* This check makes only sense in standard socket mode. */
|
|
|
|
|
|
|
|
|
|
if (check_own_socket_running || shutdown_pending)
|
|
|
|
|
return; /* Still running or already shutting down. */
|
|
|
|
|
|
|
|
|
|
sockname = make_filename (opt.homedir, "S.gpg-agent", NULL);
|
|
|
|
|
if (!sockname)
|
|
|
|
|
return; /* Out of memory. */
|
|
|
|
|
|
|
|
|
|
tattr = pth_attr_new();
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024);
|
2009-02-25 11:58:56 +01:00
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, "check-own-socket");
|
2008-10-29 18:24:27 +01:00
|
|
|
|
|
|
|
|
|
if (!pth_spawn (tattr, check_own_socket_thread, sockname))
|
|
|
|
|
log_error ("error spawning check_own_socket_thread: %s\n",
|
|
|
|
|
strerror (errno) );
|
|
|
|
|
pth_attr_destroy (tattr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-09-09 09:27:57 +02:00
|
|
|
|
/* Figure out whether an agent is available and running. Prints an
|
2007-12-03 15:02:06 +01:00
|
|
|
|
error if not. If SILENT is true, no messages are printed. Usually
|
2007-06-21 20:44:48 +02:00
|
|
|
|
started with MODE 0. Returns 0 if the agent is running. */
|
2004-12-20 17:17:25 +01:00
|
|
|
|
static int
|
2007-06-21 20:44:48 +02:00
|
|
|
|
check_for_running_agent (int silent, int mode)
|
2004-09-09 09:27:57 +02:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *infostr, *p;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
assuan_context_t ctx = NULL;
|
2004-09-09 09:27:57 +02:00
|
|
|
|
int prot, pid;
|
|
|
|
|
|
2004-12-20 17:17:25 +01:00
|
|
|
|
if (!mode)
|
2004-09-09 09:27:57 +02:00
|
|
|
|
{
|
2004-12-20 17:17:25 +01:00
|
|
|
|
infostr = getenv ("GPG_AGENT_INFO");
|
|
|
|
|
if (!infostr || !*infostr)
|
|
|
|
|
{
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!check_for_running_agent (silent, 1))
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return 0; /* Okay, its running on the standard socket. */
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!silent)
|
|
|
|
|
log_error (_("no gpg-agent running in this session\n"));
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-09-09 09:27:57 +02:00
|
|
|
|
|
2004-12-20 17:17:25 +01:00
|
|
|
|
infostr = xstrdup (infostr);
|
|
|
|
|
if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
|
|
|
|
|
{
|
|
|
|
|
xfree (infostr);
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!check_for_running_agent (silent, 1))
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return 0; /* Okay, its running on the standard socket. */
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!silent)
|
|
|
|
|
log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-09-09 09:27:57 +02:00
|
|
|
|
|
2004-12-20 17:17:25 +01:00
|
|
|
|
*p++ = 0;
|
|
|
|
|
pid = atoi (p);
|
|
|
|
|
while (*p && *p != PATHSEP_C)
|
|
|
|
|
p++;
|
|
|
|
|
prot = *p? atoi (p+1) : 0;
|
|
|
|
|
if (prot != 1)
|
|
|
|
|
{
|
|
|
|
|
xfree (infostr);
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!silent)
|
|
|
|
|
log_error (_("gpg-agent protocol version %d is not supported\n"),
|
|
|
|
|
prot);
|
|
|
|
|
if (!check_for_running_agent (silent, 1))
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return 0; /* Okay, its running on the standard socket. */
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else /* MODE != 0 */
|
2004-09-09 09:27:57 +02:00
|
|
|
|
{
|
2004-12-20 17:17:25 +01:00
|
|
|
|
infostr = make_filename (opt.homedir, "S.gpg-agent", NULL);
|
2005-02-03 18:40:02 +01:00
|
|
|
|
pid = (pid_t)(-1);
|
2004-09-09 09:27:57 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
rc = assuan_new (&ctx);
|
|
|
|
|
if (! rc)
|
2009-11-05 13:06:45 +01:00
|
|
|
|
rc = assuan_socket_connect (ctx, infostr, pid, 0);
|
2004-09-09 09:27:57 +02:00
|
|
|
|
xfree (infostr);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!mode && !check_for_running_agent (silent, 1))
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return 0; /* Okay, its running on the standard socket. */
|
|
|
|
|
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!mode && !silent)
|
2006-09-06 18:35:52 +02:00
|
|
|
|
log_error ("can't connect to the agent: %s\n", gpg_strerror (rc));
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
|
|
|
|
|
if (ctx)
|
|
|
|
|
assuan_release (ctx);
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return -1;
|
2004-09-09 09:27:57 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-06-21 20:44:48 +02:00
|
|
|
|
if (!opt.quiet && !silent)
|
2004-09-09 09:27:57 +02:00
|
|
|
|
log_info ("gpg-agent running and available\n");
|
|
|
|
|
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 02:01:25 +02:00
|
|
|
|
assuan_release (ctx);
|
2004-12-20 17:17:25 +01:00
|
|
|
|
return 0;
|
2004-09-09 09:27:57 +02:00
|
|
|
|
}
|