diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 116 | ||||
| -rw-r--r-- | scd/apdu.c | 55 | ||||
| -rw-r--r-- | scd/pcsc-wrapper.c | 127 | ||||
| -rw-r--r-- | scd/scdaemon.c | 123 |
4 files changed, 213 insertions, 208 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 5fb59095f..ce442aa5f 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,9 +1,15 @@ +2011-08-04 Werner Koch <[email protected]> + + * pcsc-wrapper.c (handle_open): Remove unused var LISTLEN. + + * scdaemon.c (main): Remove var MAY_COREDUMP. + 2011-01-25 NIIBE Yutaka <[email protected]>, Grant Olson <[email protected]> (wk) * command.c (do_reset, get_reader_slot) (update_reader_status_file): Fix handling of the VALID flag for - unplugged readers. + unplugged readers. 2010-03-17 Werner Koch <[email protected]> @@ -123,7 +129,7 @@ * app-openpgp.c (change_keyattr): New. (do_writekey): Call it. - + * app-openpgp.c (does_key_exist): Add arg GENERATING. Change callers. @@ -226,7 +232,7 @@ * app-nks.c (do_decipher): Make it work for TCOS 3. * iso7816.c (iso7816_decipher): Add arg EXTENDED_MODE. * apdu.c (apdu_send): Add arg EXTENDED_MODE and change all callers. - (apdu_send_le): Ditto. + (apdu_send_le): Ditto. (apdu_send_direct): Ditto, but not yet functional. (send_le): Fix command chaining. Implement extended length option. * ccid-driver.c (ccid_transceive): Remove restriction on apdu length. @@ -310,7 +316,7 @@ (aid_nks): .. new. (aid_sigg): New. (switch_application): New. - (do_getattr, do_learn_status, do_readcert, do_sign, do_decipher) + (do_getattr, do_learn_status, do_readcert, do_sign, do_decipher) (do_change_pin, do_check_pin): Make sure we are in NKS mode. 2009-03-03 Werner Koch <[email protected]> @@ -342,22 +348,22 @@ * ccid-driver.c (ccid_get_atr): Move debug output to .. (print_r2p_parameters): .. new. (print_r2p_header, print_pr_data, print_r2p_unknown) - (print_r2p_datablock, print_r2p_slotstatus, print_r2p_escape) + (print_r2p_datablock, print_r2p_slotstatus, print_r2p_escape) (print_r2p_datarate): New. (bulk_in): Call parameter printing. (ccid_set_debug_level): Add debug level 3. (convert_le_u16): New. - (print_p2r_header, print_p2r_iccpoweron, print_p2r_iccpoweroff) - (print_p2r_getslotstatus, print_p2r_xfrblock) - (print_p2r_getparameters, print_p2r_resetparameters) - (print_p2r_setparameters, print_p2r_escape, print_p2r_iccclock) - (print_p2r_to0apdu, print_p2r_secure, print_p2r_mechanical) + (print_p2r_header, print_p2r_iccpoweron, print_p2r_iccpoweroff) + (print_p2r_getslotstatus, print_p2r_xfrblock) + (print_p2r_getparameters, print_p2r_resetparameters) + (print_p2r_setparameters, print_p2r_escape, print_p2r_iccclock) + (print_p2r_to0apdu, print_p2r_secure, print_p2r_mechanical) (print_p2r_abort, print_p2r_setdatarate, print_r2p_unknown): New. (bulk_out): Add arg NO_DEBUG and change all callers to pass 0. Call parameter printing. (ccid_slot_status): Call with NO_DEBUG set. - (abort_cmd, send_escape_cmd, ccid_get_atr, ccid_get_atr) - (ccid_transceive_apdu_level, ccid_transceive) + (abort_cmd, send_escape_cmd, ccid_get_atr, ccid_get_atr) + (ccid_transceive_apdu_level, ccid_transceive) (ccid_transceive_secure): Remove old debug print code. 2009-02-12 Werner Koch <[email protected]> @@ -408,7 +414,7 @@ 2008-12-18 Werner Koch <[email protected]> - * ccid-driver.c (abort_cmd): New. + * ccid-driver.c (abort_cmd): New. (bulk_in): Call abort_cmd after severe errors. * apdu.c (reader_table_s): Add field ANY_STATUS. @@ -455,7 +461,7 @@ (update_reader_status_file): Disconnect if allowed. * app-common.h (app_ctx_s): Remove INITIALIZED. Make REF_COUNT - unsigned. + unsigned. * app.c (select_application): Remove INITIALIZED. (app_write_learn_status, app_readcert, app_readkey, app_getattr) (app_setattr, app_sign, app_decipher, app_writecert) @@ -472,7 +478,7 @@ * app.c (app_get_serial_and_stamp): Use bin2hex. * app-help.c (app_help_get_keygrip_string): Ditto. * app-p15.c (send_certinfo, send_keypairinfo, do_getattr): Ditto. - * app-openpgp.c (send_fpr_if_not_null, send_key_data) + * app-openpgp.c (send_fpr_if_not_null, send_key_data) (retrieve_fpr_from_card, send_keypair_info): Ditto. * app-nks.c (keygripstr_from_pk_file): Ditto. * command.c (cmd_apdu): Ditto. @@ -579,7 +585,7 @@ (do_change_pin): Do not change CHV2. Add reset code logic for v2 cards. * iso7816.c (iso7816_reset_retry_counter_with_rc): New. - + * app-openpgp.c (add_tlv, build_privkey_template): New. (do_writekey): Support v2 keys and other key lengths than 1024. * iso7816.c (iso7816_put_data_odd): New. @@ -697,7 +703,7 @@ * scdaemon.c (main): Pass STANDARD_SOCKET flag to create_server_socket. - + 2007-11-13 Werner Koch <[email protected]> * scdaemon.c (start_connection_thread): Do not call @@ -938,7 +944,7 @@ 2006-09-06 Werner Koch <[email protected]> - * apdu.c (pcsc_end_transaction): + * apdu.c (pcsc_end_transaction): * pcsc-wrapper.c (pcsc_end_transaction: Fixed dclaration. Reported by Bob Dunlop. @@ -947,7 +953,7 @@ Replaced all Assuan error codes by libgpg-error codes. Removed all map_to_assuan_status and map_assuan_err. - + * scdaemon.c (main): Call assuan_set_assuan_err_source to have Assuan switch to gpg-error codes. * command.c (set_error): Adjusted. @@ -1026,7 +1032,7 @@ 2006-02-09 Werner Koch <[email protected]> - * command.c (get_reader_slot, do_reset) + * command.c (get_reader_slot, do_reset) (scd_update_reader_status_file): Rewrote. * app.c (release_application): Factored code out to .. @@ -1091,12 +1097,12 @@ * iso7816.h (struct iso7816_pininfo_s): New. * iso7816.c (map_sw): Support new code. (iso7816_check_keypad): New. - (iso7816_verify_kp, iso7816_change_reference_data_kp) + (iso7816_verify_kp, iso7816_change_reference_data_kp) (iso7816_reset_retry_counter_kp): New. Extended versions of the original functions. - * apdu.c (host_sw_string): Support new code. + * apdu.c (host_sw_string): Support new code. (reader_table_s): New field CHECK_KEYPAD. - (new_reader_slot, open_ct_reader, open_pcsc_reader) + (new_reader_slot, open_ct_reader, open_pcsc_reader) (open_ccid_reader, open_rapdu_reader): Initialize it. (check_ccid_keypad): New. (apdu_check_keypad): New. @@ -1105,7 +1111,7 @@ of the orginal function to use this one with a NULL for the new arg. (apdu_send_simple_kp): New. - (ct_send_apdu, pcsc_send_apdu, my_rapdu_send_apdu) + (ct_send_apdu, pcsc_send_apdu, my_rapdu_send_apdu) (send_apdu_ccid): New arg PININFO. (send_apdu_ccid): Use the new arg. @@ -1161,7 +1167,7 @@ * iso7816.c (iso7816_read_binary): Use Le=0 when reading all data. Handle 6C00 error and take 6B00 as indication for EOF. * apdu.h (SW_EXACT_LENGTH_P): New. - * apdu.c (new_reader_slot, reset_pcsc_reader, pcsc_get_status) + * apdu.c (new_reader_slot, reset_pcsc_reader, pcsc_get_status) (open_pcsc_reader): Set new reader state IS_T0. (apdu_send_le): When doing T=0 make sure not to send Lc and Le. Problem reported by Carl Meijer. @@ -1188,7 +1194,7 @@ 2005-06-06 Werner Koch <[email protected]> - * scdaemon.c (main): New option --debug-allow-core-dump. + * scdaemon.c (main): New option --debug-allow-core-dump. 2005-06-03 Werner Koch <[email protected]> @@ -1334,9 +1340,9 @@ variant. * app-openpgp.c (get_one_do, dump_all_do): Ditto. - + Removal of the old OpenSC based code. - + * app-p15.c: New. Basic support for pkcs15 cards without OpenSC. There are quite a couple of things missing but at least I can use my old TCOS cards from the Aegypten-1 development for signing. @@ -1344,7 +1350,7 @@ * Makefile.am (scdaemon_SOURCES): Removed card.c, card-common.h and card-p15.c because they are now obsolete. Added app-p15.c. Removed all OpenSC stuff. - * command.c (do_reset, open_card, cmd_serialno, cmd_learn) + * command.c (do_reset, open_card, cmd_serialno, cmd_learn) (cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkdecrypt): Removed all special cases for the old card.c based mechanisms. * scdaemon.c, apdu.c: Removed all special cases for OpenSC. @@ -1365,7 +1371,7 @@ 2005-04-12 Werner Koch <[email protected]> Basic support for several sessions. - + * command.c (scd_command_handler): Replace the primary_connection stuff by a real connection list. Release the local context on exit. @@ -1373,7 +1379,7 @@ to all connections who registered an event signal. (cmd_lock, cmd_unlock, register_commands): New commands LOCK and UNLOCK. - (cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt, cmd_setattr) + (cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt, cmd_setattr) (cmd_genkey, cmd_passwd, cmd_checkpin): Return an error if reader is locked. (do_reset): Handle locking. @@ -1443,7 +1449,7 @@ * apdu.c: Added some PCSC error codes. (pcsc_error_to_sw): New. - (reset_pcsc_reader, pcsc_get_status, pcsc_send_apdu) + (reset_pcsc_reader, pcsc_get_status, pcsc_send_apdu) (open_pcsc_reader): Do proper error code mapping. 2005-03-16 Werner Koch <[email protected]> @@ -1524,7 +1530,7 @@ * apdu.c [W32]: Disable use of pcsc_wrapper. * Makefile.am (scdaemon_LDADD): Reorder libs. - (sc_copykeys_LDADD): Add libassuan because it is needed for W32. + (sc_copykeys_LDADD): Add libassuan because it is needed for W32. 2004-12-06 Werner Koch <[email protected]> @@ -1541,17 +1547,17 @@ This avoids problems with missing vasprintf implementations in gnupg 1.4. - * app-common.h (app_openpgp_storekey: Add prototype. + * app-common.h (app_openpgp_storekey: Add prototype. 2004-10-20 Werner Koch <[email protected]> * sc-investigate: Removed. * Makefile.am (sc_investigate): Removed. - + * pcsc-wrapper.c (load_pcsc_driver): Load get_status_change func. (handle_open): Succeed even without a present card. (handle_status, handle_reset): New. - + * apdu.c (apdu_open_reader): Load pcsc_get_status_change fucntion. (pcsc_get_status): Implemented. (reset_pcsc_reader): Implemented. @@ -1566,7 +1572,7 @@ 2004-10-14 Werner Koch <[email protected]> - * app-openpgp.c (parse_login_data): New. + * app-openpgp.c (parse_login_data): New. (app_select_openpgp): Call it. (do_setattr): Reparse it after change. @@ -1593,7 +1599,7 @@ * app-openpgp.c: Made all strings translatable. (verify_chv3) [GNUPG_MAJOR_VERSION]: Make opt.allow_admin - available for use in gnupg 2. + available for use in gnupg 2. (verify_chv3): Reimplemented countdown showing to use only functions from this module. Flush the CVH status cache on a successful read. @@ -1604,7 +1610,7 @@ (get_cached_data): Move local data initialization to .. (app_select_openpgp): .. here. Read some flags for later use. (do_getattr): New read-only attribute EXTCAP. - + * apdu.c (open_pcsc_reader): Do not print empty reader string. * ccid-driver.c (do_close_reader): Factored some code out from ... @@ -1689,21 +1695,21 @@ * Makefile.am: Make OpenSC lib link after libgcrypt. Do not link to pth. * apdu.c: Don't use Pth if we use OpenSC. - * sc-investigate.c, scdaemon.c: Disable use of pth if OpenSC is used. + * sc-investigate.c, scdaemon.c: Disable use of pth if OpenSC is used. * scdaemon.c (main): Bumbed thread stack size up to 512k. 2004-07-16 Werner Koch <[email protected]> * apdu.c (reader_table_s): Add function pointers for the backends. - (apdu_close_reader, apdu_get_status, apdu_activate) + (apdu_close_reader, apdu_get_status, apdu_activate) (send_apdu): Make use of them. (new_reader_slot): Intialize them to NULL. (dump_ccid_reader_status, ct_dump_reader_status): New. (dump_pcsc_reader_status): New. - (open_ct_reader, open_pcsc_reader, open_ccid_reader) + (open_ct_reader, open_pcsc_reader, open_ccid_reader) (open_osc_reader, open_rapdu_reader): Intialize function pointers. - (ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu) + (ct_activate_card, ct_send_apdu, pcsc_send_apdu, osc_send_apdu) (error_string): Removed. Replaced by apdu_strerror. (get_ccid_error_string): Removed. (ct_activate_card): Remove the unused loop. @@ -1834,7 +1840,7 @@ * apdu.h: New pseudo stati SW_HOST_NOT_SUPPORTED, SW_HOST_LOCKING_FAILED and SW_HOST_BUSY. * iso7816.c (map_sw): Map it. - + * ccid-driver.c (ccid_slot_status): Add arg STATUSBITS. * apdu.c (apdu_get_status): New. (ct_get_status, pcsc_get_status, ocsc_get_status): New stubs. @@ -1843,7 +1849,7 @@ (reset_ct_reader, reset_pcsc_reader, reset_osc_reader): New stubs. (reset_ccid_reader): New. (apdu_enum_reader): New. - + * apdu.c (lock_slot, trylock_slot, unlock_slot): New helpers. (new_reader_slot) [USE_GNU_PTH]: Init mutex. (apdu_reset, apdu_get_status, apdu_send_le): Run functions @@ -1936,7 +1942,7 @@ (cmd_serialno): Allow optional argument to select the desired application. - * app-nks.c: New. + * app-nks.c: New. * scdaemon.h (opt): Add READER_PORT. * scdaemon.c (main): Set it here. @@ -2107,12 +2113,12 @@ * ccid-driver.c, ccid-driver.h: New but far from being useful. * Makefile.am: Add above. * apdu.c: Add support for that ccid driver. - + 2003-08-26 Timo Schulz <[email protected]> * apdu.c (new_reader_slot): Only set 'is_osc' when OpenSC is used. - + 2003-08-25 Werner Koch <[email protected]> * command.c (cmd_setattr): Use a copy of LINE. @@ -2128,7 +2134,7 @@ 2003-08-18 Werner Koch <[email protected]> - * Makefile.am: Add OPENSC_LIBS to all programs. + * Makefile.am: Add OPENSC_LIBS to all programs. * scdaemon.c, scdaemon.h: New option --disable-opensc. * card.c (card_open): Implement it. @@ -2168,7 +2174,7 @@ * scdaemon.c, scdaemon.h: New option --ctapi-driver. * sc-investigate.c, sc-copykeys.c: Ditto. - + 2003-07-31 Werner Koch <[email protected]> * Makefile.am (scdaemon_LDADD): Added INTLLIBS. @@ -2244,7 +2250,7 @@ * app-openpgp.c (get_sig_counter): New. (do_sign): Print the signature counter and enable the PIN callback. - (do_genkey): Implement the PIN callback. + (do_genkey): Implement the PIN callback. 2003-07-01 Werner Koch <[email protected]> @@ -2315,7 +2321,7 @@ * apdu.c, apdu.h: New * card.c, card-p15.c, card-dinsig.c: Allow build without OpenSC. - + * Makefile.am (LDFLAGS): Removed. * command.c (register_commands): Adjusted for new Assuan semantics. @@ -2348,7 +2354,7 @@ 2002-07-30 Werner Koch <[email protected]> Changes to cope with OpenSC 0.7.0: - + * card.c: Removed the check for the packed opensc version. Changed include file names of opensc. (map_sc_err): Adjusted error codes for new opensc version. @@ -2356,7 +2362,7 @@ * card-dinsig.c: Ditto. * card-p15.c (p15_decipher): Add flags argument to OpenSC call. - + 2002-07-24 Werner Koch <[email protected]> * card.c (find_simple_tlv, find_iccsn): New. @@ -2402,7 +2408,7 @@ * scdaemon.c scdaemon.h, command.c: New. Based on the code from the gpg-agent. - + Copyright 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. This file is free software; as a special exception the author gives diff --git a/scd/apdu.c b/scd/apdu.c index 0fe044cbe..b68cd71fa 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -344,7 +344,7 @@ new_reader_slot (void) reader_table[reader].dump_status_reader = NULL; reader_table[reader].set_progress_cb = NULL; - reader_table[reader].used = 1; + reader_table[reader].used = 1; reader_table[reader].any_status = 0; reader_table[reader].last_status = 0; reader_table[reader].is_t0 = 1; @@ -395,8 +395,8 @@ host_sw_string (long err) case SW_HOST_GENERAL_ERROR: return "general error"; case SW_HOST_NO_READER: return "no reader"; case SW_HOST_ABORTED: return "aborted"; - case SW_HOST_NO_KEYPAD: return "no keypad"; - case SW_HOST_ALREADY_CONNECTED: return "already connected"; + case SW_HOST_NO_KEYPAD: return "no keypad"; + case SW_HOST_ALREADY_CONNECTED: return "already connected"; default: return "unknown host status error"; } } @@ -772,7 +772,7 @@ pcsc_error_to_sw (long ec) case PCSC_E_INVALID_TARGET: case PCSC_E_INVALID_VALUE: - case PCSC_E_INVALID_HANDLE: + case PCSC_E_INVALID_HANDLE: case PCSC_E_INVALID_PARAMETER: case PCSC_E_INSUFFICIENT_BUFFER: rc = SW_HOST_INV_VALUE; break; @@ -986,7 +986,7 @@ pcsc_get_status (int slot, unsigned int *status) #ifndef NEED_PCSC_WRAPPER static int pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen, - unsigned char *buffer, size_t *buflen, + unsigned char *buffer, size_t *buflen, struct pininfo_s *pininfo) { long err; @@ -1022,7 +1022,7 @@ pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen, #ifdef NEED_PCSC_WRAPPER static int pcsc_send_apdu_wrapped (int slot, unsigned char *apdu, size_t apdulen, - unsigned char *buffer, size_t *buflen, + unsigned char *buffer, size_t *buflen, struct pininfo_s *pininfo) { long err; @@ -1141,7 +1141,7 @@ pcsc_send_apdu_wrapped (int slot, unsigned char *apdu, size_t apdulen, BUFLEN. Returns: A status word. */ static int pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen, - unsigned char *buffer, size_t *buflen, + unsigned char *buffer, size_t *buflen, struct pininfo_s *pininfo) { #ifdef NEED_PCSC_WRAPPER @@ -1270,7 +1270,7 @@ connect_pcsc_card (int slot) if (err) { reader_table[slot].pcsc.card = 0; - if (err != PCSC_E_NO_SMARTCARD) + if (err != PCSC_E_NO_SMARTCARD) log_error ("pcsc_connect failed: %s (0x%lx)\n", pcsc_error_string (err), err); } @@ -1320,7 +1320,7 @@ disconnect_pcsc_card (int slot) assert (slot >= 0 && slot < MAX_READER); if (!reader_table[slot].pcsc.card) - return 0; + return 0; err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD); if (err) @@ -1584,7 +1584,8 @@ open_pcsc_reader_wrapped (const char *portstr) unsigned char msgbuf[9]; int err; unsigned int dummy_status; - int sw = SW_HOST_CARD_IO_ERROR; + /*int sw = SW_HOST_CARD_IO_ERROR;*/ + /* Note that we use the constant and not the fucntion because this code won't be be used under Windows. */ const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper"; @@ -1728,7 +1729,7 @@ open_pcsc_reader_wrapped (const char *portstr) if (err) { log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err)); - sw = pcsc_error_to_sw (err); + /*sw = pcsc_error_to_sw (err);*/ goto command_failed; } @@ -2618,7 +2619,7 @@ apdu_connect (int slot) } else sw = 0; - + /* We need to call apdu_get_status_internal, so that the last-status machinery gets setup properly even if a card is inserted while scdaemon is fired up and apdu_get_status has not yet been called. @@ -2876,7 +2877,7 @@ send_apdu (int slot, unsigned char *apdu, size_t apdulen, if (reader_table[slot].send_apdu_reader) return reader_table[slot].send_apdu_reader (slot, apdu, apdulen, - buffer, buflen, + buffer, buflen, pininfo); else return SW_HOST_NOT_SUPPORTED; @@ -2904,7 +2905,7 @@ send_le (int slot, int class, int ins, int p0, int p1, { #define SHORT_RESULT_BUFFER_SIZE 258 /* We allocate 8 extra bytes as a safety margin towards a driver bug. */ - unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; + unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; unsigned char *result_buffer = NULL; size_t result_buffer_size; unsigned char *result; @@ -2942,16 +2943,16 @@ send_le (int slot, int class, int ins, int p0, int p1, if (lc > 16384) return SW_WRONG_LENGTH; /* Sanity check. */ if ((class&0xf0) != 0) - return SW_HOST_INV_VALUE; /* Upper 4 bits need to be 0. */ - use_chaining = extended_mode == -1? 255 : -extended_mode; + return SW_HOST_INV_VALUE; /* Upper 4 bits need to be 0. */ + use_chaining = extended_mode == -1? 255 : -extended_mode; use_chaining &= 0xff; } - else + else return SW_HOST_INV_VALUE; } else if (lc == -1 && extended_mode > 0) use_extended_length = 1; - + if (le != -1 && (le > (extended_mode > 0? 255:256) || le < 0)) { /* Expected Data does not fit into an APDU. What we do now @@ -2964,7 +2965,7 @@ send_le (int slot, int class, int ins, int p0, int p1, ; /* We are already using extended length. */ else if (extended_mode > 0) use_extended_length = 1; - else + else return SW_HOST_INV_VALUE; } @@ -3035,8 +3036,8 @@ send_le (int slot, int class, int ins, int p0, int p1, } if (le != -1) { - apdu[apdulen++] = ((le >> 8) & 0xff); - apdu[apdulen++] = (le & 0xff); + apdu[apdulen++] = ((le >> 8) & 0xff); + apdu[apdulen++] = (le & 0xff); } } else @@ -3090,7 +3091,7 @@ send_le (int slot, int class, int ins, int p0, int p1, return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; } sw = (result[resultlen-2] << 8) | result[resultlen-1]; - if (!use_extended_length + if (!use_extended_length && !did_exact_length_hack && SW_EXACT_LENGTH_P (sw)) { apdu[apdulen-1] = (sw & 0x00ff); @@ -3106,7 +3107,7 @@ send_le (int slot, int class, int ins, int p0, int p1, apdu_buffer = NULL; apdu_buffer_size = 0; } - + /* Store away the returned data but strip the statusword. */ resultlen -= 2; if (DBG_CARD_IO) @@ -3249,7 +3250,7 @@ send_le (int slot, int class, int ins, int p0, int p1, that data will be put into *RETBUFLEN. The caller is reponsible for releasing the buffer even in case of errors. */ int -apdu_send_le(int slot, int extended_mode, +apdu_send_le(int slot, int extended_mode, int class, int ins, int p0, int p1, int lc, const char *data, int le, unsigned char **retbuf, size_t *retbuflen) @@ -3292,7 +3293,7 @@ apdu_send_simple (int slot, int extended_mode, int class, int ins, int p0, int p1, int lc, const char *data) { - return send_le (slot, class, ins, p0, p1, lc, data, -1, NULL, NULL, NULL, + return send_le (slot, class, ins, p0, p1, lc, data, -1, NULL, NULL, NULL, extended_mode); } @@ -3300,7 +3301,7 @@ apdu_send_simple (int slot, int extended_mode, /* Same as apdu_send_simple but uses the keypad of the reader. */ int apdu_send_simple_kp (int slot, int class, int ins, int p0, int p1, - int lc, const char *data, + int lc, const char *data, int pin_mode, int pinlen_min, int pinlen_max, int pin_padlen) { @@ -3332,7 +3333,7 @@ apdu_send_direct (int slot, size_t extended_length, unsigned char **retbuf, size_t *retbuflen) { #define SHORT_RESULT_BUFFER_SIZE 258 - unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; + unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; unsigned char *result_buffer = NULL; size_t result_buffer_size; unsigned char *result; diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c index a7b219822..ee974ac7b 100644 --- a/scd/pcsc-wrapper.c +++ b/scd/pcsc-wrapper.c @@ -27,7 +27,7 @@ pcsc interface but to a higher level one which resembles the code used in scdaemon (apdu.c) when not using Pth or while running under Windows. - + The interface is binary consisting of a command tag and the length of the parameter list. The calling process needs to pass the version number of the interface on the command line to make sure @@ -56,7 +56,7 @@ #define MYVERSION_LINE PGM " (GnuPG) " VERSION #define BUGREPORT_LINE "\nReport bugs to <[email protected]>.\n" #else -#define MYVERSION_LINE PGM +#define MYVERSION_LINE PGM #define BUGREPORT_LINE "" #endif @@ -67,14 +67,14 @@ static int verbose; /* PC/SC constants and function pointer. */ -#define PCSC_SCOPE_USER 0 -#define PCSC_SCOPE_TERMINAL 1 -#define PCSC_SCOPE_SYSTEM 2 -#define PCSC_SCOPE_GLOBAL 3 +#define PCSC_SCOPE_USER 0 +#define PCSC_SCOPE_TERMINAL 1 +#define PCSC_SCOPE_SYSTEM 2 +#define PCSC_SCOPE_GLOBAL 3 -#define PCSC_PROTOCOL_T0 1 -#define PCSC_PROTOCOL_T1 2 -#define PCSC_PROTOCOL_RAW 4 +#define PCSC_PROTOCOL_T0 1 +#define PCSC_PROTOCOL_T1 2 +#define PCSC_PROTOCOL_RAW 4 #define PCSC_SHARE_EXCLUSIVE 1 #define PCSC_SHARE_SHARED 2 @@ -85,7 +85,7 @@ static int verbose; #define PCSC_UNPOWER_CARD 2 #define PCSC_EJECT_CARD 3 -#define PCSC_UNKNOWN 0x0001 +#define PCSC_UNKNOWN 0x0001 #define PCSC_ABSENT 0x0002 /* Card is absent. */ #define PCSC_PRESENT 0x0004 /* Card is present. */ #define PCSC_SWALLOWED 0x0008 /* Card is present and electrical connected. */ @@ -106,7 +106,7 @@ static int verbose; #define PCSC_STATE_MUTE 0x0200 /* Unresponsive card. */ struct pcsc_io_request_s { - unsigned long protocol; + unsigned long protocol; unsigned long pci_len; }; @@ -235,7 +235,7 @@ request_succeeded (const void *buffer, size_t buflen) fflush (stdout); } - + static unsigned long @@ -271,40 +271,40 @@ pcsc_error_string (long err) { case 0x0002: s = "cancelled"; break; case 0x000e: s = "can't dispose"; break; - case 0x0008: s = "insufficient buffer"; break; + case 0x0008: s = "insufficient buffer"; break; case 0x0015: s = "invalid ATR"; break; case 0x0003: s = "invalid handle"; break; - case 0x0004: s = "invalid parameter"; break; + case 0x0004: s = "invalid parameter"; break; case 0x0005: s = "invalid target"; break; - case 0x0011: s = "invalid value"; break; - case 0x0006: s = "no memory"; break; - case 0x0013: s = "comm error"; break; - case 0x0001: s = "internal error"; break; - case 0x0014: s = "unknown error"; break; - case 0x0007: s = "waited too long"; break; + case 0x0011: s = "invalid value"; break; + case 0x0006: s = "no memory"; break; + case 0x0013: s = "comm error"; break; + case 0x0001: s = "internal error"; break; + case 0x0014: s = "unknown error"; break; + case 0x0007: s = "waited too long"; break; case 0x0009: s = "unknown reader"; break; - case 0x000a: s = "timeout"; break; - case 0x000b: s = "sharing violation"; break; + case 0x000a: s = "timeout"; break; + case 0x000b: s = "sharing violation"; break; case 0x000c: s = "no smartcard"; break; - case 0x000d: s = "unknown card"; break; - case 0x000f: s = "proto mismatch"; break; - case 0x0010: s = "not ready"; break; - case 0x0012: s = "system cancelled"; break; + case 0x000d: s = "unknown card"; break; + case 0x000f: s = "proto mismatch"; break; + case 0x0010: s = "not ready"; break; + case 0x0012: s = "system cancelled"; break; case 0x0016: s = "not transacted"; break; - case 0x0017: s = "reader unavailable"; break; - case 0x0065: s = "unsupported card"; break; - case 0x0066: s = "unresponsive card"; break; - case 0x0067: s = "unpowered card"; break; - case 0x0068: s = "reset card"; break; - case 0x0069: s = "removed card"; break; - case 0x006a: s = "inserted card"; break; - case 0x001f: s = "unsupported feature"; break; - case 0x0019: s = "PCI too small"; break; - case 0x001a: s = "reader unsupported"; break; - case 0x001b: s = "duplicate reader"; break; - case 0x001c: s = "card unsupported"; break; - case 0x001d: s = "no service"; break; - case 0x001e: s = "service stopped"; break; + case 0x0017: s = "reader unavailable"; break; + case 0x0065: s = "unsupported card"; break; + case 0x0066: s = "unresponsive card"; break; + case 0x0067: s = "unpowered card"; break; + case 0x0068: s = "reset card"; break; + case 0x0069: s = "removed card"; break; + case 0x006a: s = "inserted card"; break; + case 0x001f: s = "unsupported feature"; break; + case 0x0019: s = "PCI too small"; break; + case 0x001a: s = "reader unsupported"; break; + case 0x001b: s = "duplicate reader"; break; + case 0x001c: s = "card unsupported"; break; + case 0x001d: s = "no service"; break; + case 0x001e: s = "service stopped"; break; default: s = "unknown PC/SC error code"; break; } return s; @@ -337,16 +337,16 @@ load_pcsc_driver (const char *libname) pcsc_set_timeout = dlsym (handle, "SCardSetTimeout"); if (!pcsc_establish_context - || !pcsc_release_context - || !pcsc_list_readers + || !pcsc_release_context + || !pcsc_list_readers || !pcsc_get_status_change - || !pcsc_connect - || !pcsc_reconnect + || !pcsc_connect + || !pcsc_reconnect || !pcsc_disconnect || !pcsc_status || !pcsc_begin_transaction || !pcsc_end_transaction - || !pcsc_transmit + || !pcsc_transmit /* || !pcsc_set_timeout */) { /* Note that set_timeout is currently not used and also not @@ -355,22 +355,22 @@ load_pcsc_driver (const char *libname) "apdu_open_reader: invalid PC/SC driver " "(%d%d%d%d%d%d%d%d%d%d%d%d)\n", !!pcsc_establish_context, - !!pcsc_release_context, - !!pcsc_list_readers, - !!pcsc_get_status_change, - !!pcsc_connect, - !!pcsc_reconnect, + !!pcsc_release_context, + !!pcsc_list_readers, + !!pcsc_get_status_change, + !!pcsc_connect, + !!pcsc_reconnect, !!pcsc_disconnect, !!pcsc_status, !!pcsc_begin_transaction, !!pcsc_end_transaction, - !!pcsc_transmit, + !!pcsc_transmit, !!pcsc_set_timeout ); dlclose (handle); exit (1); } } - + @@ -384,7 +384,7 @@ handle_open (unsigned char *argbuf, size_t arglen) long err; const char * portstr; char *list = NULL; - unsigned long nreader, listlen, atrlen; + unsigned long nreader, atrlen; char *p; unsigned long card_state, card_protocol; unsigned char atr[33]; @@ -409,7 +409,7 @@ handle_open (unsigned char *argbuf, size_t arglen) request_failed (err); return; } - + err = pcsc_list_readers (pcsc_context, NULL, NULL, &nreader); if (!err) { @@ -431,7 +431,6 @@ handle_open (unsigned char *argbuf, size_t arglen) return; } - listlen = nreader; p = list; while (nreader) { @@ -477,8 +476,8 @@ handle_open (unsigned char *argbuf, size_t arglen) pcsc_protocol = 0; request_failed (err); return; - } - + } + current_atrlen = 0; if (!err) { @@ -658,9 +657,9 @@ handle_reset (unsigned char *argbuf, size_t arglen) pcsc_card = 0; request_failed (err); return; - } + } + - atrlen = 33; nreader = sizeof reader - 1; err = pcsc_status (pcsc_card, @@ -731,7 +730,7 @@ print_version (int with_help) "This is free software, and you are welcome to redistribute it\n" "under certain conditions. See the file COPYING for details.\n", stdout); - + if (with_help) fputs ("\n" "Usage: " PGM " [OPTIONS] API-NUMBER [LIBNAME]\n" @@ -741,7 +740,7 @@ print_version (int with_help) " --version print version of the program and exit\n" " --help display this help and exit\n" BUGREPORT_LINE, stdout ); - + exit (0); } @@ -752,7 +751,7 @@ main (int argc, char **argv) int last_argc = -1; int api_number = 0; int c; - + if (argc) { argc--; argv++; @@ -774,7 +773,7 @@ main (int argc, char **argv) verbose = 1; argc--; argv++; } - } + } if (argc != 1 && argc != 2) { fprintf (stderr, "usage: " PGM " API-NUMBER [LIBNAME]\n"); @@ -795,7 +794,7 @@ main (int argc, char **argv) { size_t arglen; unsigned char argbuffer[2048]; - + arglen = read_32 (stdin); if (arglen >= sizeof argbuffer - 1) { diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 5b7ecf21f..95f657065 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1,5 +1,5 @@ /* scdaemon.c - The GnuPG Smartcard Daemon - * Copyright (C) 2001, 2002, 2004, 2005, + * Copyright (C) 2001, 2002, 2004, 2005, * 2007, 2008, 2009 Free Software Foundation, Inc. * * This file is part of GnuPG. @@ -53,13 +53,13 @@ #include "mkdtemp.h" #include "gc-opt-flags.h" -enum cmd_and_opt_values +enum cmd_and_opt_values { aNull = 0, oCsh = 'c', oQuiet = 'q', oSh = 's', oVerbose = 'v', - + oNoVerbose = 500, aGPGConfList, aGPGConfTest, @@ -99,11 +99,11 @@ enum cmd_and_opt_values static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"), ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"), - + ARGPARSE_group (301, N_("@Options:\n ")), ARGPARSE_s_n (oServer,"server", N_("run in server mode (foreground)")), - ARGPARSE_s_n (oMultiServer, "multi-server", + ARGPARSE_s_n (oMultiServer, "multi-server", N_("run in multi server mode (foreground)")), ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")), ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")), @@ -122,11 +122,11 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_n (oDebugLogTid, "debug-log-tid", "@"), ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")), ARGPARSE_s_s (oLogFile, "log-file", N_("|FILE|write a log to FILE")), - ARGPARSE_s_s (oReaderPort, "reader-port", + ARGPARSE_s_s (oReaderPort, "reader-port", N_("|N|connect to reader at port N")), - ARGPARSE_s_s (octapiDriver, "ctapi-driver", + ARGPARSE_s_s (octapiDriver, "ctapi-driver", N_("|NAME|use NAME as ct-API driver")), - ARGPARSE_s_s (opcscDriver, "pcsc-driver", + ARGPARSE_s_s (opcscDriver, "pcsc-driver", N_("|NAME|use NAME as PC/SC driver")), ARGPARSE_s_n (oDisableCCID, "disable-ccid", #ifdef HAVE_LIBUSB @@ -135,15 +135,15 @@ static ARGPARSE_OPTS opts[] = { "@" #endif /* end --disable-ccid */), - ARGPARSE_s_u (oCardTimeout, "card-timeout", + ARGPARSE_s_u (oCardTimeout, "card-timeout", N_("|N|disconnect the card after N seconds of inactivity")), - ARGPARSE_s_n (oDisableKeypad, "disable-keypad", + ARGPARSE_s_n (oDisableKeypad, "disable-keypad", N_("do not use a reader's keypad")), ARGPARSE_s_n (oAllowAdmin, "allow-admin", "@"), - ARGPARSE_s_n (oDenyAdmin, "deny-admin", + ARGPARSE_s_n (oDenyAdmin, "deny-admin", N_("deny the use of admin card commands")), ARGPARSE_s_s (oDisableApplication, "disable-application", "@"), - + ARGPARSE_end () }; @@ -218,7 +218,7 @@ make_libversion (const char *libname, const char *(*getfnc)(const char*)) { const char *s; char *result; - + if (maybe_setuid) { gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */ @@ -261,7 +261,7 @@ my_strusage (int level) case 41: p = _("Syntax: scdaemon [options] [command [args]]\n" "Smartcard daemon for GnuPG\n"); break; - + default: p = NULL; } return p; @@ -309,7 +309,7 @@ set_debug (const char *level) /* Unless the "guru" string has been used we don't want to allow hashing debugging. The rationale is that people tend to select the highest debug value and would then clutter their - disk with debug files which may reveal confidential data. */ + disk with debug files which may reveal confidential data. */ if (numok) opt.debug &= ~(DBG_HASHING_VALUE); } @@ -333,17 +333,17 @@ set_debug (const char *level) if (opt.debug) log_info ("enabled debug flags:%s%s%s%s%s%s%s%s%s\n", - (opt.debug & DBG_COMMAND_VALUE)? " command":"", - (opt.debug & DBG_MPI_VALUE )? " mpi":"", - (opt.debug & DBG_CRYPTO_VALUE )? " crypto":"", - (opt.debug & DBG_MEMORY_VALUE )? " memory":"", - (opt.debug & DBG_CACHE_VALUE )? " cache":"", - (opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"", - (opt.debug & DBG_HASHING_VALUE)? " hashing":"", + (opt.debug & DBG_COMMAND_VALUE)? " command":"", + (opt.debug & DBG_MPI_VALUE )? " mpi":"", + (opt.debug & DBG_CRYPTO_VALUE )? " crypto":"", + (opt.debug & DBG_MEMORY_VALUE )? " memory":"", + (opt.debug & DBG_CACHE_VALUE )? " cache":"", + (opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"", + (opt.debug & DBG_HASHING_VALUE)? " hashing":"", (opt.debug & DBG_ASSUAN_VALUE )? " assuan":"", (opt.debug & DBG_CARD_IO_VALUE)? " cardio":""); } - + static void @@ -373,7 +373,6 @@ main (int argc, char **argv ) ARGPARSE_ARGS pargs; int orig_argc; gpg_error_t err; - int may_coredump; char **orig_argv; FILE *configfp = NULL; char *configname = NULL; @@ -395,13 +394,13 @@ main (int argc, char **argv ) int allow_coredump = 0; int standard_socket = 0; struct assuan_malloc_hooks malloc_hooks; - + set_strusage (my_strusage); gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN); /* Please note that we may running SUID(ROOT), so be very CAREFUL when adding any stuff between here and the call to INIT_SECMEM() somewhere after the option parsing */ - log_set_prefix ("scdaemon", 1|4); + log_set_prefix ("scdaemon", 1|4); /* Make sure that our subsystems are ready. */ i18n_init (); @@ -440,11 +439,11 @@ main (int argc, char **argv ) setup_libgcrypt_logging (); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); - may_coredump = disable_core_dumps (); + disable_core_dumps (); /* Set default options. */ opt.allow_admin = 1; - opt.pcsc_driver = DEFAULT_PCSC_DRIVER; + opt.pcsc_driver = DEFAULT_PCSC_DRIVER; #ifdef HAVE_W32_SYSTEM standard_socket = 1; /* Under Windows we always use a standard @@ -455,7 +454,7 @@ main (int argc, char **argv ) shell = getenv ("SHELL"); if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") ) csh_style = 1; - + opt.homedir = default_homedir (); /* Check whether we have a config file on the commandline */ @@ -484,15 +483,15 @@ main (int argc, char **argv ) gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); maybe_setuid = 0; - /* - Now we are working under our real uid + /* + Now we are working under our real uid */ if (default_config) configname = make_filename (opt.homedir, "scdaemon.conf", NULL ); - + argc = orig_argc; argv = orig_argv; pargs.argc = &argc; @@ -517,7 +516,7 @@ main (int argc, char **argv ) configname, strerror(errno) ); exit(2); } - xfree (configname); + xfree (configname); configname = NULL; } if (parse_debug && configname ) @@ -543,13 +542,13 @@ main (int argc, char **argv ) enable_core_dumps (); allow_coredump = 1; break; - case oDebugCCIDDriver: + case oDebugCCIDDriver: #ifdef HAVE_LIBUSB ccid_set_debug_level (ccid_set_debug_level (-1)+1); #endif /*HAVE_LIBUSB*/ break; case oDebugDisableTicker: ticker_disabled = 1; break; - case oDebugLogTid: + case oDebugLogTid: log_set_get_tid_callback (tid_log_callback); break; @@ -585,15 +584,15 @@ main (int argc, char **argv ) case oAllowAdmin: /* Dummy because allow is now the default. */ break; case oDenyAdmin: opt.allow_admin = 0; break; - + case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break; case oDisableApplication: - add_to_strlist (&opt.disabled_applications, pargs.r.ret_str); + add_to_strlist (&opt.disabled_applications, pargs.r.ret_str); break; - default: - pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR; + default: + pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR; break; } } @@ -623,7 +622,7 @@ main (int argc, char **argv ) log_info ("NOTE: this is a development version!\n"); #endif - + if (atexit (cleanup)) { log_error ("atexit failed\n"); @@ -691,9 +690,9 @@ main (int argc, char **argv ) gnupg_sleep (debug_wait); log_debug ("... okay\n"); } - + if (pipe_server) - { + { /* This is the simple pipe based server */ ctrl_t ctrl; pth_attr_t tattr; @@ -702,7 +701,7 @@ main (int argc, char **argv ) #ifndef HAVE_W32_SYSTEM { struct sigaction sa; - + sa.sa_handler = SIG_IGN; sigemptyset (&sa.sa_mask); sa.sa_flags = 0; @@ -730,7 +729,7 @@ main (int argc, char **argv ) socket_name = create_socket_name (standard_socket, "S.scdaemon", "/tmp/gpg-XXXXXX/S.scdaemon"); - + fd = FD2INT(create_server_socket (standard_socket, socket_name, &socket_nonce)); } @@ -787,17 +786,17 @@ main (int argc, char **argv ) fflush (NULL); #ifndef HAVE_W32_SYSTEM pid = fork (); - if (pid == (pid_t)-1) + if (pid == (pid_t)-1) { log_fatal ("fork failed: %s\n", strerror (errno) ); exit (1); } - else if (pid) + else if (pid) { /* we are the parent */ char *infostr; - + close (fd); - + /* create the info string: <name>:<pid>:<protocol_version> */ if (estream_asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1", socket_name, (ulong) pid) < 0) @@ -808,7 +807,7 @@ main (int argc, char **argv ) } *socket_name = 0; /* don't let cleanup() remove the socket - the child should do this from now on */ - if (argc) + if (argc) { /* run the program given on the commandline */ if (putenv (infostr)) { @@ -836,18 +835,18 @@ main (int argc, char **argv ) printf ( "%s; export SCDAEMON_INFO;\n", infostr); } xfree (infostr); - exit (0); + exit (0); } /* NOTREACHED */ } /* end parent */ - + /* This is the child. */ /* Detach from tty and put process into a new session. */ if (!nodetach ) - { + { /* Close stdin, stdout and stderr unless it is the log stream. */ - for (i=0; i <= 2; i++) + for (i=0; i <= 2; i++) { if ( log_test_fd (i) && i != fd) close (i); @@ -862,7 +861,7 @@ main (int argc, char **argv ) { struct sigaction sa; - + sa.sa_handler = SIG_IGN; sigemptyset (&sa.sa_mask); sa.sa_flags = 0; @@ -881,7 +880,7 @@ main (int argc, char **argv ) close (fd); } - + return 0; } @@ -944,7 +943,7 @@ handle_signal (int signo) "re-reading configuration and resetting cards\n"); /* reread_configuration (); */ break; - + case SIGUSR1: log_info ("SIGUSR1 received - printing internal information:\n"); pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); @@ -970,7 +969,7 @@ handle_signal (int signo) scd_exit (0); } break; - + case SIGINT: log_info ("SIGINT received - immediate shutdown\n"); log_info( "%s %s stopped\n", strusage(11), strusage(13)); @@ -1059,7 +1058,7 @@ create_server_socket (int is_standard_name, const char *name, scd_exit (2); } - serv_addr = xmalloc (sizeof (*serv_addr)); + serv_addr = xmalloc (sizeof (*serv_addr)); memset (serv_addr, 0, sizeof *serv_addr); serv_addr->sun_family = AF_UNIX; assert (strlen (name) + 1 < sizeof (serv_addr->sun_path)); @@ -1072,7 +1071,7 @@ create_server_socket (int is_standard_name, const char *name, remove (name); rc = assuan_sock_bind (fd, (struct sockaddr*) serv_addr, len); } - if (rc != -1 + if (rc != -1 && (rc=assuan_sock_get_nonce ((struct sockaddr*)serv_addr, len, nonce))) log_error (_("error getting nonce for the socket\n")); if (rc == -1) @@ -1091,7 +1090,7 @@ create_server_socket (int is_standard_name, const char *name, assuan_sock_close (fd); scd_exit (2); } - + if (opt.verbose) log_info (_("listening on socket `%s'\n"), serv_addr->sun_path); @@ -1109,7 +1108,7 @@ start_connection_thread (void *arg) if (ctrl->thread_startup.fd != GNUPG_INVALID_FD && assuan_sock_check_nonce (ctrl->thread_startup.fd, &socket_nonce)) { - log_info (_("error reading nonce on fd %d: %s\n"), + log_info (_("error reading nonce on fd %d: %s\n"), FD2INT(ctrl->thread_startup.fd), strerror (errno)); assuan_sock_close (ctrl->thread_startup.fd); xfree (ctrl); @@ -1187,7 +1186,7 @@ handle_connections (int listen_fd) for (;;) { sigset_t oldsigs; - + if (shutdown_pending) { if (pth_ctrl (PTH_CTRL_GETTHREADS) == 1) |