2004-03-06 20:11:19 +00:00
|
|
|
/* asshelp.c - Helper functions for Assuan
|
2010-05-03 15:23:10 +00:00
|
|
|
* Copyright (C) 2002, 2004, 2007, 2009, 2010 Free Software Foundation, Inc.
|
2004-03-06 20:11:19 +00:00
|
|
|
*
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
*
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2004-03-06 20:11:19 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2004-03-06 20:11:19 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
|
|
#include <locale.h>
|
|
|
|
#endif
|
|
|
|
|
2010-03-11 12:34:11 +00:00
|
|
|
#define JNLIB_NEED_LOG_LOGV
|
2007-06-21 18:44:48 +00:00
|
|
|
#include "i18n.h"
|
2004-03-06 20:11:19 +00:00
|
|
|
#include "util.h"
|
2007-06-21 18:44:48 +00:00
|
|
|
#include "exechelp.h"
|
|
|
|
#include "sysutils.h"
|
2011-02-04 12:57:53 +01:00
|
|
|
#include "status.h"
|
2004-03-06 20:11:19 +00:00
|
|
|
#include "asshelp.h"
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
/* The type we use for lock_agent_spawning. */
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2010-08-16 11:03:43 +00:00
|
|
|
# define lock_spawn_t HANDLE
|
2010-05-03 15:23:10 +00:00
|
|
|
#else
|
2010-08-16 11:03:43 +00:00
|
|
|
# define lock_spawn_t dotlock_t
|
2010-05-03 15:23:10 +00:00
|
|
|
#endif
|
|
|
|
|
2010-11-23 18:46:41 +00:00
|
|
|
/* The time we wait until the agent or the dirmngr are ready for
|
2011-02-04 12:57:53 +01:00
|
|
|
operation after we started them before giving up. */
|
2010-11-23 18:46:41 +00:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
# define SECS_TO_WAIT_FOR_AGENT 30
|
|
|
|
# define SECS_TO_WAIT_FOR_DIRMNGR 30
|
|
|
|
#else
|
|
|
|
# define SECS_TO_WAIT_FOR_AGENT 5
|
|
|
|
# define SECS_TO_WAIT_FOR_DIRMNGR 5
|
|
|
|
#endif
|
2010-03-11 12:34:11 +00:00
|
|
|
|
2010-04-14 11:24:02 +00:00
|
|
|
/* A bitfield that specifies the assuan categories to log. This is
|
|
|
|
identical to the default log handler of libassuan. We need to do
|
|
|
|
it ourselves because we use a custom log handler and want to use
|
|
|
|
the same assuan variables to select the categories to log. */
|
|
|
|
static int log_cats;
|
|
|
|
#define TEST_LOG_CAT(x) (!! (log_cats & (1 << (x - 1))))
|
|
|
|
|
|
|
|
|
2010-03-11 12:34:11 +00:00
|
|
|
static int
|
|
|
|
my_libassuan_log_handler (assuan_context_t ctx, void *hook,
|
|
|
|
unsigned int cat, const char *msg)
|
|
|
|
{
|
|
|
|
unsigned int dbgval;
|
|
|
|
|
2010-03-15 11:15:45 +00:00
|
|
|
(void)ctx;
|
|
|
|
|
2010-04-14 11:24:02 +00:00
|
|
|
if (! TEST_LOG_CAT (cat))
|
|
|
|
return 0;
|
|
|
|
|
2010-03-11 12:34:11 +00:00
|
|
|
dbgval = hook? *(unsigned int*)hook : 0;
|
|
|
|
if (!(dbgval & 1024))
|
|
|
|
return 0; /* Assuan debugging is not enabled. */
|
|
|
|
|
|
|
|
if (msg)
|
|
|
|
log_string (JNLIB_LOG_DEBUG, msg);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Setup libassuan to use our own logging functions. Should be used
|
|
|
|
early at startup. */
|
|
|
|
void
|
|
|
|
setup_libassuan_logging (unsigned int *debug_var_address)
|
|
|
|
{
|
2010-04-14 11:24:02 +00:00
|
|
|
char *flagstr;
|
|
|
|
|
|
|
|
flagstr = getenv ("ASSUAN_DEBUG");
|
|
|
|
if (flagstr)
|
|
|
|
log_cats = atoi (flagstr);
|
|
|
|
else /* Default to log the control channel. */
|
|
|
|
log_cats = (1 << (ASSUAN_LOG_CONTROL - 1));
|
2010-03-11 12:34:11 +00:00
|
|
|
assuan_set_log_cb (my_libassuan_log_handler, debug_var_address);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
static gpg_error_t
|
2004-12-18 10:22:10 +00:00
|
|
|
send_one_option (assuan_context_t ctx, gpg_err_source_t errsource,
|
2009-07-07 10:02:41 +00:00
|
|
|
const char *name, const char *value, int use_putenv)
|
2004-12-15 14:15:54 +00:00
|
|
|
{
|
|
|
|
gpg_error_t err;
|
|
|
|
char *optstr;
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
(void)errsource;
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
if (!value || !*value)
|
|
|
|
err = 0; /* Avoid sending empty strings. */
|
2011-02-04 12:57:53 +01:00
|
|
|
else if (asprintf (&optstr, "OPTION %s%s=%s",
|
2009-07-07 10:02:41 +00:00
|
|
|
use_putenv? "putenv=":"", name, value) < 0)
|
2006-09-14 16:50:33 +00:00
|
|
|
err = gpg_error_from_syserror ();
|
2004-12-15 14:15:54 +00:00
|
|
|
else
|
|
|
|
{
|
2006-09-06 16:35:52 +00:00
|
|
|
err = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL);
|
2008-05-27 12:03:50 +00:00
|
|
|
xfree (optstr);
|
2004-12-15 14:15:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-11-19 16:03:50 +00:00
|
|
|
/* Send the assuan commands pertaining to the pinentry environment. The
|
2004-12-15 14:15:54 +00:00
|
|
|
OPT_* arguments are optional and may be used to override the
|
2004-03-06 20:11:19 +00:00
|
|
|
defaults taken from the current locale. */
|
|
|
|
gpg_error_t
|
|
|
|
send_pinentry_environment (assuan_context_t ctx,
|
2004-12-18 10:22:10 +00:00
|
|
|
gpg_err_source_t errsource,
|
2004-03-06 20:11:19 +00:00
|
|
|
const char *opt_lc_ctype,
|
2007-11-19 16:03:50 +00:00
|
|
|
const char *opt_lc_messages,
|
2009-07-07 10:02:41 +00:00
|
|
|
session_env_t session_env)
|
|
|
|
|
2004-03-06 20:11:19 +00:00
|
|
|
{
|
2004-12-15 14:15:54 +00:00
|
|
|
gpg_error_t err = 0;
|
2010-03-22 12:46:05 +00:00
|
|
|
#if defined(HAVE_SETLOCALE)
|
2011-02-04 12:57:53 +01:00
|
|
|
char *old_lc = NULL;
|
2010-03-22 12:46:05 +00:00
|
|
|
#endif
|
2004-03-06 20:11:19 +00:00
|
|
|
char *dft_lc = NULL;
|
2009-07-07 10:02:41 +00:00
|
|
|
const char *dft_ttyname;
|
|
|
|
int iterator;
|
|
|
|
const char *name, *assname, *value;
|
|
|
|
int is_default;
|
2004-03-06 20:11:19 +00:00
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
iterator = 0;
|
2009-07-07 10:02:41 +00:00
|
|
|
while ((name = session_env_list_stdenvnames (&iterator, &assname)))
|
2004-03-06 20:11:19 +00:00
|
|
|
{
|
2009-07-07 10:02:41 +00:00
|
|
|
value = session_env_getenv_or_default (session_env, name, NULL);
|
|
|
|
if (!value)
|
|
|
|
continue;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
2009-07-07 10:02:41 +00:00
|
|
|
if (assname)
|
|
|
|
err = send_one_option (ctx, errsource, assname, value, 0);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
err = send_one_option (ctx, errsource, name, value, 1);
|
|
|
|
if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
|
|
|
|
err = 0; /* Server too old; can't pass the new envvars. */
|
|
|
|
}
|
2004-12-15 14:15:54 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
2004-12-15 14:15:54 +00:00
|
|
|
|
2009-07-07 10:02:41 +00:00
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
dft_ttyname = session_env_getenv_or_default (session_env, "GPG_TTY",
|
2009-07-07 10:02:41 +00:00
|
|
|
&is_default);
|
|
|
|
if (dft_ttyname && !is_default)
|
|
|
|
dft_ttyname = NULL; /* We need the default value. */
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
|
|
/* Send the value for LC_CTYPE. */
|
2004-03-06 20:11:19 +00:00
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
|
|
|
|
old_lc = setlocale (LC_CTYPE, NULL);
|
|
|
|
if (old_lc)
|
|
|
|
{
|
2008-05-27 12:03:50 +00:00
|
|
|
old_lc = xtrystrdup (old_lc);
|
2004-03-06 20:11:19 +00:00
|
|
|
if (!old_lc)
|
2006-09-14 16:50:33 +00:00
|
|
|
return gpg_error_from_syserror ();
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
dft_lc = setlocale (LC_CTYPE, "");
|
|
|
|
#endif
|
|
|
|
if (opt_lc_ctype || (dft_ttyname && dft_lc))
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
err = send_one_option (ctx, errsource, "lc-ctype",
|
2009-07-07 10:02:41 +00:00
|
|
|
opt_lc_ctype ? opt_lc_ctype : dft_lc, 0);
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
|
|
|
|
if (old_lc)
|
|
|
|
{
|
|
|
|
setlocale (LC_CTYPE, old_lc);
|
2008-05-27 12:03:50 +00:00
|
|
|
xfree (old_lc);
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
2004-12-15 14:15:54 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Send the value for LC_MESSAGES. */
|
2004-03-06 20:11:19 +00:00
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
|
|
|
|
old_lc = setlocale (LC_MESSAGES, NULL);
|
|
|
|
if (old_lc)
|
|
|
|
{
|
2008-05-27 12:03:50 +00:00
|
|
|
old_lc = xtrystrdup (old_lc);
|
2004-03-06 20:11:19 +00:00
|
|
|
if (!old_lc)
|
2006-09-14 16:50:33 +00:00
|
|
|
return gpg_error_from_syserror ();
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
dft_lc = setlocale (LC_MESSAGES, "");
|
|
|
|
#endif
|
|
|
|
if (opt_lc_messages || (dft_ttyname && dft_lc))
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
err = send_one_option (ctx, errsource, "lc-messages",
|
2009-07-07 10:02:41 +00:00
|
|
|
opt_lc_messages ? opt_lc_messages : dft_lc, 0);
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
|
|
|
|
if (old_lc)
|
|
|
|
{
|
|
|
|
setlocale (LC_MESSAGES, old_lc);
|
2008-05-27 12:03:50 +00:00
|
|
|
xfree (old_lc);
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
2004-12-15 14:15:54 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
2004-03-06 20:11:19 +00:00
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
return 0;
|
2004-03-06 20:11:19 +00:00
|
|
|
}
|
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
/* Lock a spawning process. The caller needs to provide the address
|
|
|
|
of a variable to store the lock information and the name or the
|
|
|
|
process. */
|
2010-05-03 15:23:10 +00:00
|
|
|
static gpg_error_t
|
2010-12-17 16:55:13 +00:00
|
|
|
lock_spawning (lock_spawn_t *lock, const char *homedir, const char *name,
|
|
|
|
int verbose)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
int waitrc;
|
2010-12-17 16:55:13 +00:00
|
|
|
int timeout = (!strcmp (name, "agent")
|
|
|
|
? SECS_TO_WAIT_FOR_AGENT
|
|
|
|
: SECS_TO_WAIT_FOR_DIRMNGR);
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
(void)homedir; /* Not required. */
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
*lock = CreateMutexW
|
2010-08-16 11:03:43 +00:00
|
|
|
(NULL, FALSE,
|
|
|
|
!strcmp (name, "agent")? L"GnuPG_spawn_agent_sentinel":
|
|
|
|
!strcmp (name, "dirmngr")? L"GnuPG_spawn_dirmngr_sentinel":
|
|
|
|
/* */ L"GnuPG_spawn_unknown_sentinel");
|
2010-05-03 15:23:10 +00:00
|
|
|
if (!*lock)
|
|
|
|
{
|
2010-08-16 11:03:43 +00:00
|
|
|
log_error ("failed to create the spawn_%s mutex: %s\n",
|
|
|
|
name, w32_strerror (-1));
|
2010-05-03 15:23:10 +00:00
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
}
|
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
retry:
|
|
|
|
waitrc = WaitForSingleObject (*lock, 1000);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (waitrc == WAIT_OBJECT_0)
|
|
|
|
return 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
if (waitrc == WAIT_TIMEOUT && timeout)
|
|
|
|
{
|
|
|
|
timeout--;
|
|
|
|
if (verbose)
|
|
|
|
log_info ("another process is trying to start the %s ... (%ds)\n",
|
|
|
|
name, timeout);
|
|
|
|
goto retry;
|
|
|
|
}
|
2010-05-03 15:23:10 +00:00
|
|
|
if (waitrc == WAIT_TIMEOUT)
|
2010-08-16 11:03:43 +00:00
|
|
|
log_info ("error waiting for the spawn_%s mutex: timeout\n", name);
|
2010-05-03 15:23:10 +00:00
|
|
|
else
|
2011-02-04 12:57:53 +01:00
|
|
|
log_info ("error waiting for the spawn_%s mutex: (code=%d) %s\n",
|
2010-08-16 11:03:43 +00:00
|
|
|
name, waitrc, w32_strerror (-1));
|
2010-05-03 15:23:10 +00:00
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
|
|
|
char *fname;
|
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
(void)verbose;
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
*lock = NULL;
|
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
fname = make_filename
|
|
|
|
(homedir,
|
|
|
|
!strcmp (name, "agent")? "gnupg_spawn_agent_sentinel":
|
|
|
|
!strcmp (name, "dirmngr")? "gnupg_spawn_dirmngr_sentinel":
|
|
|
|
/* */ "gnupg_spawn_unknown_sentinel",
|
|
|
|
NULL);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (!fname)
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
|
|
|
*lock = create_dotlock (fname);
|
|
|
|
xfree (fname);
|
|
|
|
if (!*lock)
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
|
|
|
/* FIXME: We should use a timeout of 5000 here - however
|
|
|
|
make_dotlock does not yet support values other than -1 and 0. */
|
|
|
|
if (make_dotlock (*lock, -1))
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Unlock the spawning process. */
|
|
|
|
static void
|
2010-08-16 11:03:43 +00:00
|
|
|
unlock_spawning (lock_spawn_t *lock, const char *name)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
|
|
|
if (*lock)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
if (!ReleaseMutex (*lock))
|
2010-08-16 11:03:43 +00:00
|
|
|
log_error ("failed to release the spawn_%s mutex: %s\n",
|
|
|
|
name, w32_strerror (-1));
|
2010-05-03 15:23:10 +00:00
|
|
|
CloseHandle (*lock);
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2010-08-16 11:03:43 +00:00
|
|
|
(void)name;
|
2010-05-03 15:23:10 +00:00
|
|
|
destroy_dotlock (*lock);
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
|
|
|
*lock = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
/* Try to connect to the agent via socket or fork it off and work by
|
|
|
|
pipes. Handle the server's initial greeting. Returns a new assuan
|
|
|
|
context at R_CTX or an error code. */
|
|
|
|
gpg_error_t
|
|
|
|
start_new_gpg_agent (assuan_context_t *r_ctx,
|
|
|
|
gpg_err_source_t errsource,
|
|
|
|
const char *homedir,
|
|
|
|
const char *agent_program,
|
|
|
|
const char *opt_lc_ctype,
|
|
|
|
const char *opt_lc_messages,
|
2009-07-07 10:02:41 +00:00
|
|
|
session_env_t session_env,
|
2007-06-21 18:44:48 +00:00
|
|
|
int verbose, int debug,
|
|
|
|
gpg_error_t (*status_cb)(ctrl_t, int, ...),
|
|
|
|
ctrl_t status_cb_arg)
|
|
|
|
{
|
|
|
|
/* If we ever failed to connect via a socket we will force the use
|
|
|
|
of the pipe based server for the lifetime of the process. */
|
|
|
|
static int force_pipe_server = 0;
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
gpg_error_t err = 0;
|
2007-06-21 18:44:48 +00:00
|
|
|
char *infostr, *p;
|
|
|
|
assuan_context_t ctx;
|
2010-11-23 18:46:41 +00:00
|
|
|
int did_success_msg = 0;
|
2007-06-21 18:44:48 +00:00
|
|
|
|
|
|
|
*r_ctx = NULL;
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
err = assuan_new (&ctx);
|
|
|
|
if (err)
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
{
|
2010-05-03 15:23:10 +00:00
|
|
|
log_error ("error allocating assuan context: %s\n", gpg_strerror (err));
|
|
|
|
return err;
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
}
|
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
restart:
|
|
|
|
infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
|
|
|
|
if (!infostr || !*infostr)
|
|
|
|
{
|
|
|
|
char *sockname;
|
2010-05-03 15:23:10 +00:00
|
|
|
const char *argv[3];
|
|
|
|
pid_t pid;
|
|
|
|
int excode;
|
2007-06-21 18:44:48 +00:00
|
|
|
|
|
|
|
/* First check whether we can connect at the standard
|
|
|
|
socket. */
|
|
|
|
sockname = make_filename (homedir, "S.gpg-agent", NULL);
|
2010-05-03 15:23:10 +00:00
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
2007-06-21 18:44:48 +00:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
if (err)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
|
|
|
/* With no success start a new server. */
|
2010-08-16 11:03:43 +00:00
|
|
|
if (!agent_program || !*agent_program)
|
|
|
|
agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT);
|
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
if (verbose)
|
2010-10-18 14:56:52 +00:00
|
|
|
log_info (_("no running gpg-agent - starting `%s'\n"),
|
|
|
|
agent_program);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
if (status_cb)
|
2011-02-04 12:57:53 +01:00
|
|
|
status_cb (status_cb_arg, STATUS_PROGRESS,
|
2007-06-21 18:44:48 +00:00
|
|
|
"starting_agent ? 0 0", NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2007-06-21 18:44:48 +00:00
|
|
|
if (fflush (NULL))
|
|
|
|
{
|
2010-08-16 11:03:43 +00:00
|
|
|
gpg_error_t tmperr = gpg_err_make (errsource,
|
|
|
|
gpg_err_code_from_syserror ());
|
2007-06-21 18:44:48 +00:00
|
|
|
log_error ("error flushing pending output: %s\n",
|
|
|
|
strerror (errno));
|
|
|
|
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 00:01:25 +00:00
|
|
|
assuan_release (ctx);
|
2007-06-21 18:44:48 +00:00
|
|
|
return tmperr;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
|
|
argv[0] = "--use-standard-socket-p";
|
|
|
|
argv[1] = NULL;
|
2010-05-03 15:23:10 +00:00
|
|
|
err = gnupg_spawn_process_fd (agent_program, argv, -1, -1, -1, &pid);
|
|
|
|
if (err)
|
|
|
|
log_debug ("starting `%s' for testing failed: %s\n",
|
|
|
|
agent_program, gpg_strerror (err));
|
2010-06-24 10:51:30 +00:00
|
|
|
else if ((err = gnupg_wait_process (agent_program, pid, 1, &excode)))
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
|
|
|
if (excode == -1)
|
2010-06-24 10:51:30 +00:00
|
|
|
log_debug ("running `%s' for testing failed (wait): %s\n",
|
2010-05-03 15:23:10 +00:00
|
|
|
agent_program, gpg_strerror (err));
|
2011-02-04 12:57:53 +01:00
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
gnupg_release_process (pid);
|
2010-05-03 15:23:10 +00:00
|
|
|
|
|
|
|
if (!err && !excode)
|
|
|
|
{
|
|
|
|
/* If the agent has been configured for use with a
|
|
|
|
standard socket, an environment variable is not
|
|
|
|
required and thus we we can savely start the agent
|
|
|
|
here. */
|
2010-08-16 11:03:43 +00:00
|
|
|
lock_spawn_t lock;
|
2010-05-03 15:23:10 +00:00
|
|
|
|
|
|
|
argv[0] = "--daemon";
|
2011-02-04 12:57:53 +01:00
|
|
|
argv[1] = "--use-standard-socket";
|
|
|
|
argv[2] = NULL;
|
2010-05-03 15:23:10 +00:00
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
if (!(err = lock_spawning (&lock, homedir, "agent", verbose))
|
2010-05-03 15:23:10 +00:00
|
|
|
&& assuan_socket_connect (ctx, sockname, 0, 0))
|
|
|
|
{
|
|
|
|
err = gnupg_spawn_process_detached (agent_program, argv,NULL);
|
|
|
|
if (err)
|
|
|
|
log_error ("failed to start agent `%s': %s\n",
|
|
|
|
agent_program, gpg_strerror (err));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2010-11-23 18:46:41 +00:00
|
|
|
for (i=0; i < SECS_TO_WAIT_FOR_AGENT; i++)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
2010-11-26 09:42:56 +00:00
|
|
|
if (verbose)
|
|
|
|
log_info (_("waiting for the agent "
|
|
|
|
"to come up ... (%ds)\n"),
|
|
|
|
SECS_TO_WAIT_FOR_AGENT - i);
|
2010-05-03 15:23:10 +00:00
|
|
|
gnupg_sleep (1);
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
|
if (!err)
|
2010-10-14 08:32:55 +00:00
|
|
|
{
|
2010-11-23 18:46:41 +00:00
|
|
|
if (verbose)
|
|
|
|
{
|
|
|
|
log_info (_("connection to agent "
|
2010-11-26 09:42:56 +00:00
|
|
|
"established\n"));
|
2010-11-23 18:46:41 +00:00
|
|
|
did_success_msg = 1;
|
|
|
|
}
|
2010-10-14 08:32:55 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-05-03 15:23:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
unlock_spawning (&lock, "agent");
|
2010-05-03 15:23:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* If using the standard socket is not the default we
|
|
|
|
start the agent as a pipe server which gives us most
|
|
|
|
of the required features except for passphrase
|
|
|
|
caching etc. */
|
|
|
|
const char *pgmname;
|
|
|
|
int no_close_list[3];
|
|
|
|
int i;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
if ( !(pgmname = strrchr (agent_program, '/')))
|
|
|
|
pgmname = agent_program;
|
|
|
|
else
|
|
|
|
pgmname++;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
argv[0] = pgmname;
|
|
|
|
argv[1] = "--server";
|
|
|
|
argv[2] = NULL;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
i=0;
|
|
|
|
if (log_get_fd () != -1)
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
|
|
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
|
|
|
no_close_list[i] = -1;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
/* Connect to the agent and perform initial handshaking. */
|
|
|
|
err = assuan_pipe_connect (ctx, agent_program, argv,
|
|
|
|
no_close_list, NULL, NULL, 0);
|
|
|
|
}
|
2007-06-21 18:44:48 +00:00
|
|
|
}
|
|
|
|
xfree (sockname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int prot;
|
|
|
|
int pid;
|
|
|
|
|
|
|
|
infostr = xstrdup (infostr);
|
|
|
|
if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
|
|
|
|
{
|
|
|
|
log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
|
|
|
|
xfree (infostr);
|
|
|
|
force_pipe_server = 1;
|
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
*p++ = 0;
|
|
|
|
pid = atoi (p);
|
|
|
|
while (*p && *p != PATHSEP_C)
|
|
|
|
p++;
|
|
|
|
prot = *p? atoi (p+1) : 0;
|
|
|
|
if (prot != 1)
|
|
|
|
{
|
|
|
|
log_error (_("gpg-agent protocol version %d is not supported\n"),
|
|
|
|
prot);
|
|
|
|
xfree (infostr);
|
|
|
|
force_pipe_server = 1;
|
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
err = assuan_socket_connect (ctx, infostr, pid, 0);
|
2007-06-21 18:44:48 +00:00
|
|
|
xfree (infostr);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (gpg_err_code (err) == GPG_ERR_ASS_CONNECT_FAILED)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
|
|
|
log_info (_("can't connect to the agent - trying fall back\n"));
|
|
|
|
force_pipe_server = 1;
|
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
if (err)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
2010-05-03 15:23:10 +00:00
|
|
|
log_error ("can't connect to the agent: %s\n", gpg_strerror (err));
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
assuan_release (ctx);
|
2010-08-16 11:03:43 +00:00
|
|
|
return gpg_err_make (errsource, GPG_ERR_NO_AGENT);
|
2007-06-21 18:44:48 +00:00
|
|
|
}
|
|
|
|
|
2010-11-23 18:46:41 +00:00
|
|
|
if (debug && !did_success_msg)
|
2010-10-14 08:32:55 +00:00
|
|
|
log_debug (_("connection to agent established\n"));
|
2007-06-21 18:44:48 +00:00
|
|
|
|
2010-05-03 15:23:10 +00:00
|
|
|
err = assuan_transact (ctx, "RESET",
|
2007-06-21 18:44:48 +00:00
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (!err)
|
|
|
|
err = send_pinentry_environment (ctx, errsource,
|
2007-11-19 16:03:50 +00:00
|
|
|
opt_lc_ctype, opt_lc_messages,
|
2009-07-07 10:02:41 +00:00
|
|
|
session_env);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (err)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
Update to new API (2, 1.1.0).
agent/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
log file (there ain't one anymore).
(main): Update to new API.
(check_own_socket_pid_cb): Return gpg_error_t instead of int.
(check_own_socket_thread, check_for_running_agent): Create assuan
context before connecting to server.
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(write_and_clear_outbuf): Use gpg_error_t instead of
assuan_error_t.
(cmd_geteventcounter, cmd_istrusted, cmd_listtrusted)
(cmd_marktrusted, cmd_havekey, cmd_sigkey, cmd_setkeydesc)
(cmd_sethash, cmd_pksign, cmd_pkdecrypt, cmd_genkey, cmd_readkey)
(cmd_keyinfo, cmd_get_passphrase, cmd_clear_passphrase)
(cmd_get_confirmation, cmd_learn, cmd_passwd)
(cmd_preset_passphrase, cmd_scd, cmd_getval, cmd_putval)
(cmd_updatestartuptty, cmd_killagent, cmd_reloadagent)
(cmd_getinfo, option_handler): Return gpg_error_t instead of int.
(post_cmd_notify): Change type of ERR to gpg_error_t from int.
(io_monitor): Add hook argument. Use symbols for constants.
(register_commands): Change return type of HANDLER to gpg_error_t.
(start_command_handler): Allocate assuan context before starting
server.
* call-pinentry.c: Include "scdaemon.h" before <assuan.h> because
of GPG_ERR_SOURCE_DEFAULT check.
(unlock_pinentry): Call assuan_release instead of
assuan_disconnect.
(getinfo_pid_cb, getpin_cb): Return gpg_error_t instead of int.
(start_pinentry): Allocate assuan context before connecting to
server.
* call-scd.c (membuf_data_cb, learn_status_cb, get_serialno_cb)
(membuf_data_cb, inq_needpin, card_getattr_cb, pass_status_thru)
(pass_data_thru): Change return type to gpg_error_t.
(start_scd): Allocate assuan context before connecting to server.
common/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Allocate assuan context before
starting server.
g10/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* call-agent.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(learn_status_cb, dummy_data_cb, get_serialno_cb, default_inq_cb)
(learn_status_cb, inq_writecert_parms, inq_writekey_parms)
(scd_genkey_cb, membuf_data_cb): Return gpg_error_t instead of
int.
* gpg.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(main): Update to new Assuan API.
* server.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, do_listkeys, cmd_listkeys)
(cmd_listsecretkeys, cmd_genkey, cmd_getinfo): Return gpg_error_t
instead of int.
(register_commands): Allocate assuan context before starting
server.
(gpg_server): Allocate assuan_context before starting server.
scd/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* command.c: Include "scdaemon.h" before <assuan.h> because of
GPG_ERR_SOURCE_DEFAULT check.
(option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert)
(cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt)
(cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey)
(cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock)
(cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu)
(cmd_killscd): Return gpg_error_t instead of int.
(scd_command_handler): Allocate assuan context before starting server.
* scdaemon.c (main): Update to new Assuan API.
sm/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.c (main): Update to new assuan API.
* server.c: Include "gpgsm.h" before <assuan.h> due to check for
GPG_ERR_SOURCE_DEFAULT and assuan.h now including gpg-error.h.
(option_handler, cmd_recipient, cmd_signer, cmd_encrypt)
(cmd_decrypt, cmd_verify, cmd_sign, cmd_import, cmd_export)
(cmd_delkeys, cmd_message, cmd_listkeys, cmd_dumpkeys)
(cmd_listsecretkeys, cmd_dumpsecretkeys, cmd_genkey)
(cmd_getauditlog, cmd_getinfo): Return gpg_error_t instead of int.
(register_commands): Same for member HANDLER in table.
(gpgsm_server): Allocate assuan context before starting server.
* sm/call-dirmngr.c:
* call-dirmngr.c (prepare_dirmngr): Check for CTX and error before
setting LDAPSERVER.
(start_dirmngr_ext): Allocate assuan context before starting
server.
(inq_certificate, isvalid_status_cb, lookup_cb, lookup_status_cb)
(run_command_cb, run_command_inq_cb, run_command_status_cb):
Return gpg_error_t instead of int.
tools/
2009-09-23 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (getinfo_pid_cb, read_and_print_response)
(main): Update to new Assuan API.
2009-09-23 00:01:25 +00:00
|
|
|
assuan_release (ctx);
|
2010-05-03 15:23:10 +00:00
|
|
|
return err;
|
2007-06-21 18:44:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*r_ctx = ctx;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
|
|
|
|
/* Try to connect to the dirmngr via a socket. On platforms
|
|
|
|
supporting it, start it up if needed. Returns a new assuan context
|
|
|
|
at R_CTX or an error code. */
|
|
|
|
gpg_error_t
|
|
|
|
start_new_dirmngr (assuan_context_t *r_ctx,
|
|
|
|
gpg_err_source_t errsource,
|
|
|
|
const char *homedir,
|
|
|
|
const char *dirmngr_program,
|
|
|
|
int verbose, int debug,
|
|
|
|
gpg_error_t (*status_cb)(ctrl_t, int, ...),
|
|
|
|
ctrl_t status_cb_arg)
|
|
|
|
{
|
|
|
|
gpg_error_t err;
|
|
|
|
assuan_context_t ctx;
|
|
|
|
const char *sockname;
|
2010-11-23 18:46:41 +00:00
|
|
|
int did_success_msg = 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
*r_ctx = NULL;
|
|
|
|
|
|
|
|
err = assuan_new (&ctx);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
log_error ("error allocating assuan context: %s\n", gpg_strerror (err));
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
sockname = dirmngr_socket_name ();
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
2010-10-08 14:37:42 +00:00
|
|
|
#ifdef USE_DIRMNGR_AUTO_START
|
2010-08-16 11:03:43 +00:00
|
|
|
if (err)
|
|
|
|
{
|
2010-10-08 14:37:42 +00:00
|
|
|
lock_spawn_t lock;
|
2010-08-16 11:03:43 +00:00
|
|
|
const char *argv[2];
|
|
|
|
|
|
|
|
/* With no success try start a new Dirmngr. On most systems
|
|
|
|
this will fail because the Dirmngr is expected to be a system
|
|
|
|
service. However on Wince we don't distinguish users and
|
|
|
|
thus we can start it. A future extension might be to use the
|
|
|
|
userv system to start the Dirmngr as a system service. */
|
|
|
|
if (!dirmngr_program || !*dirmngr_program)
|
|
|
|
dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
|
|
|
|
|
|
|
|
if (verbose)
|
2010-10-18 14:56:52 +00:00
|
|
|
log_info (_("no running Dirmngr - starting `%s'\n"),
|
|
|
|
dirmngr_program);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
if (status_cb)
|
2011-02-04 12:57:53 +01:00
|
|
|
status_cb (status_cb_arg, STATUS_PROGRESS,
|
2010-08-16 11:03:43 +00:00
|
|
|
"starting_dirmngr ? 0 0", NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
if (fflush (NULL))
|
|
|
|
{
|
|
|
|
gpg_error_t tmperr = gpg_err_make (errsource,
|
|
|
|
gpg_err_code_from_syserror ());
|
|
|
|
log_error ("error flushing pending output: %s\n",
|
|
|
|
strerror (errno));
|
|
|
|
assuan_release (ctx);
|
|
|
|
return tmperr;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
argv[0] = "--daemon";
|
2011-02-04 12:57:53 +01:00
|
|
|
argv[1] = NULL;
|
|
|
|
|
2010-12-17 16:55:13 +00:00
|
|
|
if (!(err = lock_spawning (&lock, homedir, "dirmngr", verbose))
|
2010-08-16 11:03:43 +00:00
|
|
|
&& assuan_socket_connect (ctx, sockname, 0, 0))
|
|
|
|
{
|
|
|
|
err = gnupg_spawn_process_detached (dirmngr_program, argv,NULL);
|
|
|
|
if (err)
|
|
|
|
log_error ("failed to start the dirmngr `%s': %s\n",
|
|
|
|
dirmngr_program, gpg_strerror (err));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int i;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-11-23 18:46:41 +00:00
|
|
|
for (i=0; i < SECS_TO_WAIT_FOR_DIRMNGR; i++)
|
2010-08-16 11:03:43 +00:00
|
|
|
{
|
2010-11-26 09:42:56 +00:00
|
|
|
if (verbose)
|
|
|
|
log_info (_("waiting for the dirmngr "
|
|
|
|
"to come up ... (%ds)\n"),
|
|
|
|
SECS_TO_WAIT_FOR_DIRMNGR - i);
|
2010-08-16 11:03:43 +00:00
|
|
|
gnupg_sleep (1);
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
|
if (!err)
|
2010-10-14 08:32:55 +00:00
|
|
|
{
|
2010-11-23 18:46:41 +00:00
|
|
|
if (verbose)
|
|
|
|
{
|
|
|
|
log_info (_("connection to the dirmngr"
|
2010-11-26 09:42:56 +00:00
|
|
|
" established\n"));
|
2010-11-23 18:46:41 +00:00
|
|
|
did_success_msg = 1;
|
|
|
|
}
|
2010-10-14 08:32:55 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-08-16 11:03:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
unlock_spawning (&lock, "dirmngr");
|
|
|
|
}
|
2010-10-08 14:37:42 +00:00
|
|
|
#else
|
|
|
|
(void)homedir;
|
|
|
|
(void)dirmngr_program;
|
|
|
|
(void)verbose;
|
|
|
|
(void)status_cb;
|
|
|
|
(void)status_cb_arg;
|
|
|
|
#endif /*USE_DIRMNGR_AUTO_START*/
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
log_error ("connecting dirmngr at `%s' failed: %s\n",
|
|
|
|
sockname, gpg_strerror (err));
|
|
|
|
assuan_release (ctx);
|
|
|
|
return gpg_err_make (errsource, GPG_ERR_NO_DIRMNGR);
|
|
|
|
}
|
|
|
|
|
2010-11-23 18:46:41 +00:00
|
|
|
if (debug && !did_success_msg)
|
2010-10-14 08:32:55 +00:00
|
|
|
log_debug (_("connection to the dirmngr established\n"));
|
2010-08-16 11:03:43 +00:00
|
|
|
|
|
|
|
*r_ctx = ctx;
|
|
|
|
return 0;
|
|
|
|
}
|