2001-11-25 18:23:06 +00:00
|
|
|
|
/* call-agent.c - divert operations to the agent
|
2002-01-11 17:07:51 +00:00
|
|
|
|
* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
2001-11-25 18:23:06 +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
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (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
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <gcrypt.h>
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
#endif
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
|
|
|
|
#include "gpgsm.h"
|
|
|
|
|
#include "../assuan/assuan.h"
|
|
|
|
|
#include "i18n.h"
|
2002-03-06 14:16:37 +00:00
|
|
|
|
#include "keydb.h" /* fixme: Move this to import.c */
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
static ASSUAN_CONTEXT agent_ctx = NULL;
|
2002-01-21 12:03:38 +00:00
|
|
|
|
static int force_pipe_server = 0;
|
2001-12-05 23:48:01 +00:00
|
|
|
|
|
|
|
|
|
struct cipher_parm_s {
|
|
|
|
|
ASSUAN_CONTEXT ctx;
|
|
|
|
|
const char *ciphertext;
|
|
|
|
|
size_t ciphertextlen;
|
|
|
|
|
};
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2002-01-10 19:47:20 +00:00
|
|
|
|
struct genkey_parm_s {
|
|
|
|
|
ASSUAN_CONTEXT ctx;
|
|
|
|
|
const char *sexp;
|
|
|
|
|
size_t sexplen;
|
|
|
|
|
};
|
|
|
|
|
|
2002-03-06 14:16:37 +00:00
|
|
|
|
struct learn_parm_s {
|
|
|
|
|
int error;
|
|
|
|
|
ASSUAN_CONTEXT ctx;
|
|
|
|
|
struct membuf *data;
|
|
|
|
|
};
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
|
|
|
|
struct membuf {
|
|
|
|
|
size_t len;
|
|
|
|
|
size_t size;
|
|
|
|
|
char *buf;
|
|
|
|
|
int out_of_core;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* A simple implemnation of a dynamic buffer. Use init_membuf() to
|
|
|
|
|
create a buffer, put_membuf to append bytes and get_membuf to
|
|
|
|
|
release and return the buffer. Allocation errors are detected but
|
|
|
|
|
only returned at the final get_membuf(), this helps not to clutter
|
|
|
|
|
the code with out of core checks. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
init_membuf (struct membuf *mb, int initiallen)
|
|
|
|
|
{
|
|
|
|
|
mb->len = 0;
|
|
|
|
|
mb->size = initiallen;
|
|
|
|
|
mb->out_of_core = 0;
|
|
|
|
|
mb->buf = xtrymalloc (initiallen);
|
|
|
|
|
if (!mb->buf)
|
|
|
|
|
mb->out_of_core = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
put_membuf (struct membuf *mb, const void *buf, size_t len)
|
|
|
|
|
{
|
|
|
|
|
if (mb->out_of_core)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (mb->len + len >= mb->size)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
mb->size += len + 1024;
|
|
|
|
|
p = xtryrealloc (mb->buf, mb->size);
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
|
|
|
|
mb->out_of_core = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
mb->buf = p;
|
|
|
|
|
}
|
|
|
|
|
memcpy (mb->buf + mb->len, buf, len);
|
|
|
|
|
mb->len += len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
get_membuf (struct membuf *mb, size_t *len)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
if (mb->out_of_core)
|
|
|
|
|
{
|
|
|
|
|
xfree (mb->buf);
|
|
|
|
|
mb->buf = NULL;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = mb->buf;
|
|
|
|
|
*len = mb->len;
|
|
|
|
|
mb->buf = NULL;
|
|
|
|
|
mb->out_of_core = 1; /* don't allow a reuse */
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Try to connect to the agent via socket or fork it off and work by
|
|
|
|
|
pipes. Handle the server's initial greeting */
|
|
|
|
|
static int
|
|
|
|
|
start_agent (void)
|
|
|
|
|
{
|
2002-04-24 22:23:06 +00:00
|
|
|
|
int rc = 0;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
char *infostr, *p;
|
2002-01-21 12:03:38 +00:00
|
|
|
|
ASSUAN_CONTEXT ctx;
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
char *dft_display = NULL;
|
|
|
|
|
char *dft_ttyname = NULL;
|
|
|
|
|
char *dft_ttytype = NULL;
|
|
|
|
|
char *old_lc = NULL;
|
|
|
|
|
char *dft_lc = NULL;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (agent_ctx)
|
|
|
|
|
return 0; /* fixme: We need a context for each thread or serialize
|
|
|
|
|
the access to the agent (which is suitable given that
|
|
|
|
|
the agent is not MT */
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2002-01-21 12:03:38 +00:00
|
|
|
|
infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (!infostr)
|
|
|
|
|
{
|
2001-12-05 23:48:01 +00:00
|
|
|
|
const char *pgmname;
|
|
|
|
|
const char *argv[3];
|
2002-06-27 07:29:57 +00:00
|
|
|
|
int no_close_list[3];
|
|
|
|
|
int i;
|
2002-04-27 13:50:16 +00:00
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info (_("no running gpg-agent - starting one\n"));
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (fflush (NULL))
|
|
|
|
|
{
|
|
|
|
|
log_error ("error flushing pending output: %s\n", strerror (errno));
|
|
|
|
|
return seterr (Write_Error);
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (!opt.agent_program || !*opt.agent_program)
|
2002-06-29 14:01:53 +00:00
|
|
|
|
opt.agent_program = GNUPG_DEFAULT_AGENT;
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if ( !(pgmname = strrchr (opt.agent_program, '/')))
|
|
|
|
|
pgmname = opt.agent_program;
|
|
|
|
|
else
|
|
|
|
|
pgmname++;
|
|
|
|
|
|
|
|
|
|
argv[0] = pgmname;
|
|
|
|
|
argv[1] = "--server";
|
|
|
|
|
argv[2] = NULL;
|
|
|
|
|
|
2002-06-27 07:29:57 +00:00
|
|
|
|
i=0;
|
|
|
|
|
if (log_get_fd () != -1)
|
|
|
|
|
no_close_list[i++] = log_get_fd ();
|
|
|
|
|
no_close_list[i++] = fileno (stderr);
|
|
|
|
|
no_close_list[i] = -1;
|
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
/* connect to the agent and perform initial handshaking */
|
2002-06-27 07:29:57 +00:00
|
|
|
|
rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv,
|
|
|
|
|
no_close_list);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-01-21 12:03:38 +00:00
|
|
|
|
int prot;
|
|
|
|
|
int pid;
|
|
|
|
|
|
2001-11-25 18:23:06 +00:00
|
|
|
|
infostr = xstrdup (infostr);
|
2002-01-21 12:03:38 +00:00
|
|
|
|
if ( !(p = strchr (infostr, ':')) || p == infostr)
|
2001-11-25 18:23:06 +00:00
|
|
|
|
{
|
|
|
|
|
log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
|
|
|
|
|
xfree (infostr);
|
2002-01-21 12:03:38 +00:00
|
|
|
|
force_pipe_server = 1;
|
|
|
|
|
return start_agent ();
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
2002-01-21 12:03:38 +00:00
|
|
|
|
*p++ = 0;
|
|
|
|
|
pid = atoi (p);
|
|
|
|
|
while (*p && *p != ':')
|
|
|
|
|
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;
|
|
|
|
|
return start_agent ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = assuan_socket_connect (&ctx, infostr, pid);
|
|
|
|
|
xfree (infostr);
|
|
|
|
|
if (rc == ASSUAN_Connect_Failed)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("can't connect to the agent - trying fall back\n"));
|
|
|
|
|
force_pipe_server = 1;
|
|
|
|
|
return start_agent ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("can't connect to the agent: %s\n", assuan_strerror (rc));
|
|
|
|
|
return seterr (No_Agent);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
2002-01-21 12:03:38 +00:00
|
|
|
|
agent_ctx = ctx;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2002-04-27 13:50:16 +00:00
|
|
|
|
if (DBG_ASSUAN)
|
2002-01-15 13:02:47 +00:00
|
|
|
|
log_debug ("connection to agent established\n");
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
|
|
|
|
|
rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
|
|
|
|
|
dft_display = getenv ("DISPLAY");
|
|
|
|
|
if (opt.display || dft_display)
|
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION display=%s",
|
|
|
|
|
opt.display ? opt.display : dft_display) < 0)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
free (optstr);
|
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
2003-01-09 12:59:25 +00:00
|
|
|
|
if (!opt.ttyname)
|
|
|
|
|
{
|
|
|
|
|
dft_ttyname = getenv ("GPG_TTY");
|
|
|
|
|
if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
|
|
|
|
|
dft_ttyname = ttyname (0);
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
if (opt.ttyname || dft_ttyname)
|
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION ttyname=%s",
|
|
|
|
|
opt.ttyname ? opt.ttyname : dft_ttyname) < 0)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
free (optstr);
|
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
|
|
|
|
dft_ttytype = getenv ("TERM");
|
2002-04-24 22:23:06 +00:00
|
|
|
|
if (opt.ttytype || (dft_ttyname && dft_ttytype))
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION ttytype=%s",
|
|
|
|
|
opt.ttyname ? opt.ttytype : dft_ttytype) < 0)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
free (optstr);
|
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
2002-04-25 08:31:48 +00:00
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
old_lc = setlocale (LC_CTYPE, NULL);
|
2002-04-25 08:31:48 +00:00
|
|
|
|
if (old_lc)
|
|
|
|
|
{
|
|
|
|
|
old_lc = strdup (old_lc);
|
|
|
|
|
if (!old_lc)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
dft_lc = setlocale (LC_CTYPE, "");
|
|
|
|
|
#endif
|
2002-04-24 22:23:06 +00:00
|
|
|
|
if (opt.lc_ctype || (dft_ttyname && dft_lc))
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION lc-ctype=%s",
|
|
|
|
|
opt.lc_ctype ? opt.lc_ctype : dft_lc) < 0)
|
2002-04-24 22:23:06 +00:00
|
|
|
|
rc = GNUPG_Out_Of_Core;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
free (optstr);
|
|
|
|
|
if (rc)
|
|
|
|
|
rc = map_assuan_err (rc);
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
}
|
2002-04-25 08:31:48 +00:00
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
if (old_lc)
|
2002-04-25 08:31:48 +00:00
|
|
|
|
{
|
|
|
|
|
setlocale (LC_CTYPE, old_lc);
|
|
|
|
|
free (old_lc);
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
#endif
|
2002-04-24 22:23:06 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
2002-04-25 08:31:48 +00:00
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
old_lc = setlocale (LC_MESSAGES, NULL);
|
2002-04-25 08:31:48 +00:00
|
|
|
|
if (old_lc)
|
|
|
|
|
{
|
|
|
|
|
old_lc = strdup (old_lc);
|
|
|
|
|
if (!old_lc)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
dft_lc = setlocale (LC_MESSAGES, "");
|
|
|
|
|
#endif
|
2002-04-24 22:23:06 +00:00
|
|
|
|
if (opt.lc_messages || (dft_ttyname && dft_lc))
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
{
|
|
|
|
|
char *optstr;
|
|
|
|
|
if (asprintf (&optstr, "OPTION lc-messages=%s",
|
|
|
|
|
opt.lc_messages ? opt.lc_messages : dft_lc) < 0)
|
2002-04-24 22:23:06 +00:00
|
|
|
|
rc = GNUPG_Out_Of_Core;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
rc = assuan_transact (agent_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
|
|
|
|
|
NULL);
|
|
|
|
|
free (optstr);
|
|
|
|
|
if (rc)
|
|
|
|
|
rc = map_assuan_err (rc);
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
}
|
2002-04-25 08:31:48 +00:00
|
|
|
|
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
if (old_lc)
|
2002-04-25 08:31:48 +00:00
|
|
|
|
{
|
|
|
|
|
setlocale (LC_MESSAGES, old_lc);
|
|
|
|
|
free (old_lc);
|
|
|
|
|
}
|
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for locale.h.
agent/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* agent.h (struct opt): Add members display, ttyname, ttytype,
lc_ctype, and lc_messages.
* gpg-agent.c (enum cmd_and_opt_values): Add oDisplay, oTTYname,
oTTYtype, oLCctype, and LCmessages.
(main): Handle these options.
* command.c (option_handler): New function.
(register_commands): Register option handler.
* query.c (start_pinentry): Pass the various display and tty
options to the pinentry.
sm/
2002-04-24 Marcus Brinkmann <marcus@g10code.de>
* gpgsm.h (struct opt): New members display, ttyname, ttytype,
lc_ctype, lc_messages.
* gpgsm.c (enum cmd_and_opt_values): New members oDisplay,
oTTYname, oTTYtype, oLCctype, oLCmessages.
(opts): New entries for these options.
(main): Handle these new options.
* call-agent.c (start_agent): Set the various display and tty
parameter after resetting.
2002-04-24 21:52:47 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2002-04-24 22:23:06 +00:00
|
|
|
|
return rc;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
static AssuanError
|
|
|
|
|
membuf_data_cb (void *opaque, const void *buffer, size_t length)
|
2001-11-25 18:23:06 +00:00
|
|
|
|
{
|
2001-12-05 23:48:01 +00:00
|
|
|
|
struct membuf *data = opaque;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2002-03-06 14:16:37 +00:00
|
|
|
|
if (buffer)
|
|
|
|
|
put_membuf (data, buffer, length);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return 0;
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
2001-12-05 23:48:01 +00:00
|
|
|
|
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Call the agent to do a sign operation using the key identified by
|
|
|
|
|
the hex string KEYGRIP. */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_pksign (const char *keygrip,
|
|
|
|
|
unsigned char *digest, size_t digestlen, int digestalgo,
|
|
|
|
|
char **r_buf, size_t *r_buflen )
|
|
|
|
|
{
|
|
|
|
|
int rc, i;
|
2001-12-13 23:20:02 +00:00
|
|
|
|
char *p, line[ASSUAN_LINELENGTH];
|
2001-11-25 18:23:06 +00:00
|
|
|
|
struct membuf data;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
*r_buf = NULL;
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (digestlen*2 + 50 > DIM(line))
|
|
|
|
|
return seterr (General_Error);
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (rc)
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return map_assuan_err (rc);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
snprintf (line, DIM(line)-1, "SIGKEY %s", keygrip);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
line[DIM(line)-1] = 0;
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (rc)
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return map_assuan_err (rc);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
|
|
|
|
sprintf (line, "SETHASH %d ", digestalgo);
|
|
|
|
|
p = line + strlen (line);
|
|
|
|
|
for (i=0; i < digestlen ; i++, p += 2 )
|
|
|
|
|
sprintf (p, "%02X", digest[i]);
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (rc)
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return map_assuan_err (rc);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, "PKSIGN",
|
2002-02-28 11:07:59 +00:00
|
|
|
|
membuf_data_cb, &data, NULL, NULL, NULL, NULL);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return map_assuan_err (rc);
|
2001-11-25 18:23:06 +00:00
|
|
|
|
}
|
|
|
|
|
*r_buf = get_membuf (&data, r_buflen);
|
2002-01-10 19:47:20 +00:00
|
|
|
|
|
2002-02-07 18:43:22 +00:00
|
|
|
|
if (!gcry_sexp_canon_len (*r_buf, *r_buflen, NULL, NULL))
|
|
|
|
|
{
|
|
|
|
|
xfree (*r_buf); *r_buf = NULL;
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
}
|
2002-01-10 19:47:20 +00:00
|
|
|
|
|
2001-11-25 18:23:06 +00:00
|
|
|
|
return *r_buf? 0 : GNUPG_Out_Of_Core;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
|
|
|
|
|
/* Handle a CIPHERTEXT inquiry. Note, we only send the data,
|
|
|
|
|
assuan_transact talkes care of flushing and writing the end */
|
|
|
|
|
static AssuanError
|
|
|
|
|
inq_ciphertext_cb (void *opaque, const char *keyword)
|
|
|
|
|
{
|
|
|
|
|
struct cipher_parm_s *parm = opaque;
|
|
|
|
|
AssuanError rc;
|
|
|
|
|
|
2002-01-19 18:21:14 +00:00
|
|
|
|
assuan_begin_confidential (parm->ctx);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
rc = assuan_send_data (parm->ctx, parm->ciphertext, parm->ciphertextlen);
|
2002-01-19 18:21:14 +00:00
|
|
|
|
assuan_end_confidential (parm->ctx);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Call the agent to do a decrypt operation using the key identified by
|
|
|
|
|
the hex string KEYGRIP. */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_pkdecrypt (const char *keygrip,
|
2001-12-18 17:37:48 +00:00
|
|
|
|
KsbaConstSexp ciphertext,
|
2001-12-05 23:48:01 +00:00
|
|
|
|
char **r_buf, size_t *r_buflen )
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
2001-12-13 23:20:02 +00:00
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2001-12-05 23:48:01 +00:00
|
|
|
|
struct membuf data;
|
|
|
|
|
struct cipher_parm_s cipher_parm;
|
2001-12-06 20:48:10 +00:00
|
|
|
|
size_t n, len;
|
|
|
|
|
char *buf, *endp;
|
2001-12-18 17:37:48 +00:00
|
|
|
|
size_t ciphertextlen;
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (!keygrip || strlen(keygrip) != 40 || !ciphertext || !r_buf || !r_buflen)
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
*r_buf = NULL;
|
|
|
|
|
|
2001-12-18 17:37:48 +00:00
|
|
|
|
ciphertextlen = gcry_sexp_canon_len (ciphertext, 0, NULL, NULL);
|
|
|
|
|
if (!ciphertextlen)
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
|
2001-12-05 23:48:01 +00:00
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
|
|
|
|
|
assert ( DIM(line) >= 50 );
|
|
|
|
|
snprintf (line, DIM(line)-1, "SETKEY %s", keygrip);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
|
|
|
|
cipher_parm.ctx = agent_ctx;
|
|
|
|
|
cipher_parm.ciphertext = ciphertext;
|
|
|
|
|
cipher_parm.ciphertextlen = ciphertextlen;
|
|
|
|
|
rc = assuan_transact (agent_ctx, "PKDECRYPT",
|
|
|
|
|
membuf_data_cb, &data,
|
2002-02-28 11:07:59 +00:00
|
|
|
|
inq_ciphertext_cb, &cipher_parm, NULL, NULL);
|
2001-12-05 23:48:01 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
|
|
|
|
put_membuf (&data, "", 1); /* make sure it is 0 terminated */
|
|
|
|
|
buf = get_membuf (&data, &len);
|
|
|
|
|
if (!buf)
|
|
|
|
|
return seterr (Out_Of_Core);
|
2002-02-07 20:41:00 +00:00
|
|
|
|
/* FIXME: We would better a return a full S-exp and not just a part */
|
2001-12-06 20:48:10 +00:00
|
|
|
|
assert (len);
|
|
|
|
|
len--; /* remove the terminating 0 */
|
|
|
|
|
n = strtoul (buf, &endp, 10);
|
|
|
|
|
if (!n || *endp != ':')
|
|
|
|
|
return seterr (Invalid_Sexp);
|
|
|
|
|
endp++;
|
|
|
|
|
if (endp-buf+n > len)
|
|
|
|
|
return seterr (Invalid_Sexp); /* oops len does not match internal len*/
|
|
|
|
|
memmove (buf, endp, n);
|
|
|
|
|
*r_buflen = n;
|
|
|
|
|
*r_buf = buf;
|
|
|
|
|
return 0;
|
2001-12-05 23:48:01 +00:00
|
|
|
|
}
|
2001-11-25 18:23:06 +00:00
|
|
|
|
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-01-10 19:47:20 +00:00
|
|
|
|
|
|
|
|
|
/* Handle a KEYPARMS inquiry. Note, we only send the data,
|
|
|
|
|
assuan_transact takes care of flushing and writing the end */
|
|
|
|
|
static AssuanError
|
|
|
|
|
inq_genkey_parms (void *opaque, const char *keyword)
|
|
|
|
|
{
|
|
|
|
|
struct genkey_parm_s *parm = opaque;
|
|
|
|
|
AssuanError rc;
|
|
|
|
|
|
|
|
|
|
rc = assuan_send_data (parm->ctx, parm->sexp, parm->sexplen);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Call the agent to generate a newkey */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_genkey (KsbaConstSexp keyparms, KsbaSexp *r_pubkey)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct genkey_parm_s gk_parm;
|
|
|
|
|
struct membuf data;
|
|
|
|
|
size_t len;
|
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
|
|
*r_pubkey = NULL;
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
|
2002-01-10 19:47:20 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 1024);
|
|
|
|
|
gk_parm.ctx = agent_ctx;
|
|
|
|
|
gk_parm.sexp = keyparms;
|
|
|
|
|
gk_parm.sexplen = gcry_sexp_canon_len (keyparms, 0, NULL, NULL);
|
|
|
|
|
if (!gk_parm.sexplen)
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
rc = assuan_transact (agent_ctx, "GENKEY",
|
|
|
|
|
membuf_data_cb, &data,
|
2002-02-28 11:07:59 +00:00
|
|
|
|
inq_genkey_parms, &gk_parm, NULL, NULL);
|
2002-01-10 19:47:20 +00:00
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
|
|
|
|
buf = get_membuf (&data, &len);
|
|
|
|
|
if (!buf)
|
|
|
|
|
return GNUPG_Out_Of_Core;
|
|
|
|
|
if (!gcry_sexp_canon_len (buf, len, NULL, NULL))
|
|
|
|
|
{
|
|
|
|
|
xfree (buf);
|
|
|
|
|
return GNUPG_Invalid_Sexp;
|
|
|
|
|
}
|
|
|
|
|
*r_pubkey = buf;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
2002-01-15 13:02:47 +00:00
|
|
|
|
|
|
|
|
|
/* Ask the agent whether the certificate is in the list of trusted
|
|
|
|
|
keys */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_istrusted (KsbaCert cert)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *fpr;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
2002-01-15 13:02:47 +00:00
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
2001-12-06 20:48:10 +00:00
|
|
|
|
|
2002-01-15 13:02:47 +00:00
|
|
|
|
fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
|
|
|
|
|
if (!fpr)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error getting the fingerprint\n");
|
|
|
|
|
return seterr (General_Error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line)-1, "ISTRUSTED %s", fpr);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
xfree (fpr);
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2002-01-15 13:02:47 +00:00
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
2002-01-29 10:05:24 +00:00
|
|
|
|
|
2002-02-18 20:47:29 +00:00
|
|
|
|
/* Ask the agent to mark CERT as a trusted Root-CA one */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_marktrusted (KsbaCert cert)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char *fpr, *dn;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
|
|
|
|
|
if (!fpr)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error getting the fingerprint\n");
|
|
|
|
|
return seterr (General_Error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dn = ksba_cert_get_issuer (cert, 0);
|
|
|
|
|
if (!dn)
|
|
|
|
|
{
|
|
|
|
|
xfree (fpr);
|
|
|
|
|
return seterr (General_Error);
|
|
|
|
|
}
|
|
|
|
|
snprintf (line, DIM(line)-1, "MARKTRUSTED %s S %s", fpr, dn);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
ksba_free (dn);
|
|
|
|
|
xfree (fpr);
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2002-02-18 20:47:29 +00:00
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-01-29 10:05:24 +00:00
|
|
|
|
/* Ask the agent whether the a corresponding secret key is available
|
|
|
|
|
for the given keygrip */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_havekey (const char *hexkeygrip)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!hexkeygrip || strlen (hexkeygrip) != 40)
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line)-1, "HAVEKEY %s", hexkeygrip);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
|
2002-02-28 11:07:59 +00:00
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
2002-01-29 10:05:24 +00:00
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
2002-02-18 20:47:29 +00:00
|
|
|
|
|
2002-03-06 14:16:37 +00:00
|
|
|
|
|
|
|
|
|
static AssuanError
|
|
|
|
|
learn_cb (void *opaque, const void *buffer, size_t length)
|
|
|
|
|
{
|
|
|
|
|
struct learn_parm_s *parm = opaque;
|
|
|
|
|
size_t len;
|
|
|
|
|
char *buf;
|
|
|
|
|
KsbaCert cert;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
if (parm->error)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (buffer)
|
|
|
|
|
{
|
|
|
|
|
put_membuf (parm->data, buffer, length);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
/* END encountered - process what we have */
|
|
|
|
|
buf = get_membuf (parm->data, &len);
|
|
|
|
|
if (!buf)
|
|
|
|
|
{
|
|
|
|
|
parm->error = GNUPG_Out_Of_Core;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-03-18 09:30:35 +00:00
|
|
|
|
/* FIXME: this should go into import.c */
|
2002-03-06 14:16:37 +00:00
|
|
|
|
cert = ksba_cert_new ();
|
|
|
|
|
if (!cert)
|
|
|
|
|
{
|
|
|
|
|
parm->error = GNUPG_Out_Of_Core;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
rc = ksba_cert_init_from_mem (cert, buf, len);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to parse a certificate: %s\n", ksba_strerror (rc));
|
|
|
|
|
ksba_cert_release (cert);
|
|
|
|
|
parm->error = map_ksba_err (rc);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rc = gpgsm_basic_cert_check (cert);
|
2002-08-16 13:55:03 +00:00
|
|
|
|
if (rc == GNUPG_Missing_Certificate)
|
|
|
|
|
{ /* For later use we store it in the ephemeral database. */
|
|
|
|
|
log_info ("issuer certificate missing - storing as ephemeral\n");
|
|
|
|
|
keydb_store_cert (cert, 1, NULL);
|
|
|
|
|
}
|
|
|
|
|
else if (rc)
|
2002-03-06 14:16:37 +00:00
|
|
|
|
log_error ("invalid certificate: %s\n", gnupg_strerror (rc));
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-07-02 10:40:12 +00:00
|
|
|
|
int existed;
|
|
|
|
|
|
|
|
|
|
if (!keydb_store_cert (cert, 0, &existed))
|
|
|
|
|
{
|
|
|
|
|
if (opt.verbose > 1 && existed)
|
|
|
|
|
log_info ("certificate already in DB\n");
|
|
|
|
|
else if (opt.verbose && !existed)
|
|
|
|
|
log_info ("certificate imported\n");
|
|
|
|
|
}
|
2002-03-06 14:16:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ksba_cert_release (cert);
|
|
|
|
|
init_membuf (parm->data, 4096);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Call the agent to learn about a smartcard */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_learn ()
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct learn_parm_s learn_parm;
|
|
|
|
|
struct membuf data;
|
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
init_membuf (&data, 4096);
|
|
|
|
|
learn_parm.error = 0;
|
|
|
|
|
learn_parm.ctx = agent_ctx;
|
|
|
|
|
learn_parm.data = &data;
|
|
|
|
|
rc = assuan_transact (agent_ctx, "LEARN --send",
|
|
|
|
|
learn_cb, &learn_parm,
|
|
|
|
|
NULL, NULL, NULL, NULL);
|
|
|
|
|
xfree (get_membuf (&data, &len));
|
|
|
|
|
if (rc)
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
return learn_parm.error;
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-09 12:59:25 +00:00
|
|
|
|
|
|
|
|
|
/* Ask the agent to change the passphrase of the key identified by HEXKEYGRIP. */
|
|
|
|
|
int
|
|
|
|
|
gpgsm_agent_passwd (const char *hexkeygrip)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
char line[ASSUAN_LINELENGTH];
|
|
|
|
|
|
|
|
|
|
rc = start_agent ();
|
|
|
|
|
if (rc)
|
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
if (!hexkeygrip || strlen (hexkeygrip) != 40)
|
|
|
|
|
return GNUPG_Invalid_Value;
|
|
|
|
|
|
|
|
|
|
snprintf (line, DIM(line)-1, "PASSWD %s", hexkeygrip);
|
|
|
|
|
line[DIM(line)-1] = 0;
|
|
|
|
|
|
|
|
|
|
rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
|
|
|
|
return map_assuan_err (rc);
|
|
|
|
|
}
|
|
|
|
|
|