diff options
| author | Werner Koch <[email protected]> | 2003-04-29 10:42:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-04-29 10:42:05 +0000 |
| commit | ff272a6ed3900bcb398abb04f946231fdc2a4a52 (patch) | |
| tree | 80163c5f5374f099ca419de6aee239139bb6a844 | |
| parent | * util.h (fopencokokie): Removed prototype and struct. (diff) | |
| download | gnupg-ff272a6ed3900bcb398abb04f946231fdc2a4a52.tar.gz gnupg-ff272a6ed3900bcb398abb04f946231fdc2a4a52.zip | |
* Makefile.am (LDFLAGS): Removed.
* command.c (register_commands): Adjusted for new Assuan semantics.
Diffstat (limited to '')
| -rw-r--r-- | scd/ChangeLog | 6 | ||||
| -rw-r--r-- | scd/Makefile.am | 1 | ||||
| -rw-r--r-- | scd/command.c | 33 |
3 files changed, 21 insertions, 19 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index a55c51d53..06ded1bd1 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,9 @@ +2003-04-29 Werner Koch <[email protected]> + + * Makefile.am (LDFLAGS): Removed. + + * command.c (register_commands): Adjusted for new Assuan semantics. + 2002-08-21 Werner Koch <[email protected]> * scdaemon.c (main): New option --daemon so that the program is diff --git a/scd/Makefile.am b/scd/Makefile.am index 8812d1b9a..334354237 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -25,7 +25,6 @@ bin_PROGRAMS = scdaemon AM_CPPFLAGS = -I$(top_srcdir)/common $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ $(KSBA_CFLAGS) -LDFLAGS = @LDFLAGS@ scdaemon_SOURCES = \ scdaemon.c scdaemon.h \ diff --git a/scd/command.c b/scd/command.c index aa410a6ee..d0bbbc518 100644 --- a/scd/command.c +++ b/scd/command.c @@ -1,5 +1,5 @@ /* command.c - SCdaemon 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. * @@ -27,8 +27,9 @@ #include <unistd.h> #include <ksba.h> +#include <assuan.h> + #include "scdaemon.h" -#include "../assuan/assuan.h" /* maximum length aloowed as a PIN; used for INQUIRE NEEDPIN */ #define MAXLEN_PIN 100 @@ -548,28 +549,24 @@ register_commands (ASSUAN_CONTEXT ctx) { static struct { const char *name; - int cmd_id; int (*handler)(ASSUAN_CONTEXT, char *line); } table[] = { - { "SERIALNO", 0, cmd_serialno }, - { "LEARN", 0, cmd_learn }, - { "READCERT", 0, cmd_readcert }, - { "READKEY", 0, cmd_readkey }, - { "SETDATA", 0, cmd_setdata }, - { "PKSIGN", 0, cmd_pksign }, - { "PKDECRYPT", 0,cmd_pkdecrypt }, - { "", ASSUAN_CMD_INPUT, NULL }, - { "", ASSUAN_CMD_OUTPUT, NULL }, + { "SERIALNO", cmd_serialno }, + { "LEARN", cmd_learn }, + { "READCERT", cmd_readcert }, + { "READKEY", cmd_readkey }, + { "SETDATA", cmd_setdata }, + { "PKSIGN", cmd_pksign }, + { "PKDECRYPT", cmd_pkdecrypt }, + { "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; } |