diff options
| author | Werner Koch <[email protected]> | 2003-10-02 10:20:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-10-02 10:20:12 +0000 |
| commit | 99cabff03f3d27f7ac2a12b837b17a538be1fe1f (patch) | |
| tree | 0a15a78faf6e50798ededc50e498bcbce28ae2bf /g10/ccid-driver.c | |
| parent | * g10.c (main): Add --no-groups to zero --group list. (diff) | |
| download | gnupg-99cabff03f3d27f7ac2a12b837b17a538be1fe1f.tar.gz gnupg-99cabff03f3d27f7ac2a12b837b17a538be1fe1f.zip | |
* cardglue.c (learn_status_cb): Release values before assignment
so that it can be used by getattr to update the structure.
(agent_scd_getattr): New.
* keylist.c (print_pubkey_info): Add FP arg for optional printing
to a stream. Changed all callers.
Diffstat (limited to '')
| -rw-r--r-- | g10/ccid-driver.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c index de8f870a5..b4fbc0b21 100644 --- a/g10/ccid-driver.c +++ b/g10/ccid-driver.c @@ -74,8 +74,6 @@ #if defined(HAVE_LIBUSB) || defined(TEST) -#define GNUPG_DEFAULT_SCDAEMON 1 /* Hack for 1.3 */ - #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -89,12 +87,16 @@ #define DRVNAME "ccid-driver: " -#ifdef GNUPG_DEFAULT_SCDAEMON /* This source is used within the - gnupg>=1.9 source tree. */ -# include "options.h" -# include "util.h" -# include "memory.h" +#ifdef GNUPG_MAJOR_VERSION /* This source is used within GnuPG. */ +# if GNUPG_MAJOR_VERSION == 1 /* GnuPG Version is < 1.9. */ +# include "options.h" +# include "util.h" +# include "memory.h" +# include "cardglue.h" +# else /* This is the modularized GnuPG 1.9 or later. */ +# include "scdaemon.h" +# endif # define DEBUGOUT(t) do { if (DBG_CARD_IO) \ log_debug (DRVNAME t); } while (0) |