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/apdu.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 'g10/apdu.c')
| -rw-r--r-- | g10/apdu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/g10/apdu.c b/g10/apdu.c index 068949810..d5b93de6e 100644 --- a/g10/apdu.c +++ b/g10/apdu.c @@ -19,13 +19,6 @@ */ #include <config.h> -#ifdef ENABLE_CARD_SUPPORT -/* - Note, that most of this code has been taken from 1.9.x branch - and is maintained over there if at all possible. Thus, if you make - changes here, please check that a similar change has been commited - to the 1.9.x branch. -*/ #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -35,12 +28,19 @@ # include <opensc/opensc.h> #endif +#if GNUPG_MAJOR_VERSION == 1 +/* This is used with GnuPG version < 1.9. The code has been source + copied from the current GnuPG >= 1.9 and is maintained over + there. */ #include "options.h" #include "errors.h" #include "memory.h" #include "util.h" #include "i18n.h" #include "cardglue.h" +#else /* GNUPG_MAJOR_VERSION != 1 */ +#include "scdaemon.h" +#endif /* GNUPG_MAJOR_VERSION != 1 */ #include "apdu.h" #include "dynload.h" @@ -1190,4 +1190,4 @@ apdu_send_simple (int slot, int class, int ins, int p0, int p1, -#endif /*ENABLE_CARD_SUPPORT*/ + |