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.
|
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
* This file is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of either
|
2004-03-06 20:11:19 +00:00
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
|
|
|
* or
|
|
|
|
*
|
|
|
|
* - the GNU General Public License as published by the Free
|
|
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
|
|
|
* or both in parallel, as here.
|
|
|
|
*
|
|
|
|
* This file is distributed in the hope that it will be useful,
|
2004-03-06 20:11:19 +00:00
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
|
2011-12-13 17:59:00 +01:00
|
|
|
/* Change the Libassuan log categories to those given by NEWCATS.
|
|
|
|
NEWCATS is 0 the default category of ASSUAN_LOG_CONTROL is
|
|
|
|
selected. Note, that setup_libassuan_logging overrides the values
|
|
|
|
given here. */
|
|
|
|
void
|
|
|
|
set_libassuan_log_cats (unsigned int newcats)
|
|
|
|
{
|
|
|
|
if (newcats)
|
|
|
|
log_cats = newcats;
|
|
|
|
else /* Default to log the control channel. */
|
|
|
|
log_cats = (1 << (ASSUAN_LOG_CONTROL - 1));
|
|
|
|
}
|
|
|
|
|
2010-03-11 12:34:11 +00:00
|
|
|
|
|
|
|
|
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,
|
2013-11-18 14:09:47 +01:00
|
|
|
!strcmp (name, "agent")? L"spawn_"GNUPG_NAME"_agent_sentinel":
|
|
|
|
!strcmp (name, "dirmngr")? L"spawn_"GNUPG_NAME"_dirmngr_sentinel":
|
|
|
|
/* */ L"spawn_"GNUPG_NAME"_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;
|
|
|
|
|
2014-04-15 16:40:48 +02:00
|
|
|
fname = make_absfilename_try
|
2010-08-16 11:03:43 +00:00
|
|
|
(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 ();
|
|
|
|
|
2011-09-28 15:41:58 +02:00
|
|
|
*lock = dotlock_create (fname, 0);
|
2010-05-03 15:23:10 +00:00
|
|
|
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. */
|
2011-09-23 14:43:58 +02:00
|
|
|
if (dotlock_take (*lock, -1))
|
2010-05-03 15:23:10 +00:00
|
|
|
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;
|
2011-09-23 14:43:58 +02:00
|
|
|
dotlock_destroy (*lock);
|
2010-05-03 15:23:10 +00:00
|
|
|
#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)
|
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
gpg_error_t err;
|
2007-06-21 18:44:48 +00:00
|
|
|
assuan_context_t ctx;
|
2010-11-23 18:46:41 +00:00
|
|
|
int did_success_msg = 0;
|
2014-10-03 11:58:58 +02:00
|
|
|
char *sockname;
|
2014-10-30 09:55:51 +01:00
|
|
|
const char *argv[6];
|
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
|
|
|
}
|
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
sockname = make_absfilename (homedir, GPG_AGENT_SOCK_NAME, NULL);
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
|
if (err)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
char *abs_homedir;
|
|
|
|
lock_spawn_t lock;
|
2014-10-30 09:55:51 +01:00
|
|
|
char *program = NULL;
|
|
|
|
const char *program_arg = NULL;
|
|
|
|
char *p;
|
|
|
|
const char *s;
|
|
|
|
int i;
|
2007-06-21 18:44:48 +00:00
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
/* With no success start a new server. */
|
|
|
|
if (!agent_program || !*agent_program)
|
|
|
|
agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT);
|
2014-10-30 09:55:51 +01:00
|
|
|
else if ((s=strchr (agent_program, '|')) && s[1] == '-' && s[2]=='-')
|
|
|
|
{
|
|
|
|
/* Hack to insert an additional option on the command line. */
|
|
|
|
program = xtrystrdup (agent_program);
|
|
|
|
if (!program)
|
|
|
|
{
|
|
|
|
gpg_error_t tmperr = gpg_err_make (errsource,
|
|
|
|
gpg_err_code_from_syserror ());
|
|
|
|
xfree (sockname);
|
|
|
|
assuan_release (ctx);
|
|
|
|
return tmperr;
|
|
|
|
}
|
|
|
|
p = strchr (program, '|');
|
|
|
|
*p++ = 0;
|
|
|
|
program_arg = p;
|
|
|
|
}
|
2007-06-21 18:44:48 +00:00
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
if (verbose)
|
|
|
|
log_info (_("no running gpg-agent - starting '%s'\n"),
|
|
|
|
agent_program);
|
|
|
|
|
|
|
|
if (status_cb)
|
|
|
|
status_cb (status_cb_arg, STATUS_PROGRESS,
|
|
|
|
"starting_agent ? 0 0", NULL);
|
|
|
|
|
|
|
|
/* We better pass an absolute home directory to the agent just
|
|
|
|
in case gpg-agent does not convert the passed name to an
|
|
|
|
absolute one (which it should do). */
|
|
|
|
abs_homedir = make_absfilename_try (homedir, NULL);
|
|
|
|
if (!abs_homedir)
|
2007-06-21 18:44:48 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
gpg_error_t tmperr = gpg_err_make (errsource,
|
|
|
|
gpg_err_code_from_syserror ());
|
|
|
|
log_error ("error building filename: %s\n",gpg_strerror (tmperr));
|
|
|
|
xfree (sockname);
|
|
|
|
assuan_release (ctx);
|
2014-10-30 09:55:51 +01:00
|
|
|
xfree (program);
|
2014-10-03 11:58:58 +02:00
|
|
|
return tmperr;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2014-10-03 11:58:58 +02: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));
|
|
|
|
xfree (sockname);
|
|
|
|
assuan_release (ctx);
|
|
|
|
xfree (abs_homedir);
|
2014-10-30 09:55:51 +01:00
|
|
|
xfree (program);
|
2014-10-03 11:58:58 +02:00
|
|
|
return tmperr;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
/* 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. */
|
2014-10-30 09:55:51 +01:00
|
|
|
i = 0;
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
argv[i++] = abs_homedir;
|
|
|
|
argv[i++] = "--use-standard-socket";
|
|
|
|
if (program_arg)
|
|
|
|
argv[i++] = program_arg;
|
|
|
|
argv[i++] = "--daemon";
|
|
|
|
argv[i++] = NULL;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
if (!(err = lock_spawning (&lock, homedir, "agent", verbose))
|
|
|
|
&& assuan_socket_connect (ctx, sockname, 0, 0))
|
|
|
|
{
|
2014-10-30 09:55:51 +01:00
|
|
|
err = gnupg_spawn_process_detached (program? program : agent_program,
|
|
|
|
argv, NULL);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (err)
|
2014-10-03 11:58:58 +02:00
|
|
|
log_error ("failed to start agent '%s': %s\n",
|
2010-05-03 15:23:10 +00:00
|
|
|
agent_program, gpg_strerror (err));
|
2014-10-03 11:58:58 +02:00
|
|
|
else
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
for (i=0; i < SECS_TO_WAIT_FOR_AGENT; i++)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
if (verbose)
|
|
|
|
log_info (_("waiting for the agent to come up ... (%ds)\n"),
|
|
|
|
SECS_TO_WAIT_FOR_AGENT - i);
|
|
|
|
gnupg_sleep (1);
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
|
if (!err)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
if (verbose)
|
2010-05-03 15:23:10 +00:00
|
|
|
{
|
2014-10-03 11:58:58 +02:00
|
|
|
log_info (_("connection to agent established\n"));
|
|
|
|
did_success_msg = 1;
|
2010-05-03 15:23:10 +00:00
|
|
|
}
|
2014-10-03 11:58:58 +02:00
|
|
|
break;
|
2010-05-03 15:23:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-06-21 18:44:48 +00:00
|
|
|
}
|
|
|
|
|
2014-10-03 11:58:58 +02:00
|
|
|
unlock_spawning (&lock, "agent");
|
|
|
|
xfree (abs_homedir);
|
2014-10-30 09:55:51 +01:00
|
|
|
xfree (program);
|
2007-06-21 18:44:48 +00:00
|
|
|
}
|
2014-10-03 11:58:58 +02:00
|
|
|
xfree (sockname);
|
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",
|
2014-10-03 11:58:58 +02:00
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL);
|
2010-05-03 15:23:10 +00:00
|
|
|
if (!err)
|
|
|
|
err = send_pinentry_environment (ctx, errsource,
|
2014-10-03 11:58:58 +02:00
|
|
|
opt_lc_ctype, opt_lc_messages,
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2014-03-12 19:33:30 +01:00
|
|
|
sockname = dirmngr_user_socket_name ();
|
|
|
|
if (sockname)
|
|
|
|
{
|
|
|
|
/* First try the local socket name and only if that fails try
|
|
|
|
the system socket. */
|
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
|
if (err)
|
|
|
|
sockname = dirmngr_sys_socket_name ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
sockname = dirmngr_sys_socket_name ();
|
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
2014-03-12 19:33:30 +01:00
|
|
|
|
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;
|
2014-03-12 19:33:30 +01:00
|
|
|
const char *argv[4];
|
|
|
|
int try_system_daemon = 0;
|
|
|
|
char *abs_homedir;
|
|
|
|
|
|
|
|
/* No connection: Try start a new Dirmngr. On Windows 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. */
|
|
|
|
|
|
|
|
/* We prefer to start it as a user daemon. */
|
|
|
|
sockname = dirmngr_user_socket_name ();
|
|
|
|
if (!sockname)
|
|
|
|
{
|
|
|
|
sockname = dirmngr_sys_socket_name ();
|
|
|
|
try_system_daemon = 1;
|
|
|
|
}
|
2010-08-16 11:03:43 +00:00
|
|
|
|
|
|
|
if (!dirmngr_program || !*dirmngr_program)
|
|
|
|
dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
|
|
|
|
|
|
|
|
if (verbose)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_info (_("no running Dirmngr - starting '%s'\n"),
|
2010-10-18 14:56:52 +00:00
|
|
|
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
|
|
|
|
2014-04-15 16:40:48 +02:00
|
|
|
abs_homedir = make_absfilename (homedir, NULL);
|
|
|
|
if (!abs_homedir)
|
|
|
|
{
|
|
|
|
gpg_error_t tmperr = gpg_err_make (errsource,
|
|
|
|
gpg_err_code_from_syserror ());
|
|
|
|
log_error ("error building filename: %s\n",gpg_strerror (tmperr));
|
|
|
|
assuan_release (ctx);
|
|
|
|
return tmperr;
|
|
|
|
}
|
2014-03-12 19:33:30 +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";
|
2014-03-12 19:33:30 +01:00
|
|
|
if (try_system_daemon)
|
|
|
|
argv[1] = NULL;
|
|
|
|
else
|
|
|
|
{ /* Try starting as user daemon - dirmngr does this if the
|
|
|
|
home directory is given on the command line. */
|
|
|
|
argv[1] = "--homedir";
|
|
|
|
argv[2] = abs_homedir;
|
|
|
|
argv[3] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On the use of HOMEDIR for locking: Under Windows HOMEDIR is
|
|
|
|
not used thus it does not matter. Under Unix we should
|
|
|
|
TRY_SYSTEM_DAEMON should never be true because
|
|
|
|
dirmngr_user_socket_name() won't return NULL. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
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))
|
|
|
|
{
|
2014-03-12 19:33:30 +01:00
|
|
|
err = gnupg_spawn_process_detached (dirmngr_program, argv, NULL);
|
2010-08-16 11:03:43 +00:00
|
|
|
if (err)
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error ("failed to start the dirmngr '%s': %s\n",
|
2010-08-16 11:03:43 +00:00
|
|
|
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");
|
2014-03-12 19:33:30 +01:00
|
|
|
xfree (abs_homedir);
|
2010-08-16 11:03:43 +00:00
|
|
|
}
|
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)
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error ("connecting dirmngr at '%s' failed: %s\n",
|
2010-08-16 11:03:43 +00:00
|
|
|
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;
|
|
|
|
}
|