diff options
| author | Werner Koch <[email protected]> | 2006-08-16 10:47:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-08-16 10:47:53 +0000 |
| commit | b744f963d7061ce55d2eed65b281298476e54fb7 (patch) | |
| tree | 6e8ccb3c39a45c16b4ca6cdb2273eb3b8bc2a888 /g10/gpg.c | |
| parent | Changed HTTP API. (diff) | |
| download | gnupg-b744f963d7061ce55d2eed65b281298476e54fb7.tar.gz gnupg-b744f963d7061ce55d2eed65b281298476e54fb7.zip | |
With --enable-gpg the keyservers are now build and a first test using gpg2
shows no prblems. Needs more testing of course.
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1434,7 +1434,9 @@ list_config(char *items) if(show_all || ascii_strcasecmp(name,"ccid-reader-id")==0) { -#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB) +#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB) \ + && GNUPG_MAJOR_VERSION == 1 + char *p, *p2, *list = ccid_get_reader_list (); for (p=list; p && (p2 = strchr (p, '\n')); p = p2+1) @@ -3871,10 +3873,6 @@ emergency_cleanup (void) void g10_exit( int rc ) { -#ifdef ENABLE_CARD_SUPPORT - card_close (); -#endif - gcry_control (GCRYCTL_UPDATE_RANDOM_SEED_FILE); if ( (opt.debug & DBG_MEMSTAT_VALUE) ) { |