diff options
| -rw-r--r-- | agent/ChangeLog | 9 | ||||
| -rw-r--r-- | agent/Makefile.am | 8 | ||||
| -rw-r--r-- | agent/command.c | 47 |
3 files changed, 34 insertions, 30 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index dc1bedf55..6f806e894 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,9 @@ +2003-04-29 Werner Koch <[email protected]> + + * command.c (register_commands): Adjusted for new Assuan semantics. + + * Makefile.am: Don't override LDFLAGS. + 2002-12-04 Werner Koch <[email protected]> * gpg-agent.c: New variable config_filename. @@ -8,7 +14,8 @@ 2002-12-03 Werner Koch <[email protected]> - * protect-tool.c (read_key): Don't run make_canonical on a NULL buffer. + * protect-tool.c (read_key): Don't run make_canonical on a NULL + buffer. * command.c (parse_hexstring): New. (cmd_sethash): Use it. diff --git a/agent/Makefile.am b/agent/Makefile.am index 89000cf35..323ea474f 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -24,8 +24,8 @@ INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" bin_PROGRAMS = gpg-agent pkglib_PROGRAMS = gpg-protect-tool -AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBGCRYPT_CFLAGS) $(PTH_CFLAGS) -LDFLAGS = @LDFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBGCRYPT_CFLAGS) \ + $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) gpg_agent_SOURCES = \ gpg-agent.c agent.h \ @@ -45,8 +45,8 @@ gpg_agent_SOURCES = \ sexp-parse.h -gpg_agent_LDADD = ../jnlib/libjnlib.a ../assuan/libassuan.a \ - ../common/libcommon.a $(LIBGCRYPT_LIBS) $(PTH_LIBS) +gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) gpg_protect_tool_SOURCES = \ protect-tool.c \ diff --git a/agent/command.c b/agent/command.c index 3573c27f8..00e0b1e1e 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1,5 +1,5 @@ /* command.c - gpg-agent command handler - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -29,8 +29,9 @@ #include <ctype.h> #include <unistd.h> +#include <assuan.h> + #include "agent.h" -#include "../assuan/assuan.h" /* maximum allowed size of the inquired ciphertext */ #define MAXLEN_CIPHERTEXT 4096 @@ -642,35 +643,31 @@ register_commands (ASSUAN_CONTEXT ctx) { static struct { const char *name; - int cmd_id; int (*handler)(ASSUAN_CONTEXT, char *line); } table[] = { - { "ISTRUSTED", 0, cmd_istrusted }, - { "HAVEKEY", 0, cmd_havekey }, - { "SIGKEY", 0, cmd_sigkey }, - { "SETKEY", 0, cmd_sigkey }, - { "SETHASH", 0, cmd_sethash }, - { "PKSIGN", 0, cmd_pksign }, - { "PKDECRYPT", 0, cmd_pkdecrypt }, - { "GENKEY", 0, cmd_genkey }, - { "GET_PASSPHRASE",0, cmd_get_passphrase }, - { "CLEAR_PASSPHRASE",0, cmd_clear_passphrase }, - { "LISTTRUSTED", 0, cmd_listtrusted }, - { "MARKTRUSTED", 0, cmd_marktrusted }, - { "LEARN", 0, cmd_learn }, - { "PASSWD", 0, cmd_passwd }, - { "", ASSUAN_CMD_INPUT, NULL }, - { "", ASSUAN_CMD_OUTPUT, NULL }, + { "ISTRUSTED", cmd_istrusted }, + { "HAVEKEY", cmd_havekey }, + { "SIGKEY", cmd_sigkey }, + { "SETKEY", cmd_sigkey }, + { "SETHASH", cmd_sethash }, + { "PKSIGN", cmd_pksign }, + { "PKDECRYPT", cmd_pkdecrypt }, + { "GENKEY", cmd_genkey }, + { "GET_PASSPHRASE", cmd_get_passphrase }, + { "CLEAR_PASSPHRASE", cmd_clear_passphrase }, + { "LISTTRUSTED", cmd_listtrusted }, + { "MARKTRUSTED", cmd_marktrusted }, + { "LEARN", cmd_learn }, + { "PASSWD", cmd_passwd }, + { "INPUT", NULL }, + { "OUTPUT", NULL }, { NULL } }; - int i, j, rc; + int i, rc; - for (i=j=0; table[i].name; i++) + for (i=0; table[i].name; i++) { - rc = assuan_register_command (ctx, - table[i].cmd_id? table[i].cmd_id - : (ASSUAN_CMD_USER + j++), - table[i].name, table[i].handler); + rc = assuan_register_command (ctx, table[i].name, table[i].handler); if (rc) return rc; } |