diff --git a/scd/ChangeLog b/scd/ChangeLog index 41c64a5b3..41a0f76e1 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,2455 +1,2459 @@ +2011-01-05 Werner Koch + + * ccid-driver.c (ccid_transceive_secure): Support the gnuk token. + 2010-11-16 Werner Koch * apdu.c (PCSC_UNKNOWN) [W32]: Fix all these values which don't match those of libpcsc. Reported by Michael Petig. 2010-10-27 Werner Koch * scdaemon.c (create_socket_name): Use TMPDIR. Change callers. 2010-10-18 Werner Koch * app-openpgp.c (parse_algorithm_attribute): Remove extra const in definition of DESC. 2010-08-16 Werner Koch * scdaemon.c: Replace remaining printf by es_printf. 2010-06-09 Werner Koch * scdaemon.c (main): s/log_set_get_tid_callback/log_set_pid_suffix_cb/. (tid_log_callback): Adjust for this change. 2010-03-11 Werner Koch * scdaemon.c: Include "asshelp.h". (main): Remove assuan_set_assuan_log_prefix. Add assuan_set_log_cb. (handle_signal): Disable pth ctrl dumping. * command.c (scd_command_handler): Remove assuan_set_log_stream. 2010-03-10 Werner Koch * Makefile.am (scdaemon_LDADD): Remove libjnlib.a. 2009-12-15 Werner Koch * iso7816.c (do_generate_keypair): s/readonly/read_only/ because the first is a keyword in VMS C. 2009-12-03 Werner Koch * scdaemon.c (set_debug): Allow for numerical debug leveles. Print active debug flags. 2009-11-25 Marcus Brinkmann * command.c (scd_command_handler): Use assuan_fd_t and assuan_fdopen on fds. 2009-11-05 Marcus Brinkmann * command.c (scd_command_handler): Call assuan_init_socket_server, not assuan_init_socket_server_ext. 2009-11-04 Werner Koch * command.c (register_commands): Add help arg to assuan_register_command. Add help strings to all commands. 2009-11-02 Marcus Brinkmann * command.c (reset_notify): Take LINE arg and return error. (register_commands): Use assuan_handler_t type. 2009-10-25 Werner Koch * scdaemon.c (scd_deinit_default_ctrl): Release IN_DATA. * command.c (cmd_setdata): Release IN_DATA. Reported by Klaus Flittner. 2009-10-16 Marcus Brinkmann * AM_CFLAGS, scdaemon_LDADD: Use libassuan instead of libassuan-pth. * scdaemon.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. (main): Call assuan_set_system_hooks and assuan_sock_init. 2009-09-23 Marcus Brinkmann * command.c: Include "scdaemon.h" before because of GPG_ERR_SOURCE_DEFAULT check. (option_handler, open_card, cmd_serialno, cmd_lean, cmd_readcert) (cmd_readkey, cmd_setdata, cmd_pksign, cmd_pkauth, cmd_pkdecrypt) (cmd_getattr, cmd_setattr, cmd_writecert, cmd_writekey) (cmd_genkey, cmd_random, cmd_passwd, cmd_checkpin, cmd_lock) (cmd_unlock, cmd_getinfo, cmd_restart, cmd_disconnect, cmd_apdu) (cmd_killscd): Return gpg_error_t instead of int. (scd_command_handler): Allocate assuan context before starting server. * scdaemon.c (main): Update to new Assuan API. 2009-09-03 Werner Koch * app-openpgp.c (do_decipher): Compute required Le. * iso7816.c (iso7816_decipher): Add new arg LE. * app-nks.c (do_decipher): Adjust for change. * iso7816.c (iso7816_put_data, iso7816_put_data_odd): Turn DATA into a void ptr. 2009-08-05 Werner Koch * app-openpgp.c (change_keyattr_from_string): New. (do_setattr): Support KEY-ATTR. 2009-07-29 Marcus Brinkmann * ccid-driver.c (print_pr_data): Fix 64 bit compat problem. 2009-07-24 Werner Koch * ccid-driver.c (parse_ccid_descriptor): Enable hack for SCR 3320. 2009-07-21 Werner Koch * ccid-driver.c [HAVE_PTH]: Include pth.h. (my_sleep): New. (bulk_in): s/gnupg_sleep/my_sleep/. 2009-07-20 Werner Koch * apdu.c [GNUPG_MAJOR_VERSION==1]: Include dynload.h. 2009-07-16 Werner Koch * command.c (update_reader_status_file): Test for unplugged reader. (TEST_CARD_REMOVAL): Ditto. * app.c (select_application): Ditto. * ccid-driver.c (bulk_out): Return CCID_DRIVER_ERR_NO_READER if a reader was unplugged. (struct ccid_driver_s): Turn nonnull_nad into an unsigned char. Turn apdu_level, auto_ifsd, powered_off, has_pinpad into bitfields. Add enodev_seen. * apdu.c (apdu_prepare_exit): New. (get_status_ccid): Return the status word and nut just -1. * scdaemon.c (scd_exit): Call it. 2009-07-13 Werner Koch * ccid-driver.c (struct ccid_driver_s): Add fields last_progress, progress_cb and progress_cb_arg. (ccid_set_progress_cb): New. (print_progress): New. (ccid_transceive): Call print_progress for wait time extensions. * apdu.c (struct reader_table_s): Add field set_progress_cb. (new_reader_slot): Clear that field. (open_ccid_reader): Set it to .. (set_progress_cb_ccid_reader): ... new fucntion. * app.c (print_progress_line): New. (lock_reader): Add arg CTRL to set a progress callback and change all callers to provide it. (unlock_reader): Remove the progress callback. 2009-07-10 Werner Koch * iso7816.c (iso7816_compute_ds): Add args EXTENDED_MODE and LE. Change all callers to use 0. (iso7816_internal_authenticate): Add args EXTENDED_MODE and LE. * app-openpgp.c (do_sign): Take exmode and Le from card capabilities and pass them to iso7816_compute_ds. (do_auth): Ditto for iso7816_internal_authenticate. (change_keyattr): Reset CHV verification status. 2009-07-09 Werner Koch * app-openpgp.c (change_keyattr): New. (do_writekey): Call it. * app-openpgp.c (does_key_exist): Add arg GENERATING. Change callers. 2009-06-30 Werner Koch * ccid-driver.c (ccid_transceive): Set RESYNCING flag. 2009-06-29 Werner Koch * ccid-driver.c (ccid_transceive): Add a hack to support extended length for Omnikey readers. (is_exlen_apdu): New. (parse_ccid_descriptor): Track short+extended apdu exchange level. 2009-06-18 Werner Koch * app-openpgp.c (verify_chv2): Remove special case for v2 cards. (get_public_key): Use extended mode. 2009-06-17 Werner Koch * iso7816.c (iso7816_get_data): Add arg EXTENDED_MODE. Change all callers. * app-openpgp.c (data_objects): Use bit flags. Add flag TRY_EXTLENGTH. (get_cached_data): Add arg TRY_EXTLEN and use it for iso7816_get_data. (get_one_do): Use extended length APDU if necessary. 2009-06-10 Werner Koch * app-openpgp.c (store_fpr): Change first arg to app_t; adjust callers. Flush the cache. 2009-06-09 Werner Koch * app-openpgp.c (do_readcert): Return NOT_FOUND if the retrieved data has a length of zero. (do_getattr): Add EXTCAP subkey "sm". 2009-05-20 Werner Koch * app-openpgp.c (verify_chv2): Add case for v2 cards. (verify_chv3): Factor some code out to .. (build_enter_admin_pin_prompt): .. new. (do_change_pin): Properly handle v2 cards. 2009-05-19 Werner Koch * scdaemon.c (create_server_socket): Use SUN_LEN. (JNLIB_NEED_AFLOCAL): Define. 2009-05-13 Werner Koch * ccid-driver.c (abort_cmd): Add arg SEQNO and change callers. (bulk_in): Retry on seqno mismatch. * apdu.c (send_le): Release result_buffer. (apdu_send_direct): Implemend extended length. * command.c (cmd_apdu): Add option "--exlen". 2009-05-11 Werner Koch * apdu.c (send_le): Replace log_error by log_info. 2009-05-08 Werner Koch * app-openpgp.c (do_genkey): Allow larger key sizes. (do_decipher): Ditto. * iso7816.c (do_generate_keypair): Add arg EXTENDED_MODE an LE. (iso7816_generate_keypair, iso7816_read_public_key): Ditto. Changed all callers. * apdu.c (send_le): Implement extended length return values. * ccid-driver.c (bulk_in): Retry on EAGAIN. (abort_cmd): Change seqno handling. 2009-04-28 Werner Koch * app-help.c (app_help_count_bits): New. * app-nks.c (switch_application): Detect mass signature cards. Take care of new NEED_APP_SELECT flag. (do_sign): Don't allow mass signature cards. (all_zero_p): New. (do_readkey): New. (app_select_nks): Register do_readkey. 2009-04-01 Werner Koch * app-openpgp.c (do_setattr, do_writekey): Prepare for extended length cards. 2009-03-31 Werner Koch * command.c (percent_plus_unescape): Remove. (cmd_setattr): Use percent_plus_unescape_inplace. 2009-03-30 Werner Koch * 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_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. (struct ccid_driver_s): Add field IFSC. (ccid_get_atr): Set IFSC. (ccid_transceive): Use negotiated IFSC and support S(IFS) command. 2009-03-26 Werner Koch * command.c (cmd_pksign): Allow more hash algorithms. * scdaemon.h (MAX_DIGEST_LEN): Change to 64. * apdu.c (open_ccid_reader): Clear the is_to flag. * app-nks.c (filelist): Add field KID. (do_getattr): Change standard authentication key. (do_sign): Setup a security environment for TCOS 3 cards and support all SHA-2 algorithms. 2009-03-24 Werner Koch * command.c (struct server_local_s): Add flag APP_CTX_MARKED_FOR_RELEASE. (do_reset): Set the flag. (open_card): Act on this flag. * app-common.h (struct app_ctx_s): Add flag NO_REUSE. (application_notify_card_reset): Set the flag. * app.c (select_application, release_application): Take care of that flag. 2009-03-20 Werner Koch * app-nks.c (keygripstr_from_pk_file): Fix for TCOS 3 cards. 2009-03-18 Werner Koch * apdu.c (open_pcsc_reader_wrapped): Use close_all_fds. * command.c (cmd_learn): Add option --keypairinfo. * app.c (app_write_learn_status): Add arg FLAGS. * app-common.h (struct app_ctx_s): Add arg FLAGS to LEARN_STATUS. Change all implementors. * app-p15.c (do_learn_status): Take care of flag bit 0. * app-nks.c (do_learn_status, do_learn_status_core): Ditto. 2009-03-10 Werner Koch * app-openpgp.c (send_key_attr): New. (do_getattr): New attribute KEY_ATTR. * command.c (send_status_direct): New. 2009-03-06 Werner Koch * app-nks.c (do_learn_status): Factor code out to.. (do_learn_status_core): .. new. (do_readcert, do_sign, do_decipher): Switch to SigG if needed. (verify_pin): Use DESC also for keypad based verify. 2009-03-05 Werner Koch * app-openpgp.c (verify_a_chv): Remove special case for keypads. (verify_chv3): Ditto. * app-nks.c (get_chv_status): New. (parse_pwidstr): New. (verify_pin): Add args PWID and DESC and use them. Remove the CHV1 caching. (do_change_pin): Allow PIN selection and add reset mode. (do_learn_status): Use NKS-NKS3 tag for TCOS 3 cards. (do_readcert, do_sign): Allow NKS-NKS3 tag. 2009-03-04 Werner Koch * app-nks.c (do_getattr): New. (app_select_nks): Register it. (verify_pin): Factor some code out to... (basic_pin_checks): New. (do_change_pin): Call the basic check. (app_select_nks): Move AID to .. (aid_nks): .. new. (aid_sigg): New. (switch_application): New. (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 * command.c (scd_command_handler): Remove dereference of STOPME after free. 2009-02-27 Werner Koch * app.c (get_supported_applications): New. * command.c (cmd_getinfo): New subcommand "app_list" (cmd_killscd): New. (register_commands): Register command KILLSCD. (struct server_local_s): Add field STOPME. (scd_command_handler): Act upon this. 2009-02-25 Werner Koch * apdu.c (apdu_get_status): Factor all code out to ... (apdu_private_get_status): .. new. Add arg NO_ATR_RESET. (apdu_connect): Call new function. * scdaemon.c: New option --debug-log-tid. (tid_log_callback): New. (main): Move debug-wait code after debug stream init. 2009-02-24 Werner Koch * 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_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_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) (ccid_transceive_secure): Remove old debug print code. 2009-02-12 Werner Koch * command.c (cmd_getinfo): Add new subcommand "deny_admin". 2009-01-28 Werner Koch * scdaemon.c (main): Make --allow-admin the default and make the option a dummy. 2009-01-27 Werner Koch * app-geldkarte.c: Changed to use an AID. * app.c (app_munge_serialno): Add case for no serialno. (app_get_serial_and_stamp): Ditto. 2009-01-26 Werner Koch * app-geldkarte.c: New. * Makefile.am (card_apps): Add new file. * app.c (select_application): Test for geldkarte. 2009-01-12 Werner Koch * command.c (send_client_notifications) [HAVE_W32_SYSTEM]: Fix brackets. 2009-01-08 Werner Koch * iso7816.c (iso7816_read_record, iso7816_read_binary): Pass 0 for L_e because the problem with the CCID driver has gone. (iso7816_apdu_direct): New. * app-nks.c (filelist): Add NKS_VER field. Add NKS 3 specific entries. (app_local_s, do_deinit): New. (get_nks_version): New. (app_select_nks): Setup local data. (keygripstr_from_pk_file): Replace SLOT by APP and take care of NKS version > 2. (do_learn_status): Take care of NKS version. 2009-01-05 Werner Koch * apdu.c (apdu_get_status): Save the last status. 2008-12-18 Werner Koch * ccid-driver.c (abort_cmd): New. (bulk_in): Call abort_cmd after severe errors. * apdu.c (reader_table_s): Add field ANY_STATUS. (new_reader_slot): Clear it. (apdu_get_status): Use ANY_STATUS to update the change counter. Remove the use of the flag bit from LAST_STATUS everywhere. * command.c (update_reader_status_file): Factor code out to ... (send_client_notifications): New. Track signals already sent. (update_reader_status_file): Shutdown the reader after a failed apdu_get_status. 2008-12-09 Werner Koch * scdaemon.c (main): Call i18n_init before init_common_subsystems. 2008-12-08 Werner Koch * scdaemon.c (handle_connections): Sync ticker to the next full interval. (TIMERTICK_INTERVAL_USEC): Change to 500ms. 2008-12-05 Werner Koch * app-openpgp.c (app_local_s): Add field ALGO_ATTR_CHANGE. (app_select_openpgp): Parse new capability. (show_caps): Show new capability. 2008-12-03 Werner Koch * scdaemon.c (opts): Use ARGPARSE_ macros. Add option --card-timeout. * command.c (update_reader_status_file): Implement it. 2008-11-18 Werner Koch * scdaemon.c (make_libversion): New. (my_strusage): Print libgcrypt and libksba version. 2008-11-03 Werner Koch * command.c (server_local_s): Add field DISCONNECT_ALLOWED. (cmd_disconnect): Implement command. (open_card): Reset disconnect flag. (update_reader_status_file): Disconnect if allowed. * app-common.h (app_ctx_s): Remove INITIALIZED. Make REF_COUNT 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) (app_writekey, app_get_challenge, app_change_pin, app_check_pin): Replace INITIALIZED by REF_COUNT check. (application_notify_card_removed): Rename to .. (application_notify_card_reset): .. this. Change all callers. * command.c (do_reset): Call application_notify_card_reset after sending a reset. (update_reader_status_file): Add arg SET_CARD_REMOVED. (scd_update_reader_status_file): Pass true for new flag. (do_reset): Pass false for new flag. * 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) (retrieve_fpr_from_card, send_keypair_info): Ditto. * app-nks.c (keygripstr_from_pk_file): Ditto. * command.c (cmd_apdu): Ditto. 2008-10-21 Marcus Brinkmann * command.c (open_card): If connect error is SW_HOST_NO_CARD, return a more descriptive error. 2008-10-20 Werner Koch * pcsc-wrapper.c (read_32): Use provided arg and not stdin. Is called with stdin, though. (handle_close): Mark unused arg. (handle_status, handle_reset): Ditto. * ccid-driver.c (ccid_check_card_presence): Mark not yet used arg. * scdaemon.c (scd_deinit_default_ctrl): Mark unused arg. * command.c (cmd_unlock, cmd_restart, cmd_disconnect): Ditto. * apdu.c (ct_get_status): Ditto. (ct_send_apdu, pcsc_send_apdu_wrapped) (apdu_open_remote_reader): Ditto. * app.c (select_application): Ditto. * app-openpgp.c (do_writecert, do_change_pin, do_writekey): Ditto. * app-nks.c (do_change_pin, do_check_pin): Ditto. 2008-10-16 Werner Koch * command.c (cmd_disconnect): New dummy command. (register_commands): Register command. 2008-10-15 Werner Koch * command.c (scd_command_handler): Return true if there is no more active session. * scdaemon.c (start_connection_thread): Set shutdown flag if requested by command handler. (main): Make PIPE_SERVER module global. (handle_connections): Disable listen_fd if a shutdown is pending. 2008-10-14 Werner Koch * apdu.c (reader_table_s): Add fields connect_card and disconnect_card. (new_reader_slot): Set them to NULL. (apdu_connect, apdu_disconnect): New. (apdu_close_reader, apdu_shutdown_reader): Call apdu_disconnect. (connect_pcsc_card, disconnect_pcsc_card): new. (reset_pcsc_reader_direct): Implement in terms of disconnect_pcsc_card and connect_pcsc_card. (apdu_get_atr): Return NULL if there is no ATR. * sc-copykeys.c (main): Add call to apdu_connect. * command.c (open_card): Ditto. * apdu.h (SW_HOST_ALREADY_CONNECTED): New. (APDU_CARD_USABLE, APDU_CARD_PRESENT, APDU_CARD_ACTIVE): New. * apdu.c: Replace constants by the new macros. (open_pcsc_reader): Factor code out to ... (open_pcsc_reader_direct, open_pcsc_reader_wrapped): New. (reset_pcsc_reader): Factor code out to ... (reset_pcsc_reader_direct, reset_pcsc_reader_wrapped): New. (pcsc_get_status): Factor code out to ... (pcsc_get_status_direct, pcsc_get_status_wrapped): New. (pcsc_send_apdu): Factor code out to ... (pcsc_send_apdu_direct, pcsc_send_apdu_wrapped): New. (close_pcsc_reader): Factor code out to ... (close_pcsc_reader_direct, close_pcsc_reader_wrapped): New. * command.c (update_reader_status_file): Open the reader if not yet done. * scdaemon.c (TIMERTICK_INTERVAL_SEC, TIMERTICK_INTERVAL_USEC): New to replace TIMERTICK_INTERVAL. Chnage from 2s (4 under W32) to 250ms. 2008-10-13 Werner Koch * command.c (option_handler) [W32]: Use strtoul with base 16. (update_reader_status_file) [W32]: Set Event. (scd_command_handler): Use INT2FD to silent warning. 2008-09-29 Werner Koch * scdaemon.h (GCRY_MD_USER): Rename to GCRY_MODULE_ID_USER. (GCRY_MD_USER_TLS_MD5SHA1): Rename to MD_USER_TLS_MD5SHA1 and change all users. 2008-09-28 Marcus Brinkmann * apdu.c (pcsc_get_status): Fix last change. 2008-09-25 Werner Koch * app-openpgp.c (do_setattr): Do not allow setting of the reset code. (do_change_pin): Allow setting of the reset code. 2008-09-24 Werner Koch * app-openpgp.c (verify_chv3): Set the did_chv3 flag which was accidently removed on 2008-03-26. (verify_chv2): Revert last change. (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. 2008-09-23 Werner Koch * app-openpgp.c (do_sign): Support SHA-2 digests. (verify_chv2): No CHV auto-sync for v2 cards. (do_auth): Allow 2048 bit keys. (parse_algorithm_attribute): New. (rsa_key_format_t): New. (struct app_local_s): Add struct KEYATTR. 2008-09-23 Marcus Brinkmann * apdu.c (pcsc_get_status): Be more relaxed with the usable flag under Windows. 2008-09-23 Werner Koch * app-openpgp.c (do_setattr): Use command chaining for long values. * iso7816.c (iso7816_put_data): Add arg EXTENDED_MODE. Change all callers. * apdu.c (apdu_send_simple): Add arg EXTENDED_MODE. Change all callers. (send_le): Implement command chaining. * ccid-driver.c (ccid_transceive_apdu_level): Increase allowed APDU size. (ccid_transceive): Alow for APDUS of up to 259 bytes. * apdu.h: Add new SW_ codes. 2008-09-16 Werner Koch * command.c (cmd_writecert): New. (register_commands): Register it. * app-common.h (app_ctx_s): Add member WRITECERT. * app.c (app_writecert): New. * app-openpgp.c (do_writecert): New. (parse_historical): New. (show_extcap): New. (dump_all_do): Print only the length of longs DOs. * command.c (cmd_writekey, cmd_apdu, cmd_pksign) (cmd_passwd): Replace open coding by skip_options. 2008-08-30 Moritz * scdaemon.c (main): Use estream_asprintf instead of asprintf. * command.c (update_reader_status_file): Likewise. (cmd_serialno): Use estream_asprintf instead of asprintf and xfree instead of free to release memory allocated through (estream_)asprintf. (cmd_learn): Likewise. (pin_cb): Likewise. * app-openpgp.c (get_public_key): Likewise. 2008-08-18 Werner Koch * app-openpgp.c (do_setattr): Fix test for v2 cards. 2008-08-11 Werner Koch * apdu.c (reset_pcsc_reader, open_pcsc_reader) (reset_rapdu_reader, open_rapdu_reader): Allow ATRs of up to 33 bytes. Provide maximum size of ATR buffer using DIM. Such long ATR are never seen in reality but the PC/SC library of MAC OS X is just too buggy. Reported by Ludovic Rousseau. Fixes bug #948. 2008-07-30 Werner Koch * app-openpgp.c (verify_a_chv): Use xtrymalloc and make the prompt for CHV2 more user friendly. 2008-07-03 Werner Koch * app-openpgp.c (do_readcert): New. (app_local_s): Add fields IS_V2 and MAX_CERTLEN_3. (app_select_openpgp): Set them and register do_readcert. (do_setattr): Allow storing of the certificate. 2008-06-25 Werner Koch * app-dinsig.c (do_sign): Allow for SHA256. 2008-06-24 Werner Koch * app-common.h (app_ctx_s): Renamed reset_mode parameter of change_pin to mode_Flags and make it an unsigned int. (APP_CHANGE_FLAG_RESET, APP_CHANGE_FLAG_NULLPIN): New. * app-openpgp.c (do_change_pin): Adjust for that. * command.c (cmd_passwd): Add option --nullpin. * app-nks.c (do_check_pin, do_change_pin): New. (app_select_nks): Register new functions. 2008-04-21 Moritz Schulte (wk) * app-openpgp.c (verify_a_chv): Make use of the default CHV flag. 2008-03-26 Werner Koch * app-openpgp.c (verify_chv3): Support the keypad. 2008-02-09 Marcus Brinkmann * scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set in gpgconf-list output. 2007-12-10 Werner Koch * app-openpgp.c (do_decipher): Take care of cryptograms shorter that 128 bytes. Fixes bug#851. 2007-11-14 Werner Koch * scdaemon.c (main): Pass STANDARD_SOCKET flag to create_server_socket. 2007-11-13 Werner Koch * scdaemon.c (start_connection_thread): Do not call assuan_sock_check_nonce if we are running in --server mode. 2007-11-07 Werner Koch * scdaemon.h: Remove errors.h. 2007-10-02 Werner Koch * command.c (cmd_getinfo): Add "pid" subcommand. 2007-10-01 Werner Koch * scdaemon.c (create_server_socket): Use Assuan socket wrappers and remove Windows specific code. (socket_nonce): New. (start_connection_thread): Check nonce. 2007-09-14 Marcus Brinkmann * scdaemon.c (main): New variable STANDARD_SOCKET, which is 1 for W32 targets. Use it for create_socket_name. 2007-08-07 Werner Koch * tlv.c, tlv.h: Move to ../common/. 2007-08-02 Werner Koch * scdaemon.c: Include gc-opt-flags.h and remove their definition here. 2007-08-01 Werner Koch * apdu.c (send_le): Implement exact length hack. Suggested by Sten Lindgren. 2007-07-05 Werner Koch * command.c (has_option_name, skip_options): New. (cmd_genkey): Add option --timestamp. (cmd_writekey): Enter confidential mode while inquiring the key data. * app.c (app_genkey): Add arg CREATETIME. * app-common.h (app_ctx_s): Likewise * app-openpgp.c (do_genkey): Ditto. Use it. 2007-07-04 Werner Koch * command.c (cmd_getinfo): New subcommand "version". * scdaemon.c (TIMERTICK_INTERVAL): New. (handle_connections) [W32]: Enable a dummy sigs event. (handle_connections): Use a proper count for select and not FD_SETSIZE. (fixed_gcry_pth_init, main): Kludge to fix pth initialization. 2007-06-21 Werner Koch * scdaemon.h (ctrl_t): Remove. It is now declared in ../common/util.h. 2007-06-18 Marcus Brinkmann * scdaemon.c (main): Percent escape output of --gpgconf-list. 2007-06-12 Werner Koch * scdaemon.c (main): Replace some calls by init_common_subsystems. 2007-06-11 Werner Koch * Makefile.am (scdaemon_LDADD): Use libcommonpth macro. * command.c (initialize_module_command): New. * scdaemon.c (main) [W32]: Do not use sigpipe code. (main): Call initialize_module_command. 2007-06-06 Werner Koch * app-openpgp.c (do_sign): Fix arithmetic on void*. * app.c (dump_mutex_state) [W32]: Handle the W32Pth case. * apdu.c: Remove dynload.h. * scdaemon.c (i18n_init): Remove. 2007-04-20 Werner Koch * sc-copykeys.c (my_gcry_logger): Removed. (main): Call setup_libgcrypt_logging helper. * scdaemon.c (my_gcry_logger): Removed. (main): Call setup_libgcrypt_logging helper. 2007-04-03 Werner Koch * command.c (cmd_getinfo): New subcommand "reader_list". * ccid-driver.c (scan_or_find_devices): Ignore EBUSY in scan mode for special transports. 2007-03-07 Werner Koch * app-dinsig.c: Include i18n.h. (verify_pin): Support PIN pads. * app-nks.c (verify_pin): Ditto. * ccid-driver.c (bulk_in): Handle time extension before checking the message type. (ccid_transceive_secure): Support the Cherry XX44 keyboard. Kudos to the nice folks at Cherry for helping with that. 2007-02-18 Werner Koch * scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X. 2007-01-25 Werner Koch * Makefile.am (scdaemon_LDADD): Added LIBICONV. Noted by Billy Halsey. 2006-12-21 Werner Koch * app-openpgp.c (verify_chv2): Factored most code out into... (verify_a_chv): ... new. (do_sign): Factored verification code out to new function and take care of a keypad entered PIN. (compare_fingerprint): Print an additional diagnostic. 2006-11-28 Werner Koch * apdu.c (send_le, apdu_send_direct): Increase RESULTLEN to 258 to allow for full 256 byte and the status word. This might break some old PC/SC drivers or cards, but we will see. Suggested by Kenneth Wang. 2006-11-23 Werner Koch * command.c (scd_command_handler): Fixed use of CTRL. 2006-11-21 Werner Koch * Makefile.am (libexec_PROGRAMS): Put pscs-wrapper into libexec. Renamed to gnupg-pcsc-wrapper. * apdu.c (open_pcsc_reader): Use GNUPG_LIBEXECDIR to accces the wrapper. Suggested by Eric Dorland. 2006-11-20 Werner Koch * app-openpgp.c (verify_chv2): Support for keypads (only CHV2). * ccid-driver.c (ccid_transceive_secure): Made it work for Kaan and SCM. 2006-11-17 Werner Koch * ccid-driver.c (scan_or_find_devices): Use DEBUGOUT_2 instead of log_debug. Removed few other log_debug. * iso7816.c (iso7816_check_keypad): Allow for a SW of 0. * command.c (pin_cb): New mode to prompt for a keypad entry. * scdaemon.c (main) : Add disable-keypad. 2006-11-15 Werner Koch * app-p15.c (read_ef_odf): Cast one printf arg. * scdaemon.h (struct server_control_s): Add field THREAD_STARTUP. * command.c (scd_command_handler): Add new arg CTRL. * scdaemon.c (scd_init_default_ctrl): Made static. (scd_deinit_default_ctrl): New. (start_connection_thread): Call init/deinit of ctrl. (handle_connections): Allocate CTRL. * apdu.c (PCSC_ERR_MASK): New. (reset_pcsc_reader, pcsc_get_status, pcsc_send_apdu) (close_pcsc_reader, open_pcsc_reader): Use it after shifting error values. Reported by Henrik Nordstrom. Fixes bug #724. 2006-10-24 Werner Koch * scdaemon.h (GCRY_MD_USER_TLS_MD5SHA1): New. (MAX_DIGEST_LEN): Increased to 36. * app-p15.c (do_sign): Support for TLS_MD5SHA1. (do_auth): Detect TLS_MD5SHA1. (do_sign): Tweaks for that digest. 2006-10-23 Werner Koch * scdaemon.c (main): New command --gpgconf-test. 2006-10-17 Werner Koch * Makefile.am (scdaemon_LDADD): Link against libcommonpth. 2006-10-12 Werner Koch * apdu.c: Include pth.h after unistd.h for the sake of newer Pth versions. 2006-10-11 Werner Koch * app-openpgp.c (do_sign): Redirect to do_auth for OpenPGP.3. 2006-10-06 Werner Koch * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. (scdaemon_LDADD): Ditto. * scdaemon.h (send_status_info): Mark with sentinel attribute. 2006-10-02 Marcus Brinkmann * command.c (update_reader_status_file): Increase buffer of NUMBUF2 (fixing typo). 2006-09-24 Marcus Brinkmann * app-openpgp.c (do_sign): Advance INDATA by the SHA1 resp. RMD160 prefix length. 2006-09-14 Werner Koch Replaced all call gpg_error_from_errno(errno) by gpg_error_from_syserror(). * command.c (scd_command_handler): Replaced init_connected_socket_server by init_socket_server_ext. 2006-09-07 Werner Koch * command.c (update_reader_status_file): Execute an event handler if available. 2006-09-06 Werner Koch * apdu.c (pcsc_end_transaction): * pcsc-wrapper.c (pcsc_end_transaction: Fixed dclaration. Reported by Bob Dunlop. * scdaemon.h (CTRL,APP): Removed and changed everywhere to ctrl_t/app_t. 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. 2006-09-02 Marcus Brinkmann * command.c (get_reader_slot): Return the slot_table index, not the APDU slot number. (update_reader_status_file): Use the slot_table index in the update_card_removed invocation. 2006-09-01 Marcus Brinkmann * command.c (cmd_getinfo): Handle status command. 2006-08-30 Marcus Brinkmann * command.c (do_reset): Delay resetting CTRL->reader_slot until after update_card_removed invocation. 2006-08-28 Marcus Brinkmann * app-openpgp.c (do_decipher, do_sign): Allow "OPENPGP.2" resp. "OPENPGP.1" for KEYIDSTR. 2006-08-21 Werner Koch * pcsc-wrapper.c (handle_open, handle_close): Reset card and protocol on error/close. (handle_status): Don't set the state if the state is unknown. (handle_reset): Ignore an error if already disconnected. May happen due to system wake-up after hibernation. Suggested by Bob Dunlop. 2006-06-28 Werner Koch * app-openpgp.c (do_writekey): Fixed computation of memmove length. This led to garbled keys if E was larger than one byte. Thanks to Achim Pietig for hinting at the garbled E. 2006-06-09 Marcus Brinkmann * Makefile.am (scdaemon_LDADD): Add $(NETLIBS). 2006-04-14 Marcus Brinkmann * app.c (select_application): Cover up a slot mismatch error in case it happens (it shouldn't happen). (release_application): Use APP->slot. Lock the reader. (application_notify_card_removed): Lock the reader. 2006-04-11 Werner Koch * command.c (hex_to_buffer): New. (cmd_apdu): New. 2006-04-03 Werner Koch * scdaemon.c [__GLIBC__]: Default to libpcsclite.so.1. 2006-03-21 Werner Koch * command.c (cmd_pksign): Add --hash option. 2006-03-01 Werner Koch * command.c (status_file_update_lock): New. (scd_update_reader_status_file): Use lock and factor existing code out to .. (update_reader_status_file): .. this. (do_reset): Use the lock and call update_reader_status_file. 2006-02-20 Werner Koch * apdu.c (open_pcsc_reader): Fixed double free. Thanks to Moritz. 2006-02-09 Werner Koch * command.c (get_reader_slot, do_reset) (scd_update_reader_status_file): Rewrote. * app.c (release_application): Factored code out to .. (deallocate_app): new function. (select_application): Introduce new saved application stuff. (application_notify_card_removed): New. * command.c (update_card_removed): Call it here. (do_reset): And here. * app.c (check_application_conflict): New. * command.c (open_card): Use it here. (cmd_restart): New command. * command.c (cmd_lock): Fixed --wait option to actually terminate. 2006-02-08 Werner Koch * ccid-driver.c (ccid_get_atr): Read Parameter and select T=1 using these parameters. (scan_or_find_devices): Check for NULL r_fd. 2006-02-02 Werner Koch * ccid-driver.c (special_transport): New (ccid_open_reader, do_close_reader, ccid_shutdown_reader) (bulk_out, bulk_in): Add support for CardMan 4040 reader. * ccid-driver.c (scan_or_find_devices): Factored most code out to (scan_or_find_usb_device): .. new. (make_reader_id): Fixed vendor mask. 2006-01-01 Werner Koch * app-openpgp.c (do_sign): Give user error if hash algorithm is not supported by the card. 2005-12-06 Werner Koch * apdu.c (open_pcsc_reader): Check that pcsc-wrapper is actually installed. 2005-11-23 Werner Koch * app-nks.c (verify_pin): Give a special error message for a Nullpin. 2005-10-29 Werner Koch * ccid-driver.c (send_escape_cmd): New args RESULT, RESULTLEN and RESULTMAX. Changed all callers. (ccid_transceive_escape): New. 2005-10-27 Werner Koch * apdu.c [__CYGWIN__]: Make cygwin environment similar to _WIN32. Suggested by John P. Clizbe. * scdaemon.c [__CYGWIN__]: Set default PC/SC driver to winscard.dll. 2005-10-19 Werner Koch * ccid-driver.h (CCID_DRIVER_ERR_NO_KEYPAD): New. * apdu.h (SW_HOST_NO_KEYPAD): New. * 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_reset_retry_counter_kp): New. Extended versions of the original functions. * apdu.c (host_sw_string): Support new code. (reader_table_s): New field CHECK_KEYPAD. (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. (apdu_send_le): Factored all code out to ... (send_le): .. new. Takes an additional arg; changed all callers 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) (send_apdu_ccid): New arg PININFO. (send_apdu_ccid): Use the new arg. * scdaemon.c: New option --disable-keypad. 2005-10-08 Marcus Brinkmann * Makefile.am (scdaemon_LDADD): Add ../gl/libgnu.a after ../common/libcommon.a. 2005-09-20 Werner Koch * app-dinsig.c (verify_pin): Try ISO 9564 BCD encoding. * iso7816.c (iso7816_select_application): Add arg FLAGS. Changed all callers to pass 0. * app-openpgp.c (app_select_openpgp): But this one requires a special flag. * app-p15.c (app_select_p15): Don't use select application for the BELPIC. 2005-09-09 Werner Koch * pcsc-wrapper.c (main): Removed bogus free. * app-p15.c (do_auth): New. (do_getattr): New attribs $AUTHKEYID and $DISPSERIALNO. * app-openpgp.c (do_getattr): Ditto. 2005-09-08 Werner Koch * app-openpgp.c (do_getattr): New key $AUTHKEYID. 2005-09-06 Werner Koch * app-p15.c (do_sign): Tweaked for BELPIC cards. (read_home_df): New arg R_BELPIC. (app_select_p15): Set card type for BELPIC. 2005-09-05 Werner Koch * iso7816.c (iso7816_select_path): New. * app-p15.c (select_ef_by_path): Allow for direct path selection. (app_select_p15): Try using the Belgian variant of pkcs#15. (read_home_df): New. (read_ef_odf): Generalized. (read_ef_tokeninfo): New. (read_p15_info): Set serialnumber from TokenInfo. (app_select_p15): Don't munge serialNumber - that must be done only once. * 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) (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. (apdu_send_direct): Initialize RESULTLEN. * pcsc-wrapper.c (handle_status): Return the current protocol as a new third word. 2005-08-05 Werner Koch * apdu.c (open_rapdu_reader): Set the reader number. 2005-07-05 Werner Koch * app-openpgp.c (do_readkey): Return a mallcoed copy of the key as required by the description. Thanks to Moritz for tracking this problem down. 2005-06-21 Werner Koch * scdaemon.c (main): ifdef call to ccid_set_debug_level. * apdu.c (reset_pcsc_reader, open_pcsc_reader): Cast size_t to ulong for printf. 2005-06-06 Werner Koch * scdaemon.c (main): New option --debug-allow-core-dump. 2005-06-03 Werner Koch * scdaemon.c (handle_connections): Make sure that the signals we are handling are not blocked.Block signals while creating new threads. (handle_connections): Include the file descriptor into the name of the thread. 2005-06-02 Werner Koch * app.c (app_dump_state, dump_mutex_state): New. * scdaemon.c (handle_signal): Print it on SIGUSR1. * app-openpgp.c (do_writekey): Typo fix. * command.c (open_card): Check for locked state even if an application context is available. * app-common.h: Add REF_COUNT field. * app.c (release_application, select_application): Implement reference counting to share the context beween connections. * app.c (lock_reader, unlock_reader): Take SLOT instead of APP as argument. Changed all callers. (select_application): Unlock the reader on error. This should fix the hangs I noticed last week. * scdaemon.h: Removed card_ctx_t cruft. 2005-06-01 Werner Koch * scdaemon.c: Include mkdtemp.h. 2005-05-31 Werner Koch * tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of including a gnupg 1.4 header. 2005-05-30 Werner Koch * tlv.c: Add hack to compile without gpg-error.h when used with GnuPG 1.4. 2005-05-23 Werner Koch * Makefile.am: Do not build sc-copykeys anymore. * app-openpgp.c (app_openpgp_storekey, app_openpgp_readkey) (app_openpgp_cardinfo): Removed. * ccid-driver.c (parse_ccid_descriptor): SCR335 FW version 5.14 is good. (do_close_reader): Never do a reset. The caller should instead make sure that the reader has been closed properly. The new retry code in ccid_slot_status will make sure that the readersatrts up fine even if the last process didn't closed the USB connection properly. (ccid_get_atr): For certain readers try switching to ISO mode. Thanks to Ludovic Rousseau for this hint and the magic numbers. (print_command_failed): New. (bulk_in): Use it here. Add new arg NO_DEBUG. (ccid_slot_status): Disabled debugging. 2005-05-21 Werner Koch * scdaemon.c (handle_signal): Print thread info on SIGUSR1. 2005-05-20 Werner Koch * ccid-driver.c: Replaced macro DEBUG_T1 by a new debug level. (parse_ccid_descriptor): Mark SCR335 firmware version 5.18 good. (ccid_transceive): Arghhh. The seqno is another bit in the R-block than in the I block, this was wrong at one place. * scdaemon.c: New options --debug-ccid-driver and --debug-disable-ticker. * app-openpgp.c (do_genkey, do_writekey): Factored code to check for existing key out into .. (does_key_exist): .. New function. 2005-05-19 Werner Koch * tlv.c (parse_sexp): New. * command.c (cmd_writekey): New. * app.c (app_writekey): New. * app-common.c (app_t): Add function ptr WRITEKEY. * app-openpgp.c (do_writekey): New. * app-openpgp.c (do_readkey) [GNUPG_MAJOR_VERSION==1]: Return error. * app-common.h (app_t) [GNUPG_MAJOR_VERSION==1]: Add a field to store the Assuan context. 2005-05-17 Werner Koch * scdaemon.c: Removed non-pth code paths. (create_socket_name, create_server_socket): New. Taken from ../agent/gpg-agent. (cleanup): Changed to adjust for SOCKET_NAME now being malloced. (ticker_thread): Always use pth_event_occurred; it is again defined for all decent PTH versions. (handle_connections): New. Based on the gpg-agent code. (start_connection_thread): Ditto. (ticker_thread): Removed. (cleanup_sh): Removed. (main): Run the handler for the pipe server in a separate thread. This replaces the old ticker thread. (scd_get_socket_name): New. * command.c (cmd_getinfo): New command GETINFO. (scd_command_handler): Renamed argument and changed code to use an already connected FD. 2005-05-15 Werner Koch * app.c, app-common.h, app-nks.c, app-p15.c, app-dinsig.c * app-openpgp.c: Change most function return types from int to gpg_error_t. * command.c (pin_cb): Ditto. * sc-copykeys.c (pincb): Ditto. * app.c (lock_reader, unlock_reader): New. Changed call handler wrappers to make use of these functions. 2005-05-07 Werner Koch * ccid-driver.c (do_close_reader): Don't do a reset before close. Some folks reported that it makes the SCR335 hang less often. Look at the source on how to re-enable it. 2005-04-27 Werner Koch * app-p15.c (micardo_mse): New. (do_sign): Call it. * iso7816.c (iso7816_manage_security_env): Allow passing DATA as NULL to indicate an empty Lc. * tlv.c (find_tlv): Check that a found object fits into the buffer. (find_tlv_unchecked): New as replacement for the old non-checking variant. * app.c (select_application): Keep on using the non-checking 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. * app.c (select_application): Detect pkcs15 applications. * 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) (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. 2005-04-20 Werner Koch * command.c: Use GPG_ERR_LOCKED instead of EBUSY. 2005-04-14 Werner Koch * app-openpgp.c (retrieve_key_material): Rewritten. Return a proper error code. (retrieve_next_token): Removed. (retrieve_fpr_from_card): Rewritten to make use of DO caching and to take the KEYNO as arg. (get_public_key): Renamed variable for clarity. 2005-04-12 Werner Koch 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. (scd_update_reader_status_file): Update accordingly. Send signal 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_genkey, cmd_passwd, cmd_checkpin): Return an error if reader is locked. (do_reset): Handle locking. (open_card): Ditto. Share the reader slot with other sessions. (get_reader_slot): New. (update_card_removed): New. Use it in the TEST_CARD_REMOVAL macro. 2005-04-07 Werner Koch * app-openpgp.c (do_check_pin): Add hack to allow verification of CHV3. (get_public_key): Don't use gcry functions to create S-expressions. (do_deinit, do_readkey, do_genkey, send_keypair_info): Adjust for above change. 2005-03-29 Moritz Schulte * app-openpgp.c (retrieve_fpr_from_card): New function. (retrieve_next_token): New function. (retrieve_key_material): New function. (get_public_key): Implement retrival of key through expernal helper (gpg) in case the openpgp card is not cooperative enough. 2005-03-16 Werner Koch * ccid-driver.c (parse_ccid_descriptor): Make SCM workaround reader type specific. (scan_or_find_devices): Do not check the interface subclass in the SPR532 kludge, as this depends on the firmware version. (ccid_get_atr): Get the Slot status first. This solves the problem with readers hanging on recent Linux 2.6.x. (bulk_in): Add argument TIMEOUT and changed all callers to pass an appropriate one. Change the standard timeout from 10 to 5 seconds. (ccid_slot_status): Add a retry code with an initial short timeout. (do_close_reader): Do an usb_reset before closing the reader. 2005-02-25 Werner Koch * app-openpgp.c (get_public_key): Make sure not to return negative numbers. (do_sign): Allow passing of indata with algorithm prefix. (do_auth): Allow OPENPGP.3 as an alternative ID. * app.c (app_getattr): Return just the S/N but not the timestamp. 2005-02-24 Werner Koch * app.c (app_getattr): Return APPTYPE or SERIALNO type even if the application does dot support the getattr call. * app-openpgp.c (get_one_do): Never try to get a non cacheable object from the cache. (get_one_do): Add new arg to return an error code. Changed all callers. (do_getattr): Let it return a proper error code. * app.c (select_application): Return an error code and the application context in an new arg. * command.c (open_card): Adjusted for that. Don't use the fallback if no card is present. Return an error if the card has been removed without a reset. (do_reset, cmd_serialno): Clear that error flag. (TEST_CARD_REMOVAL): New. Use it with all command handlers. (scd_update_reader_status_file): Set the error flag on all changes. * scdaemon.c (ticker_thread): Termintate if a shutdown is pending. * apdu.c: Added some PCSC error codes. (pcsc_error_to_sw): New. (reset_pcsc_reader, pcsc_get_status, pcsc_send_apdu) (open_pcsc_reader): Do proper error code mapping. 2005-03-16 Werner Koch * ccid-driver.c (parse_ccid_descriptor): Make SCM workaround reader type specific. (scan_or_find_devices): Do not check the interface subclass in the SPR532 kludge, as this depends on the firmware version. (ccid_get_atr): Get the Slot status first. This solves the problem with readers hanging on recent Linux 2.6.x. 2005-02-22 Werner Koch * app-openpgp.c (app_local_s): New field PK. (do_deinit, do_genkey, app_openpgp_storekey): Clear it. (get_public_key, send_keypair_info): New. (do_learn_status): Send KEYPAIR info * app-common.h (app_ctx_t): Add function pointer READKEY. * app.c (app_readkey): New. * command.c (cmd_readkey): Use READKEY function if possible. 2005-01-26 Werner Koch * ccid-driver.c (parse_ccid_descriptor): Need the CSM workaround also for newer firmware versions. Need to get a list of fixed firmware versions and use that. 2005-01-25 Werner Koch * apdu.c (apdu_send_le, apdu_send_direct): Fix some compiler warnings. * app-openpgp.c (get_cached_data): New arg GET_IMMEDIATE to bypass the cache. Changed all callers. (get_one_do): Bypass the cache if the value would have been read directly for v1.1 cards.It makes things a bit slower but obnly for 1.0 cards and there are not that many cards out in the wild. This is required to fix a caching bug when generating new keys; as a side effect of the retrieval of the the C4 DO from the 6E DO the cached fingerprint will get updated to the old value and later when signing the generated key the checking of the fingerprint fails because it won't match the new one. Thanks to Moritz for analyzing this problem. (verify_chv3): Removed the CHV status reread logic because we won't cache the C4 DO anymore. 2004-12-28 Werner Koch * ccid-driver.c (find_endpoint): New. (scan_or_find_devices): Add new args to return endpoint info and interface number. (ccid_open_reader, ccid_shutdown_reader): Take care of these new args. (bulk_in, bulk_out): Use the correct endpoints. (ccid_transceive_apdu_level): New. (ccid_transceive): Divert to above. (parse_ccid_descriptor): Allow APDU level exchange mode. (do_close_reader): Pass the interface number to usb_release_interface. 2004-12-21 Werner Koch * scdaemon.c (main): Use default_homedir(). 2004-12-18 Werner Koch * scdaemon.c (main) [W32]: Remove special Pth initialize.. * scdaemon.h (map_assuan_err): Define in terms of map_assuan_err_with_source. 2004-12-15 Werner Koch * scdaemon.c [W32]: Various hacks to make it run under W32. * command.c (scd_update_reader_status_file) [W32]: Don't use kill. * 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. 2004-12-06 Werner Koch * Makefile.am (pkglib_PROGRAMS): Build only for W32. 2004-10-22 Werner Koch * app-openpgp.c (verify_chv3): The minium length for CHV3 is 8. Changed string to match the other ones. 2004-10-21 Werner Koch * app-openpgp.c (do_sign): Replace asprintf by direct allocation. This avoids problems with missing vasprintf implementations in gnupg 1.4. * app-common.h (app_openpgp_storekey: Add prototype. 2004-10-20 Werner Koch * 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. (open_pcsc_reader): Succeed even with no card inserted. (open_ccid_reader): Set LAST_STATUS. * iso7816.c (iso7816_select_application): Always use 0 for P1. 2004-10-18 Werner Koch * ccid-driver.c (ccid_get_atr): Reset T=1 state info. 2004-10-14 Werner Koch * app-openpgp.c (parse_login_data): New. (app_select_openpgp): Call it. (do_setattr): Reparse it after change. 2004-10-06 Werner Koch * ccid-driver.c (ccid_open_reader): Store the vendor ID. (ccid_transceive_secure): New. (parse_ccid_descriptor): Workaround for an SCM reader problem. 2004-10-04 Werner Koch * ccid-driver.c (send_escape_cmd): New. 2004-09-30 Werner Koch * Makefile.am: Adjusted for gettext 0.14. * app-openpgp.c (do_sign): Add the error string to the verify failed messages. 2004-09-27 Werner Koch From gnupg 1.3 * app-openpgp.c: Made all strings translatable. (verify_chv3) [GNUPG_MAJOR_VERSION]: Make opt.allow_admin 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. (get_one_do): Hack to bypass the cache for cards versions > 1.0. (store_fpr): Store the creation date for card version > 1.0. * app-openpgp.c (app_openpgp_storekey): Call flush_cache. (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 ... (ccid_close_reader): ..here. (ccid_shutdown_reader): New. * apdu.c (apdu_shutdown_reader): New. (shutdown_ccid_reader): New. * apdu.c (open_ccid_reader): New arg PORTSTR. Pass it to ccid_open_reader. (apdu_open_reader): Pass portstr to open_ccid_reader. (apdu_open_reader): No fallback if a full CCID reader id has been given. * ccid-driver.c (ccid_get_reader_list): New. (ccid_open_reader): Changed API to take a string for the reader. Removed al the cruft for the libusb development vesion which seems not to be maintained anymore and there are no packages anyway. The stable library works just fine. (struct ccid_reader_id_s): Deleted and replaced everywhere by a simple string. (usb_get_string_simple): Removed. (bulk_in): Do valgrind hack here and not just everywhere. * ccid-driver.c (read_device_info): Removed. (make_reader_id, scan_or_find_devices): New. (ccid_open_reader): Simplified by make use of the new functions. (ccid_set_debug_level): New. Changed the macros to make use of it. It has turned out that it is often useful to enable debugging at runtime so I added this option. From gnupg 1.3 - David Shaw * app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin PINs can be entered before the card is locked. * app-openpgp.c (get_cached_data): Avoid mallocing zero since it breaks us when using --enable-m-guard. * ccid-driver.c (usb_get_string_simple): Replacement function to work with older libusb. * ccid-driver.c (read_device_info): Fix segfault when usb device is not accessible. (ccid_open_reader): Allow working with an even older version of libusb (usb_busses global instead of usb_get_busses()). 2004-09-11 Werner Koch * app-openpgp.c (app_select_openpgp): Its app_munge_serialno and not app_number_serialno. 2004-08-20 Werner Koch * app.c (select_application): Fixed serial number extraction and added the BMI card workaround. (app_munge_serialno): New. * app-openpgp.c (app_select_openpgp): Try munging serialno. 2004-08-05 Werner Koch * scdaemon.c (main): New option --disable-application. * app.c (is_app_allowed): New. (select_application): Use it to check for disabled applications. * ccid-driver.h (CCID_DRIVER_ERR_ABORTED): New. * ccid-driver.c (ccid_open_reader): Support the stable 0.1 version of libusb. (ccid_get_atr): Handle short messages. * apdu.c (my_rapdu_get_status): Implemented. 2004-07-27 Moritz Schulte * apdu.c: Include . * Makefile.am: Use @DL_LIBS@ instead of -ldl. 2004-07-22 Werner Koch * 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. * scdaemon.c (main): Bumbed thread stack size up to 512k. 2004-07-16 Werner Koch * apdu.c (reader_table_s): Add function pointers for the backends. (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_osc_reader, open_rapdu_reader): Intialize function pointers. (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. (reset_ct_reader): Implemented. (ct_send_apdu): Activate the card if not yet done. (pcsc_send_apdu): Ditto. 2004-07-15 Werner Koch * ccid-driver.h: Add error codes. * ccid-driver.c: Implement more or less proper error codes all over the place. * apdu.c (apdu_send_direct): New. (get_ccid_error_string): Add some error code mappings. (send_apdu): Pass error codes along for drivers already supporting them. (host_sw_string): New. (get_ccid_error_string): Use above. (send_apdu_ccid): Reset the reader if it has not yet been done. (open_ccid_reader): Don't care if the ATR can't be read. (apdu_activate_card): New. (apdu_strerror): New. (dump_reader_status): Only enable it with opt.VERBOSE. * iso7816.c (map_sw): Add mappings for the new error codes. 2004-07-02 Werner Koch * apdu.c (open_ct_reader, open_pcsc_reader, open_ccid_reader) (reset_ccid_reader, open_osc_reader): Call dump_reader_status only in verbose mode. 2004-07-01 Werner Koch * sc-investigate.c: Initialize Pth which is now required. (interactive_shell): New command "readpk". * app-openpgp.c (do_getattr): Fix for sending CA-FPR. 2004-06-30 Werner Koch * app-openpgp.c (app_openpgp_readkey): Fixed check for valid exponent. 2004-06-18 Werner Koch * sc-investigate.c (my_read_line): Renamed from read_line. 2004-06-16 Werner Koch * apdu.c (osc_get_status): Fixed type in function name. Noted by Axel Thimm. Yes, I didn't tested it with OpenSC :-(. 2004-04-28 Werner Koch * app-openpgp.c (do_setattr): Sync FORCE_CHV1. 2004-04-27 Werner Koch * app-common.h: Do not include ksba.h for gnupg 1. 2004-04-26 Werner Koch * app-common.h: New members FNC.DEINIT and APP_LOCAL. * app.c (release_application): Call new deconstructor. * app-openpgp.c (do_deinit): New. (get_cached_data, flush_cache_item, flush_cache_after_error) (flush_cache): New. (get_one_do): Replaced arg SLOT by APP. Make used of cached data. (verify_chv2, verify_chv3): Flush some cache item after error. (do_change_pin): Ditto. (do_sign): Ditto. (do_setattr): Flush cache item. (do_genkey): Flush the entire cache. (compare_fingerprint): Use cached data. * scdaemon.c (main): Do the last change the usual way. This is so that we can easily test for versioned config files above. 2004-04-26 Marcus Brinkmann * scdaemon.c (main): For now, always print default filename for --gpgconf-list, and never /dev/null. 2004-04-21 Werner Koch * command.c (scd_update_reader_status_file): Send a signal back to the client. (option_handler): Parse the new event-signal option. * scdaemon.c (handle_signal): Do not use SIGUSR{1,2} anymore for changing the verbosity. 2004-04-20 Werner Koch * command.c (scd_update_reader_status_file): Write status files. * app-help.c (app_help_read_length_of_cert): Fixed calculation of R_CERTOFF. * pcsc-wrapper.c: New. * Makefile.am (pkglib_PROGRAMS): Install it here. * apdu.c (writen, readn): New. (open_pcsc_reader, pcsc_send_apdu, close_pcsc_reader): Use the pcsc-wrapper if we are using Pth. (apdu_send_le): Reinitialize RESULTLEN. Handle SW_EOF_REACHED like SW_SUCCESS. 2004-04-19 Werner Koch * ccid-driver.c (parse_ccid_descriptor): Store some of the reader features away. New arg HANDLE (read_device_info): New arg HANDLE. Changed caller. (bulk_in): Handle time extension requests. (ccid_get_atr): Setup parameters and the IFSD. (compute_edc): New. Factored out code. (ccid_transceive): Use default NADs when required. 2004-04-14 Werner Koch * scdaemon.h (server_control_s): Add member READER_SLOT. * scdaemon.c (scd_init_default_ctrl): Initialize READER_SLOT to -1. * command.c (open_card): Reuse an open slot. (reset_notify): Just reset the slot if supported by the reader. (do_reset): Factored code from above out. (scd_command_handler): Use it for cleanup. * 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. (get_status_ccid): New. (apdu_reset): New. (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 in locked mode. * command.c (scd_update_reader_status_file): New. * scdaemon.c (handle_tick): Call it. 2004-04-13 Werner Koch * scdaemon.c: Convert to a Pth application. (handle_signal, ticker_thread, handle_tick): New. (main): Fire up the ticker thread in server mode. 2004-03-23 Werner Koch * scdaemon.c (main) : Fixed output for pcsc_driver. 2004-03-17 Werner Koch * tlv.c (parse_ber_header): Do not check for tag overflow - it does not make sense. Simplified the check for length overflow. * scdaemon.c (main) : Fixed default value quoting. 2004-03-16 Werner Koch * app-dinsig.c: Implemented. Based on app-nks.c and card-dinsig.c * app-nks.c (get_length_of_cert): Removed. * app-help.c: New. (app_help_read_length_of_cert): New. Code taken from above. New optional arg R_CERTOFF. * card-dinsig.c: Removed. * card.c (card_get_serial_and_stamp): Do not bind to the old and never finsiged card-dinsig.c. * iso7816.c (iso7816_read_binary): Allow for an NMAX > 254. 2004-03-11 Werner Koch * scdaemon.h (out_of_core): Removed. Replaced callers by standard gpg_error function. * apdu.c, iso7816.c, ccid-driver.c [GNUPG_SCD_MAIN_HEADER]: Allow to include a header defined by the compiler. This helps us to reuse the source in other software. 2004-03-10 Werner Koch * iso7816.c (iso7816_read_record): New arg SHORT_EF. Changed all callers. 2004-02-18 Werner Koch * sc-investigate.c (main): Setup the used character set. * scdaemon.c (main): Ditto. * scdaemon.c (set_debug): New. Add option --debug-level. (main): Add option --gpgconf-list. 2004-02-12 Werner Koch * Makefile.am: Include cmacros.am for common flags. 2004-01-29 Werner Koch * command.c (reset_notify): Release the application context and close the reader. 2004-01-28 Werner Koch * iso7816.c (iso7816_manage_security_env): New. (iso7816_decipher): Add PADIND argument. 2004-01-27 Werner Koch * command.c (cmd_readcert, cmd_readkey): Work on a copy of LINE. * app-common.h (app_ctx_s): Added readcert field. * app.c (app_readcert): New. * tlv.c (parse_ber_header): Added; taken from libksba. 2004-01-26 Werner Koch * card.c (map_sc_err): Use SCD as the error source. * command.c (open_card): ADD arg NAME to allow requesting a specific application. Changed all callers. (cmd_serialno): Allow optional argument to select the desired application. * app-nks.c: New. * scdaemon.h (opt): Add READER_PORT. * scdaemon.c (main): Set it here. * app.c (app_set_default_reader_port): Removed. (select_application): Add NAME arg and figure out a default serial number from the GDO. Add SLOT arg and remove all reader management. (release_application): New. (app_write_learn_status): Output an APPTYPE status line. * command.c (open_card): Adapt for select_application change. * app-openpgp.c (app_select_openpgp): Removed SN and SNLEN args and set it directly. Changed all callers. 2004-01-25 Werner Koch * iso7816.c (iso7816_select_application): P1 kludge for OpenPGP card. * app-openpgp.c (find_tlv): Factor out this function to .. * tlv.c, tlv.h: .. new. * scdaemon.h: Introduced app_t and ctrl_t as the new types for APP and CTRL. 2004-01-21 Werner Koch * apdu.c (apdu_send_le): Treat SW_EOF_REACHED as a warning. 2004-01-20 Werner Koch * iso7816.c (iso7816_read_binary): New. (iso7816_select_file): New. (iso7816_list_directory): New. * sc-investigate.c: Add option -i. (select_app, read_line, interactive_shell): New. 2004-01-16 Werner Koch * apdu.h: Add SW_FILE_NOT_FOUND. * iso7816.c (map_sw): Map it to GPG_ERR_ENOENT. * iso7816.c (iso7816_select_file): New. * app-dinsig.c: New file w/o any real code yet. * Makefile.am (scdaemon_SOURCES,sc_investigate_SOURCES): Add file. * sc-investigate.c: Add option --disable-ccid. 2003-12-19 Werner Koch * apdu.c (apdu_send_le): Send a get_response with the indicated length and not the 64 bytes we used for testing. * app-openpgp.c (verify_chv2, verify_chv3, do_sign): Check the minimum length of the passphrase, so that we don't need to decrement the retry counter. 2003-12-17 Werner Koch * card-p15.c (p15_enum_keypairs): Replaced KRC by RC. * card-dinsig.c (dinsig_enum_keypairs): Ditto. 2003-12-16 Werner Koch * scdaemon.c (main): Set the prefixes for assuan logging. 2003-11-17 Werner Koch * scdaemon.c, scdaemon.h: New options --allow-admin and --deny-admin. * app-openpgp.c (verify_chv3): Check it here. 2003-11-12 Werner Koch Adjusted for API changes in Libksba. 2003-10-30 Werner Koch * apdu.c (close_ct_reader, close_pcsc_reader): Implemented. (get_ccid_error_string): New. Not very useful messages, though. 2003-10-25 Werner Koch * ccid-driver.c (ccid_open_reader): Return an error if no USB devices are found. * command.c (cmd_genkey, cmd_passwd): Fixed faulty use of !spacep(). * apdu.c (apdu_open_reader): Hacks for PC/SC under Windows. 2003-10-20 Werner Koch * command.c (cmd_checkpin): New. (register_commands): Add command CHECKPIN. * app.c (app_check_pin): New. * app-openpgp.c (check_against_given_fingerprint): New. Factored out that code elsewhere. (do_check_pin): New. 2003-10-10 Werner Koch * ccid-driver.c (ccid_close_reader): New. * apdu.c (close_ccid_reader, close_ct_reader, close_csc_reader) (close_osc_reader, apdu_close_reader): New. Not all are properly implemented yet. 2003-10-09 Werner Koch * ccid-driver.c (ccid_transceive): Add T=1 chaining for sending. 2003-10-08 Werner Koch * app-openpgp.c (do_getattr): Support SERIALNO and AID. 2003-10-01 Werner Koch * ccid-driver.c: Detect GnuPG 1.3 and include appropriate files. * apdu.c: Ditto. * app-openpgp.c: Ditto. * iso7816.c: Ditto. (generate_keypair): Renamed to .. (do_generate_keypair): .. this. * app-common.h [GNUPG_MAJOR_VERSION]: New. * iso7816.h [GNUPG_MAJOR_VERSION]: Include cardglue.h 2003-09-30 Werner Koch * command.c (cmd_getattr): New command GETATTR. * app.c (app_setattr): New. (do_getattr): New. (do_learn_status): Reimplemented in terms of do_getattr. * app-openpgp.c (do_change_pin): Make sure CVH1 and CHV2 are always synced. (verify_chv2, verify_chv3): New. Factored out common code. (do_setattr, do_sign, do_auth, do_decipher): Change the names of the prompts to match that we have only 2 different PINs. (app_select_openpgp): Check whether the card enforced CHV1. (convert_sig_counter_value): New. Factor out code from get_sig_counter. 2003-09-28 Werner Koch * app-openpgp.c (dump_all_do): Use gpg_err_code and not gpg_error. 2003-09-19 Werner Koch * ccid-driver.c (parse_ccid_descriptor): New. (read_device_info): New. (ccid_open_reader): Check that the device has all required features. 2003-09-06 Werner Koch * scdaemon.c (main): --pcsc-driver again defaults to pcsclite. David Corcoran was so kind to remove the GPL incompatible advertisng clause from pcsclite. * apdu.c (apdu_open_reader): Actually make pcsc-driver option work. 2003-09-05 Werner Koch * ccid-driver.c: More work, data can now actually be retrieved. * ccid-driver.c, ccid-driver.h: Alternativley allow use under BSD conditions. 2003-09-02 Werner Koch * scdaemon.c, scdaemon.h: New option --pcsc-ccid. * 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 * apdu.c (new_reader_slot): Only set 'is_osc' when OpenSC is used. 2003-08-25 Werner Koch * command.c (cmd_setattr): Use a copy of LINE. (cmd_genkey): Use a copy of KEYNO. (cmd_passwd): Use a copy of CHVNOSTR. (cmd_pksign, cmd_pkauth, cmd_pkdecrypt): s/strdup/xtrystrdup/. 2003-08-19 Werner Koch * scdaemon.c, scdaemon.h: New option --pcsc-driver. * apdu.c (apdu_open_reader): Use that option here instead of a hardcoded one. 2003-08-18 Werner Koch * Makefile.am: Add OPENSC_LIBS to all programs. * scdaemon.c, scdaemon.h: New option --disable-opensc. * card.c (card_open): Implement it. * apdu.c (open_osc_reader, osc_send_apdu): New. (apdu_open_reader) [HAVE_OPENSC]: Use the opensc driver if not disabled. (error_string) [HAVE_OPENSC]: Use sc_strerror. (send_apdu) [HAVE_OPENSC]: Call osc_apdu_send. * card-p15.c (p15_enum_keypairs, p15_prepare_key): Adjusted for libgpg-error. 2003-08-14 Timo Schulz * apdu.c (ct_activate_card): Change the code a little to avoid problems with other readers. * Always use 'dynload.h' instead of 'dlfcn.h'. 2003-08-05 Werner Koch * app-openpgp.c (dump_all_do): Don't analyze constructed DOs after an error. 2003-08-04 Werner Koch * app.c (app_set_default_reader_port): New. (select_application): Use it here. * scdaemon.c (main): and here. * sc-copykeys.c: --reader-port does now take a string. * sc-investigate.c, scdaemon.c: Ditto. * apdu.c (apdu_open_reader): Ditto. Load pcsclite if no ctapi driver is configured. Always include code for ctapi. (new_reader_slot): Don't test for already used ports and remove port arg. (open_pcsc_reader, pcsc_send_apdu, pcsc_error_string): New. (apdu_send_le): Changed RC to long to cope with PC/SC. * scdaemon.c, scdaemon.h: New option --ctapi-driver. * sc-investigate.c, sc-copykeys.c: Ditto. 2003-07-31 Werner Koch * Makefile.am (scdaemon_LDADD): Added INTLLIBS. 2003-07-28 Werner Koch * app-openpgp.c (do_setattr): Change implementation. Allow all useful DOs. 2003-07-27 Werner Koch Adjusted for gcry_mpi_print and gcry_mpi_scan API change. 2003-07-24 Werner Koch * app-openpgp.c (do_learn_status): Print more status information. (app_select_openpgp): Store the card version. (store_fpr): Add argument card_version and fix DOs for old cards. (app_openpgp_storekey): Likewise. 2003-07-23 Werner Koch * command.c (cmd_pkauth): New. (cmd_setdata): Check whether data was given at all to avoid passing 0 to malloc. * app.c (app_auth): New. * app-openpgp.c (do_auth): New. 2003-07-22 Werner Koch * command.c (cmd_passwd): New. * app.c (app_change_pin): New. * app-openpgp.c (do_change_pin): New. * iso7816.c (iso7816_reset_retry_counter): Implemented. * sc-investigate.c (main): New option --gen-random. * iso7816.c (iso7816_get_challenge): Don't create APDUs with a length larger than 255. 2003-07-17 Werner Koch * command.c (cmd_random): New command RANDOM. * iso7816.c (map_sw): New. Use it in this file to return meaningful error messages. Changed all public fucntions to return a gpg_error_t. (iso7816_change_reference_data): New. * apdu.c (apdu_open_reader): Use faked status words for soem system errors. 2003-07-16 Werner Koch * apdu.c (apdu_send_simple): Use apdu_send_le so that we can specify not to send Le as it should be. 2003-07-15 Werner Koch * Makefile.am: Add sc-copykeys program. * sc-copykeys.c: New. * app-openpgp.c (app_openpgp_storekey): New. (app_openpgp_cardinfo): New. (count_bits): New. (store_fpr): And use it here to get the actual length in bit. 2003-07-03 Werner Koch * app-openpgp.c (do_setattr): Add setting of the URL. (app_select_openpgp): Dump card data only in very verbose mode. (do_decipher): New. 2003-07-02 Werner Koch * app-openpgp.c (get_sig_counter): New. (do_sign): Print the signature counter and enable the PIN callback. (do_genkey): Implement the PIN callback. 2003-07-01 Werner Koch * app-openpgp.c (store_fpr): Fixed fingerprint calculation. 2003-06-26 Werner Koch * app-openpgp.c (find_tlv): Fixed length header parsing. * app.c (app_genkey): New. * command.c (cmd_genkey): New. 2003-06-25 Werner Koch * command.c (percent_plus_unescape): New. (cmd_setattr): New. 2003-06-24 Werner Koch * command.c (send_status_info): New. * app-openpgp.c (app_select_openpgp): Replace SLOT arg by APP arg and setup the function pointers in APP on success. Changed callers. * app.c: New. * app-common.h: New. * scdaemon.h (APP): New type to handle applications. (server_control_s): Add an APP context field. * command.c (cmd_serialno): Handle applications. (cmd_pksign): Ditto. (cmd_pkdecrypt): Ditto. (reset_notify): Ditto. (cmd_learn): For now return error for application contexts. (cmd_readcert): Ditto. (cmd_readkey): Ditto. 2003-06-04 Werner Koch * card.c (map_sc_err): Renamed gpg_make_err to gpg_err_make. Renamed error codes from INVALID to INV and removed _ERROR suffixes. 2003-06-03 Werner Koch Changed all error codes in all files to the new libgpg-error scheme. * scdaemon.h: Include gpg-error.h and errno.h * card.c (map_sc_err): Use unknown for the error source. * Makefile.am: Link with libgpg-error 2003-05-14 Werner Koch * atr.c, atr.h: New. * sc-investigate.c: Dump the ATR in a human readable format. 2003-05-08 Werner Koch * scdaemon.h (DBG_CARD_IO_VALUE): New. * sc-investigate.c: New. * scdaemon.c (main): Removed --print-atr option. * iso7816.c, iso7816.h, app-openpgp.c: New. 2003-04-29 Werner Koch * scdaemon.c: New options --print-atr and --reader-port * 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. 2002-08-21 Werner Koch * scdaemon.c (main): New option --daemon so that the program is not accidently started in the background. 2002-08-16 Werner Koch * scdaemon.c: Include i18n.h. * card-common.h (struct p15_private_s): Forward declaration. Add it to card_ctx_s. * card.c (card_close): Make sure private data is released. (card_enum_certs): New. * card-p15.c (p15_release_private_data): New. (init_private_data): New to work around an OpenSC weirdness. (p15_enum_keypairs): Do an OpenSC get_objects only once. (p15_enum_certs): New. (card_p15_bind): Bind new function. * command.c (cmd_learn): Return information about the certificates. 2002-08-09 Werner Koch * card.c (card_get_serial_and_stamp): Use the tokeinfo serial number as a fallback. Add a special prefix for serial numbers. 2002-07-30 Werner Koch 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. * card-p15.c: Changed include filename of opensc. * card-dinsig.c: Ditto. * card-p15.c (p15_decipher): Add flags argument to OpenSC call. 2002-07-24 Werner Koch * card.c (find_simple_tlv, find_iccsn): New. (card_get_serial_and_stamp): Improved serial number parser. 2002-06-27 Werner Koch * scdaemon.c (main): Use GNUPG_DEFAULT_HOMEDIR constant. 2002-06-15 Werner Koch * card-dinsig.c: Documented some stuff from the DIN norm. 2002-04-15 Werner Koch * command.c (cmd_pksign, cmd_pkdecrypt): Use a copy of the key ID. 2002-04-12 Werner Koch * scdaemon.c: New option --debug-sc N. * card.c (card_open): set it here. * card-p15.c (p15_prepare_key): Factored out common code from ... (p15_sign, p15_decipher): here and made the decryption work the regular way. 2002-04-10 Werner Koch * card.c (card_open): Return immediately when no reader is available. 2002-03-27 Werner Koch * card.c (card_open, card_close): Adjusted for changes in OpenSC. 2002-03-10 Werner Koch * card-p15.c, card-dinsig.c, card-common.h: New. * card.c: Factored most code out to the new modules, so that we can better support different types of card applications. 2002-01-26 Werner Koch * 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 unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index b71ff6aef..98268c00c 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -1,3491 +1,3493 @@ /* ccid-driver.c - USB ChipCardInterfaceDevices driver * Copyright (C) 2003, 2004, 2005, 2006, 2007 * 2008, 2009 Free Software Foundation, Inc. * Written by Werner Koch. * * This file is part of GnuPG. * * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . * * ALTERNATIVELY, this file may be distributed under the terms of the * following license, in which case the provisions of this license are * required INSTEAD OF the GNU General Public License. If you wish to * allow use of your version of this file only under the terms of the * GNU General Public License, and not to allow others to use your * version of this file under the terms of the following license, * indicate your decision by deleting this paragraph and the license * below. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, and the entire permission notice in its entirety, * including the disclaimer of warranties. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior * written permission. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * * $Date$ */ /* CCID (ChipCardInterfaceDevices) is a specification for accessing smartcard via a reader connected to the USB. This is a limited driver allowing to use some CCID drivers directly without any other specila drivers. This is a fallback driver to be used when nothing else works or the system should be kept minimal for security reasons. It makes use of the libusb library to gain portable access to USB. This driver has been tested with the SCM SCR335 and SPR532 smartcard readers and requires that a reader implements APDU or TPDU level exchange and does fully automatic initialization. */ #ifdef HAVE_CONFIG_H # include #endif #if defined(HAVE_LIBUSB) || defined(TEST) #include #include #include #include #include #include #include #include #include #ifdef HAVE_PTH # include #endif /*HAVE_PTH*/ #include #include "ccid-driver.h" #define DRVNAME "ccid-driver: " /* Depending on how this source is used we either define our error output to go to stderr or to the jnlib based logging functions. We use the latter when GNUPG_MAJOR_VERSION is defines or when both, GNUPG_SCD_MAIN_HEADER and HAVE_JNLIB_LOGGING are defined. */ #if defined(GNUPG_MAJOR_VERSION) \ || (defined(GNUPG_SCD_MAIN_HEADER) && defined(HAVE_JNLIB_LOGGING)) #if defined(GNUPG_SCD_MAIN_HEADER) # include GNUPG_SCD_MAIN_HEADER #elif 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 (debug_level) \ log_debug (DRVNAME t); } while (0) # define DEBUGOUT_1(t,a) do { if (debug_level) \ log_debug (DRVNAME t,(a)); } while (0) # define DEBUGOUT_2(t,a,b) do { if (debug_level) \ log_debug (DRVNAME t,(a),(b)); } while (0) # define DEBUGOUT_3(t,a,b,c) do { if (debug_level) \ log_debug (DRVNAME t,(a),(b),(c));} while (0) # define DEBUGOUT_4(t,a,b,c,d) do { if (debug_level) \ log_debug (DRVNAME t,(a),(b),(c),(d));} while (0) # define DEBUGOUT_CONT(t) do { if (debug_level) \ log_printf (t); } while (0) # define DEBUGOUT_CONT_1(t,a) do { if (debug_level) \ log_printf (t,(a)); } while (0) # define DEBUGOUT_CONT_2(t,a,b) do { if (debug_level) \ log_printf (t,(a),(b)); } while (0) # define DEBUGOUT_CONT_3(t,a,b,c) do { if (debug_level) \ log_printf (t,(a),(b),(c)); } while (0) # define DEBUGOUT_LF() do { if (debug_level) \ log_printf ("\n"); } while (0) #else /* Other usage of this source - don't use gnupg specifics. */ # define DEBUGOUT(t) do { if (debug_level) \ fprintf (stderr, DRVNAME t); } while (0) # define DEBUGOUT_1(t,a) do { if (debug_level) \ fprintf (stderr, DRVNAME t, (a)); } while (0) # define DEBUGOUT_2(t,a,b) do { if (debug_level) \ fprintf (stderr, DRVNAME t, (a), (b)); } while (0) # define DEBUGOUT_3(t,a,b,c) do { if (debug_level) \ fprintf (stderr, DRVNAME t, (a), (b), (c)); } while (0) # define DEBUGOUT_4(t,a,b,c,d) do { if (debug_level) \ fprintf (stderr, DRVNAME t, (a), (b), (c), (d));} while(0) # define DEBUGOUT_CONT(t) do { if (debug_level) \ fprintf (stderr, t); } while (0) # define DEBUGOUT_CONT_1(t,a) do { if (debug_level) \ fprintf (stderr, t, (a)); } while (0) # define DEBUGOUT_CONT_2(t,a,b) do { if (debug_level) \ fprintf (stderr, t, (a), (b)); } while (0) # define DEBUGOUT_CONT_3(t,a,b,c) do { if (debug_level) \ fprintf (stderr, t, (a), (b), (c)); } while (0) # define DEBUGOUT_LF() do { if (debug_level) \ putc ('\n', stderr); } while (0) #endif /* This source not used by scdaemon. */ #ifndef EAGAIN #define EAGAIN EWOULDBLOCK #endif enum { RDR_to_PC_NotifySlotChange= 0x50, RDR_to_PC_HardwareError = 0x51, PC_to_RDR_SetParameters = 0x61, PC_to_RDR_IccPowerOn = 0x62, PC_to_RDR_IccPowerOff = 0x63, PC_to_RDR_GetSlotStatus = 0x65, PC_to_RDR_Secure = 0x69, PC_to_RDR_T0APDU = 0x6a, PC_to_RDR_Escape = 0x6b, PC_to_RDR_GetParameters = 0x6c, PC_to_RDR_ResetParameters = 0x6d, PC_to_RDR_IccClock = 0x6e, PC_to_RDR_XfrBlock = 0x6f, PC_to_RDR_Mechanical = 0x71, PC_to_RDR_Abort = 0x72, PC_to_RDR_SetDataRate = 0x73, RDR_to_PC_DataBlock = 0x80, RDR_to_PC_SlotStatus = 0x81, RDR_to_PC_Parameters = 0x82, RDR_to_PC_Escape = 0x83, RDR_to_PC_DataRate = 0x84 }; /* Two macro to detect whether a CCID command has failed and to get the error code. These macros assume that we can access the mandatory first 10 bytes of a CCID message in BUF. */ #define CCID_COMMAND_FAILED(buf) ((buf)[7] & 0x40) #define CCID_ERROR_CODE(buf) (((unsigned char *)(buf))[8]) /* We need to know the vendor to do some hacks. */ enum { VENDOR_CHERRY = 0x046a, VENDOR_SCM = 0x04e6, VENDOR_OMNIKEY= 0x076b, VENDOR_GEMPC = 0x08e6, - VENDOR_KAAN = 0x0d46 + VENDOR_KAAN = 0x0d46, + VENDOR_FSIJ = 0x234B }; /* A list and a table with special transport descriptions. */ enum { TRANSPORT_USB = 0, /* Standard USB transport. */ TRANSPORT_CM4040 = 1 /* As used by the Cardman 4040. */ }; static struct { char *name; /* Device name. */ int type; } transports[] = { { "/dev/cmx0", TRANSPORT_CM4040 }, { "/dev/cmx1", TRANSPORT_CM4040 }, { NULL }, }; /* Store information on the driver's state. A pointer to such a structure is used as handle for most functions. */ struct ccid_driver_s { usb_dev_handle *idev; char *rid; int dev_fd; /* -1 for USB transport or file descriptor of the transport device. */ unsigned short id_vendor; unsigned short id_product; unsigned short bcd_device; int ifc_no; int ep_bulk_out; int ep_bulk_in; int ep_intr; int seqno; unsigned char t1_ns; unsigned char t1_nr; unsigned char nonnull_nad; int max_ifsd; int ifsd; int ifsc; unsigned char apdu_level:2; /* Reader supports short APDU level exchange. With a value of 2 short and extended level is supported.*/ unsigned int auto_ifsd:1; unsigned int powered_off:1; unsigned int has_pinpad:2; unsigned int enodev_seen:1; time_t last_progress; /* Last time we sent progress line. */ /* The progress callback and its first arg as supplied to ccid_set_progress_cb. */ void (*progress_cb)(void *, const char *, int, int, int); void *progress_cb_arg; }; static int initialized_usb; /* Tracks whether USB has been initialized. */ static int debug_level; /* Flag to control the debug output. 0 = No debugging 1 = USB I/O info 2 = Level 1 + T=1 protocol tracing 3 = Level 2 + USB/I/O tracing of SlotStatus. */ static unsigned int compute_edc (const unsigned char *data, size_t datalen, int use_crc); static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen, int no_debug); static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length, size_t *nread, int expected_type, int seqno, int timeout, int no_debug); static int abort_cmd (ccid_driver_t handle, int seqno); /* Convert a little endian stored 4 byte value into an unsigned integer. */ static unsigned int convert_le_u32 (const unsigned char *buf) { return buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); } /* Convert a little endian stored 2 byte value into an unsigned integer. */ static unsigned int convert_le_u16 (const unsigned char *buf) { return buf[0] | (buf[1] << 8); } static void set_msg_len (unsigned char *msg, unsigned int length) { msg[1] = length; msg[2] = length >> 8; msg[3] = length >> 16; msg[4] = length >> 24; } static void my_sleep (int seconds) { #ifdef HAVE_PTH /* With Pth we also call the standard sleep(0) so that the process may give up its timeslot. */ if (!seconds) { # ifdef HAVE_W32_SYSTEM Sleep (0); # else sleep (0); # endif } pth_sleep (seconds); #else # ifdef HAVE_W32_SYSTEM Sleep (seconds*1000); # else sleep (seconds); # endif #endif } static void print_progress (ccid_driver_t handle) { time_t ct = time (NULL); /* We don't want to print progress lines too often. */ if (ct == handle->last_progress) return; if (handle->progress_cb) handle->progress_cb (handle->progress_cb_arg, "card_busy", 'w', 0, 0); handle->last_progress = ct; } /* Pint an error message for a failed CCID command including a textual error code. MSG shall be the CCID message at a minimum of 10 bytes. */ static void print_command_failed (const unsigned char *msg) { const char *t; char buffer[100]; int ec; if (!debug_level) return; ec = CCID_ERROR_CODE (msg); switch (ec) { case 0x00: t = "Command not supported"; break; case 0xE0: t = "Slot busy"; break; case 0xEF: t = "PIN cancelled"; break; case 0xF0: t = "PIN timeout"; break; case 0xF2: t = "Automatic sequence ongoing"; break; case 0xF3: t = "Deactivated Protocol"; break; case 0xF4: t = "Procedure byte conflict"; break; case 0xF5: t = "ICC class not supported"; break; case 0xF6: t = "ICC protocol not supported"; break; case 0xF7: t = "Bad checksum in ATR"; break; case 0xF8: t = "Bad TS in ATR"; break; case 0xFB: t = "An all inclusive hardware error occurred"; break; case 0xFC: t = "Overrun error while talking to the ICC"; break; case 0xFD: t = "Parity error while talking to the ICC"; break; case 0xFE: t = "CCID timed out while talking to the ICC"; break; case 0xFF: t = "Host aborted the current activity"; break; default: if (ec > 0 && ec < 128) sprintf (buffer, "Parameter error at offset %d", ec); else sprintf (buffer, "Error code %02X", ec); t = buffer; break; } DEBUGOUT_1 ("CCID command failed: %s\n", t); } static void print_pr_data (const unsigned char *data, size_t datalen, size_t off) { int any = 0; for (; off < datalen; off++) { if (!any || !(off % 16)) { if (any) DEBUGOUT_LF (); DEBUGOUT_1 (" [%04lu] ", (unsigned long) off); } DEBUGOUT_CONT_1 (" %02X", data[off]); any = 1; } if (any && (off % 16)) DEBUGOUT_LF (); } static void print_p2r_header (const char *name, const unsigned char *msg, size_t msglen) { DEBUGOUT_1 ("%s:\n", name); if (msglen < 7) return; DEBUGOUT_1 (" dwLength ..........: %u\n", convert_le_u32 (msg+1)); DEBUGOUT_1 (" bSlot .............: %u\n", msg[5]); DEBUGOUT_1 (" bSeq ..............: %u\n", msg[6]); } static void print_p2r_iccpoweron (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_IccPowerOn", msg, msglen); if (msglen < 10) return; DEBUGOUT_2 (" bPowerSelect ......: 0x%02x (%s)\n", msg[7], msg[7] == 0? "auto": msg[7] == 1? "5.0 V": msg[7] == 2? "3.0 V": msg[7] == 3? "1.8 V":""); print_pr_data (msg, msglen, 8); } static void print_p2r_iccpoweroff (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_IccPowerOff", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_getslotstatus (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_GetSlotStatus", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_xfrblock (const unsigned char *msg, size_t msglen) { unsigned int val; print_p2r_header ("PC_to_RDR_XfrBlock", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bBWI ..............: 0x%02x\n", msg[7]); val = convert_le_u16 (msg+8); DEBUGOUT_2 (" wLevelParameter ...: 0x%04x%s\n", val, val == 1? " (continued)": val == 2? " (continues+ends)": val == 3? " (continues+continued)": val == 16? " (DataBlock-expected)":""); print_pr_data (msg, msglen, 10); } static void print_p2r_getparameters (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_GetParameters", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_resetparameters (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_ResetParameters", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_setparameters (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_SetParameters", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bProtocolNum ......: 0x%02x\n", msg[7]); print_pr_data (msg, msglen, 8); } static void print_p2r_escape (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_Escape", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_iccclock (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_IccClock", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bClockCommand .....: 0x%02x\n", msg[7]); print_pr_data (msg, msglen, 8); } static void print_p2r_to0apdu (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_T0APDU", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bmChanges .........: 0x%02x\n", msg[7]); DEBUGOUT_1 (" bClassGetResponse .: 0x%02x\n", msg[8]); DEBUGOUT_1 (" bClassEnvelope ....: 0x%02x\n", msg[9]); print_pr_data (msg, msglen, 10); } static void print_p2r_secure (const unsigned char *msg, size_t msglen) { unsigned int val; print_p2r_header ("PC_to_RDR_Secure", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bBMI ..............: 0x%02x\n", msg[7]); val = convert_le_u16 (msg+8); DEBUGOUT_2 (" wLevelParameter ...: 0x%04x%s\n", val, val == 1? " (continued)": val == 2? " (continues+ends)": val == 3? " (continues+continued)": val == 16? " (DataBlock-expected)":""); print_pr_data (msg, msglen, 10); } static void print_p2r_mechanical (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_Mechanical", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bFunction .........: 0x%02x\n", msg[7]); print_pr_data (msg, msglen, 8); } static void print_p2r_abort (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_Abort", msg, msglen); print_pr_data (msg, msglen, 7); } static void print_p2r_setdatarate (const unsigned char *msg, size_t msglen) { print_p2r_header ("PC_to_RDR_SetDataRate", msg, msglen); if (msglen < 10) return; print_pr_data (msg, msglen, 7); } static void print_p2r_unknown (const unsigned char *msg, size_t msglen) { print_p2r_header ("Unknown PC_to_RDR command", msg, msglen); if (msglen < 10) return; print_pr_data (msg, msglen, 0); } static void print_r2p_header (const char *name, const unsigned char *msg, size_t msglen) { DEBUGOUT_1 ("%s:\n", name); if (msglen < 9) return; DEBUGOUT_1 (" dwLength ..........: %u\n", convert_le_u32 (msg+1)); DEBUGOUT_1 (" bSlot .............: %u\n", msg[5]); DEBUGOUT_1 (" bSeq ..............: %u\n", msg[6]); DEBUGOUT_1 (" bStatus ...........: %u\n", msg[7]); if (msg[8]) DEBUGOUT_1 (" bError ............: %u\n", msg[8]); } static void print_r2p_datablock (const unsigned char *msg, size_t msglen) { print_r2p_header ("RDR_to_PC_DataBlock", msg, msglen); if (msglen < 10) return; if (msg[9]) DEBUGOUT_2 (" bChainParameter ...: 0x%02x%s\n", msg[9], msg[9] == 1? " (continued)": msg[9] == 2? " (continues+ends)": msg[9] == 3? " (continues+continued)": msg[9] == 16? " (XferBlock-expected)":""); print_pr_data (msg, msglen, 10); } static void print_r2p_slotstatus (const unsigned char *msg, size_t msglen) { print_r2p_header ("RDR_to_PC_SlotStatus", msg, msglen); if (msglen < 10) return; DEBUGOUT_2 (" bClockStatus ......: 0x%02x%s\n", msg[9], msg[9] == 0? " (running)": msg[9] == 1? " (stopped-L)": msg[9] == 2? " (stopped-H)": msg[9] == 3? " (stopped)":""); print_pr_data (msg, msglen, 10); } static void print_r2p_parameters (const unsigned char *msg, size_t msglen) { print_r2p_header ("RDR_to_PC_Parameters", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" protocol ..........: T=%d\n", msg[9]); if (msglen == 17 && msg[9] == 1) { /* Protocol T=1. */ DEBUGOUT_1 (" bmFindexDindex ....: %02X\n", msg[10]); DEBUGOUT_1 (" bmTCCKST1 .........: %02X\n", msg[11]); DEBUGOUT_1 (" bGuardTimeT1 ......: %02X\n", msg[12]); DEBUGOUT_1 (" bmWaitingIntegersT1: %02X\n", msg[13]); DEBUGOUT_1 (" bClockStop ........: %02X\n", msg[14]); DEBUGOUT_1 (" bIFSC .............: %d\n", msg[15]); DEBUGOUT_1 (" bNadValue .........: %d\n", msg[16]); } else print_pr_data (msg, msglen, 10); } static void print_r2p_escape (const unsigned char *msg, size_t msglen) { print_r2p_header ("RDR_to_PC_Escape", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" buffer[9] .........: %02X\n", msg[9]); print_pr_data (msg, msglen, 10); } static void print_r2p_datarate (const unsigned char *msg, size_t msglen) { print_r2p_header ("RDR_to_PC_DataRate", msg, msglen); if (msglen < 10) return; if (msglen >= 18) { DEBUGOUT_1 (" dwClockFrequency ..: %u\n", convert_le_u32 (msg+10)); DEBUGOUT_1 (" dwDataRate ..... ..: %u\n", convert_le_u32 (msg+14)); print_pr_data (msg, msglen, 18); } else print_pr_data (msg, msglen, 10); } static void print_r2p_unknown (const unsigned char *msg, size_t msglen) { print_r2p_header ("Unknown RDR_to_PC command", msg, msglen); if (msglen < 10) return; DEBUGOUT_1 (" bMessageType ......: %02X\n", msg[0]); DEBUGOUT_1 (" buffer[9] .........: %02X\n", msg[9]); print_pr_data (msg, msglen, 10); } /* Given a handle used for special transport prepare it for use. In particular setup all information in way that resembles what parse_cccid_descriptor does. */ static void prepare_special_transport (ccid_driver_t handle) { assert (!handle->id_vendor); handle->nonnull_nad = 0; handle->auto_ifsd = 0; handle->max_ifsd = 32; handle->ifsd = 0; handle->has_pinpad = 0; handle->apdu_level = 0; switch (handle->id_product) { case TRANSPORT_CM4040: DEBUGOUT ("setting up transport for CardMan 4040\n"); handle->apdu_level = 1; break; default: assert (!"transport not defined"); } } /* Parse a CCID descriptor, optionally print all available features and test whether this reader is usable by this driver. Returns 0 if it is usable. Note, that this code is based on the one in lsusb.c of the usb-utils package, I wrote on 2003-09-01. -wk. */ static int parse_ccid_descriptor (ccid_driver_t handle, const unsigned char *buf, size_t buflen) { unsigned int i; unsigned int us; int have_t1 = 0, have_tpdu=0, have_auto_conf = 0; handle->nonnull_nad = 0; handle->auto_ifsd = 0; handle->max_ifsd = 32; handle->ifsd = 0; handle->has_pinpad = 0; handle->apdu_level = 0; DEBUGOUT_3 ("idVendor: %04X idProduct: %04X bcdDevice: %04X\n", handle->id_vendor, handle->id_product, handle->bcd_device); if (buflen < 54 || buf[0] < 54) { DEBUGOUT ("CCID device descriptor is too short\n"); return -1; } DEBUGOUT ("ChipCard Interface Descriptor:\n"); DEBUGOUT_1 (" bLength %5u\n", buf[0]); DEBUGOUT_1 (" bDescriptorType %5u\n", buf[1]); DEBUGOUT_2 (" bcdCCID %2x.%02x", buf[3], buf[2]); if (buf[3] != 1 || buf[2] != 0) DEBUGOUT_CONT(" (Warning: Only accurate for version 1.0)"); DEBUGOUT_LF (); DEBUGOUT_1 (" nMaxSlotIndex %5u\n", buf[4]); DEBUGOUT_2 (" bVoltageSupport %5u %s\n", buf[5], (buf[5] == 1? "5.0V" : buf[5] == 2? "3.0V" : buf[5] == 3? "1.8V":"?")); us = convert_le_u32 (buf+6); DEBUGOUT_1 (" dwProtocols %5u ", us); if ((us & 1)) DEBUGOUT_CONT (" T=0"); if ((us & 2)) { DEBUGOUT_CONT (" T=1"); have_t1 = 1; } if ((us & ~3)) DEBUGOUT_CONT (" (Invalid values detected)"); DEBUGOUT_LF (); us = convert_le_u32(buf+10); DEBUGOUT_1 (" dwDefaultClock %5u\n", us); us = convert_le_u32(buf+14); DEBUGOUT_1 (" dwMaxiumumClock %5u\n", us); DEBUGOUT_1 (" bNumClockSupported %5u\n", buf[18]); us = convert_le_u32(buf+19); DEBUGOUT_1 (" dwDataRate %7u bps\n", us); us = convert_le_u32(buf+23); DEBUGOUT_1 (" dwMaxDataRate %7u bps\n", us); DEBUGOUT_1 (" bNumDataRatesSupp. %5u\n", buf[27]); us = convert_le_u32(buf+28); DEBUGOUT_1 (" dwMaxIFSD %5u\n", us); handle->max_ifsd = us; us = convert_le_u32(buf+32); DEBUGOUT_1 (" dwSyncProtocols %08X ", us); if ((us&1)) DEBUGOUT_CONT ( " 2-wire"); if ((us&2)) DEBUGOUT_CONT ( " 3-wire"); if ((us&4)) DEBUGOUT_CONT ( " I2C"); DEBUGOUT_LF (); us = convert_le_u32(buf+36); DEBUGOUT_1 (" dwMechanical %08X ", us); if ((us & 1)) DEBUGOUT_CONT (" accept"); if ((us & 2)) DEBUGOUT_CONT (" eject"); if ((us & 4)) DEBUGOUT_CONT (" capture"); if ((us & 8)) DEBUGOUT_CONT (" lock"); DEBUGOUT_LF (); us = convert_le_u32(buf+40); DEBUGOUT_1 (" dwFeatures %08X\n", us); if ((us & 0x0002)) { DEBUGOUT (" Auto configuration based on ATR\n"); have_auto_conf = 1; } if ((us & 0x0004)) DEBUGOUT (" Auto activation on insert\n"); if ((us & 0x0008)) DEBUGOUT (" Auto voltage selection\n"); if ((us & 0x0010)) DEBUGOUT (" Auto clock change\n"); if ((us & 0x0020)) DEBUGOUT (" Auto baud rate change\n"); if ((us & 0x0040)) DEBUGOUT (" Auto parameter negotiation made by CCID\n"); else if ((us & 0x0080)) DEBUGOUT (" Auto PPS made by CCID\n"); else if ((us & (0x0040 | 0x0080))) DEBUGOUT (" WARNING: conflicting negotiation features\n"); if ((us & 0x0100)) DEBUGOUT (" CCID can set ICC in clock stop mode\n"); if ((us & 0x0200)) { DEBUGOUT (" NAD value other than 0x00 accepted\n"); handle->nonnull_nad = 1; } if ((us & 0x0400)) { DEBUGOUT (" Auto IFSD exchange\n"); handle->auto_ifsd = 1; } if ((us & 0x00010000)) { DEBUGOUT (" TPDU level exchange\n"); have_tpdu = 1; } else if ((us & 0x00020000)) { DEBUGOUT (" Short APDU level exchange\n"); handle->apdu_level = 1; } else if ((us & 0x00040000)) { DEBUGOUT (" Short and extended APDU level exchange\n"); handle->apdu_level = 2; } else if ((us & 0x00070000)) DEBUGOUT (" WARNING: conflicting exchange levels\n"); us = convert_le_u32(buf+44); DEBUGOUT_1 (" dwMaxCCIDMsgLen %5u\n", us); DEBUGOUT ( " bClassGetResponse "); if (buf[48] == 0xff) DEBUGOUT_CONT ("echo\n"); else DEBUGOUT_CONT_1 (" %02X\n", buf[48]); DEBUGOUT ( " bClassEnvelope "); if (buf[49] == 0xff) DEBUGOUT_CONT ("echo\n"); else DEBUGOUT_CONT_1 (" %02X\n", buf[48]); DEBUGOUT ( " wlcdLayout "); if (!buf[50] && !buf[51]) DEBUGOUT_CONT ("none\n"); else DEBUGOUT_CONT_2 ("%u cols %u lines\n", buf[50], buf[51]); DEBUGOUT_1 (" bPINSupport %5u ", buf[52]); if ((buf[52] & 1)) { DEBUGOUT_CONT ( " verification"); handle->has_pinpad |= 1; } if ((buf[52] & 2)) { DEBUGOUT_CONT ( " modification"); handle->has_pinpad |= 2; } DEBUGOUT_LF (); DEBUGOUT_1 (" bMaxCCIDBusySlots %5u\n", buf[53]); if (buf[0] > 54) { DEBUGOUT (" junk "); for (i=54; i < buf[0]-54; i++) DEBUGOUT_CONT_1 (" %02X", buf[i]); DEBUGOUT_LF (); } if (!have_t1 || !(have_tpdu || handle->apdu_level) || !have_auto_conf) { DEBUGOUT ("this drivers requires that the reader supports T=1, " "TPDU or APDU level exchange and auto configuration - " "this is not available\n"); return -1; } /* SCM drivers get stuck in their internal USB stack if they try to send a frame of n*wMaxPacketSize back to us. Given that wMaxPacketSize is 64 for these readers we set the IFSD to a value lower than that: 64 - 10 CCID header - 4 T1frame - 2 reserved = 48 Product Ids: 0xe001 - SCR 331 0x5111 - SCR 331-DI 0x5115 - SCR 335 0xe003 - SPR 532 The 0x5117 - SCR 3320 USB ID-000 reader seems to be very slow but enabling this workaround boosts the performance to a a more or less acceptable level (tested by David). */ if (handle->id_vendor == VENDOR_SCM && handle->max_ifsd > 48 && ( (handle->id_product == 0xe001 && handle->bcd_device < 0x0516) ||(handle->id_product == 0x5111 && handle->bcd_device < 0x0620) ||(handle->id_product == 0x5115 && handle->bcd_device < 0x0514) ||(handle->id_product == 0xe003 && handle->bcd_device < 0x0504) ||(handle->id_product == 0x5117 && handle->bcd_device < 0x0522) )) { DEBUGOUT ("enabling workaround for buggy SCM readers\n"); handle->max_ifsd = 48; } return 0; } static char * get_escaped_usb_string (usb_dev_handle *idev, int idx, const char *prefix, const char *suffix) { int rc; unsigned char buf[280]; unsigned char *s; unsigned int langid; size_t i, n, len; char *result; if (!idx) return NULL; /* Fixme: The next line is for the current Valgrid without support for USB IOCTLs. */ memset (buf, 0, sizeof buf); /* First get the list of supported languages and use the first one. If we do don't find it we try to use English. Note that this is all in a 2 bute Unicode encoding using little endian. */ rc = usb_control_msg (idev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8), 0, (char*)buf, sizeof buf, 1000 /* ms timeout */); if (rc < 4) langid = 0x0409; /* English. */ else langid = (buf[3] << 8) | buf[2]; rc = usb_control_msg (idev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + idx, langid, (char*)buf, sizeof buf, 1000 /* ms timeout */); if (rc < 2 || buf[1] != USB_DT_STRING) return NULL; /* Error or not a string. */ len = buf[0]; if (len > rc) return NULL; /* Larger than our buffer. */ for (s=buf+2, i=2, n=0; i+1 < len; i += 2, s += 2) { if (s[1]) n++; /* High byte set. */ else if (*s <= 0x20 || *s >= 0x7f || *s == '%' || *s == ':') n += 3 ; else n++; } result = malloc (strlen (prefix) + n + strlen (suffix) + 1); if (!result) return NULL; strcpy (result, prefix); n = strlen (prefix); for (s=buf+2, i=2; i+1 < len; i += 2, s += 2) { if (s[1]) result[n++] = '\xff'; /* High byte set. */ else if (*s <= 0x20 || *s >= 0x7f || *s == '%' || *s == ':') { sprintf (result+n, "%%%02X", *s); n += 3; } else result[n++] = *s; } strcpy (result+n, suffix); return result; } /* This function creates an reader id to be used to find the same physical reader after a reset. It returns an allocated and possibly percent escaped string or NULL if not enough memory is available. */ static char * make_reader_id (usb_dev_handle *idev, unsigned int vendor, unsigned int product, unsigned char serialno_index) { char *rid; char prefix[20]; sprintf (prefix, "%04X:%04X:", (vendor & 0xffff), (product & 0xffff)); rid = get_escaped_usb_string (idev, serialno_index, prefix, ":0"); if (!rid) { rid = malloc (strlen (prefix) + 3 + 1); if (!rid) return NULL; strcpy (rid, prefix); strcat (rid, "X:0"); } return rid; } /* Helper to find the endpoint from an interface descriptor. */ static int find_endpoint (struct usb_interface_descriptor *ifcdesc, int mode) { int no; int want_bulk_in = 0; if (mode == 1) want_bulk_in = 0x80; for (no=0; no < ifcdesc->bNumEndpoints; no++) { struct usb_endpoint_descriptor *ep = ifcdesc->endpoint + no; if (ep->bDescriptorType != USB_DT_ENDPOINT) ; else if (mode == 2 && ((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT) && (ep->bEndpointAddress & 0x80)) return (ep->bEndpointAddress & 0x0f); else if (((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK) && (ep->bEndpointAddress & 0x80) == want_bulk_in) return (ep->bEndpointAddress & 0x0f); } /* Should never happen. */ return mode == 2? 0x83 : mode == 1? 0x82 :1; } /* Helper for scan_or_find_devices. This function returns true if a requested device has been found or the caller should stop scanning for other reasons. */ static int scan_or_find_usb_device (int scan_mode, int *readerno, int *count, char **rid_list, const char *readerid, struct usb_device *dev, char **r_rid, struct usb_device **r_dev, usb_dev_handle **r_idev, unsigned char **ifcdesc_extra, size_t *ifcdesc_extra_len, int *interface_number, int *ep_bulk_out, int *ep_bulk_in, int *ep_intr) { int cfg_no; int ifc_no; int set_no; struct usb_config_descriptor *config; struct usb_interface *interface; struct usb_interface_descriptor *ifcdesc; char *rid; usb_dev_handle *idev; *r_idev = NULL; for (cfg_no=0; cfg_no < dev->descriptor.bNumConfigurations; cfg_no++) { config = dev->config + cfg_no; if(!config) continue; for (ifc_no=0; ifc_no < config->bNumInterfaces; ifc_no++) { interface = config->interface + ifc_no; if (!interface) continue; for (set_no=0; set_no < interface->num_altsetting; set_no++) { ifcdesc = (interface->altsetting + set_no); /* The second condition is for older SCM SPR 532 who did not know about the assigned CCID class. Instead of trying to interpret the strings we simply check the product ID. */ if (ifcdesc && ifcdesc->extra && ((ifcdesc->bInterfaceClass == 11 && ifcdesc->bInterfaceSubClass == 0 && ifcdesc->bInterfaceProtocol == 0) || (ifcdesc->bInterfaceClass == 255 && dev->descriptor.idVendor == VENDOR_SCM && dev->descriptor.idProduct == 0xe003))) { idev = usb_open (dev); if (!idev) { DEBUGOUT_1 ("usb_open failed: %s\n", strerror (errno)); continue; /* with next setting. */ } rid = make_reader_id (idev, dev->descriptor.idVendor, dev->descriptor.idProduct, dev->descriptor.iSerialNumber); if (rid) { if (scan_mode) { char *p; /* We are collecting infos about all available CCID readers. Store them and continue. */ DEBUGOUT_2 ("found CCID reader %d (ID=%s)\n", *count, rid ); p = malloc ((*rid_list? strlen (*rid_list):0) + 1 + strlen (rid) + 1); if (p) { *p = 0; if (*rid_list) { strcat (p, *rid_list); free (*rid_list); } strcat (p, rid); strcat (p, "\n"); *rid_list = p; } else /* Out of memory. */ free (rid); rid = NULL; ++*count; } else if (!*readerno || (*readerno < 0 && readerid && !strcmp (readerid, rid))) { /* We found the requested reader. */ if (ifcdesc_extra && ifcdesc_extra_len) { *ifcdesc_extra = malloc (ifcdesc ->extralen); if (!*ifcdesc_extra) { usb_close (idev); free (rid); return 1; /* Out of core. */ } memcpy (*ifcdesc_extra, ifcdesc->extra, ifcdesc->extralen); *ifcdesc_extra_len = ifcdesc->extralen; } if (interface_number) *interface_number = (ifcdesc->bInterfaceNumber); if (ep_bulk_out) *ep_bulk_out = find_endpoint (ifcdesc, 0); if (ep_bulk_in) *ep_bulk_in = find_endpoint (ifcdesc, 1); if (ep_intr) *ep_intr = find_endpoint (ifcdesc, 2); if (r_dev) *r_dev = dev; if (r_rid) { *r_rid = rid; rid = NULL; } else free (rid); *r_idev = idev; return 1; /* Found requested device. */ } else { /* This is not yet the reader we want. fixme: We should avoid the extra usb_open in this case. */ if (*readerno >= 0) --*readerno; } free (rid); } usb_close (idev); idev = NULL; return 0; } } } } return 0; } /* Combination function to either scan all CCID devices or to find and open one specific device. The function returns 0 if a reader has been found or when a scan returned without error. With READERNO = -1 and READERID is NULL, scan mode is used and R_RID should be the address where to store the list of reader_ids we found. If on return this list is empty, no CCID device has been found; otherwise it points to an allocated linked list of reader IDs. Note that in this mode the function always returns NULL. With READERNO >= 0 or READERID is not NULL find mode is used. This uses the same algorithm as the scan mode but stops and returns at the entry number READERNO and return the handle for the the opened USB device. If R_RID is not NULL it will receive the reader ID of that device. If R_DEV is not NULL it will the device pointer of that device. If IFCDESC_EXTRA is NOT NULL it will receive a malloced copy of the interfaces "extra: data filed; IFCDESC_EXTRA_LEN receive the length of this field. If there is no reader with number READERNO or that reader is not usable by our implementation NULL will be returned. The caller must close a returned USB device handle and free (if not passed as NULL) the returned reader ID info as well as the IFCDESC_EXTRA. On error NULL will get stored at R_RID, R_DEV, IFCDESC_EXTRA and IFCDESC_EXTRA_LEN. With READERID being -1 the function stops if the READERID was found. If R_FD is not -1 on return the device is not using USB for transport but the device associated with that file descriptor. In this case INTERFACE will receive the transport type and the other USB specific return values are not used; the return value is (void*)(1). Note that the first entry of the returned reader ID list in scan mode corresponds with a READERNO of 0 in find mode. */ static int scan_or_find_devices (int readerno, const char *readerid, char **r_rid, struct usb_device **r_dev, unsigned char **ifcdesc_extra, size_t *ifcdesc_extra_len, int *interface_number, int *ep_bulk_out, int *ep_bulk_in, int *ep_intr, usb_dev_handle **r_idev, int *r_fd) { char *rid_list = NULL; int count = 0; struct usb_bus *busses, *bus; struct usb_device *dev = NULL; usb_dev_handle *idev = NULL; int scan_mode = (readerno == -1 && !readerid); int i; /* Set return values to a default. */ if (r_rid) *r_rid = NULL; if (r_dev) *r_dev = NULL; if (ifcdesc_extra) *ifcdesc_extra = NULL; if (ifcdesc_extra_len) *ifcdesc_extra_len = 0; if (interface_number) *interface_number = 0; if (r_idev) *r_idev = NULL; if (r_fd) *r_fd = -1; /* See whether we want scan or find mode. */ if (scan_mode) { assert (r_rid); } usb_find_busses(); usb_find_devices(); #ifdef HAVE_USB_GET_BUSSES busses = usb_get_busses(); #else busses = usb_busses; #endif for (bus = busses; bus; bus = bus->next) { for (dev = bus->devices; dev; dev = dev->next) { if (scan_or_find_usb_device (scan_mode, &readerno, &count, &rid_list, readerid, dev, r_rid, r_dev, &idev, ifcdesc_extra, ifcdesc_extra_len, interface_number, ep_bulk_out, ep_bulk_in, ep_intr)) { /* Found requested device or out of core. */ if (!idev) { free (rid_list); return -1; /* error */ } *r_idev = idev; return 0; } } } /* Now check whether there are any devices with special transport types. */ for (i=0; transports[i].name; i++) { int fd; char *rid, *p; fd = open (transports[i].name, O_RDWR); if (fd == -1 && scan_mode && errno == EBUSY) { /* Ignore this error in scan mode because it indicates that the device exists but is already open (most likely by us) and thus in general suitable as a reader. */ } else if (fd == -1) { DEBUGOUT_2 ("failed to open `%s': %s\n", transports[i].name, strerror (errno)); continue; } rid = malloc (strlen (transports[i].name) + 30 + 10); if (!rid) { if (fd != -1) close (fd); free (rid_list); return -1; /* Error. */ } sprintf (rid, "0000:%04X:%s:0", transports[i].type, transports[i].name); if (scan_mode) { DEBUGOUT_2 ("found CCID reader %d (ID=%s)\n", count, rid); p = malloc ((rid_list? strlen (rid_list):0) + 1 + strlen (rid) + 1); if (!p) { if (fd != -1) close (fd); free (rid_list); free (rid); return -1; /* Error. */ } *p = 0; if (rid_list) { strcat (p, rid_list); free (rid_list); } strcat (p, rid); strcat (p, "\n"); rid_list = p; ++count; } else if (!readerno || (readerno < 0 && readerid && !strcmp (readerid, rid))) { /* Found requested device. */ if (interface_number) *interface_number = transports[i].type; if (r_rid) *r_rid = rid; else free (rid); if (r_fd) *r_fd = fd; return 0; /* Okay, found device */ } else /* This is not yet the reader we want. */ { if (readerno >= 0) --readerno; } free (rid); if (fd != -1) close (fd); } if (scan_mode) { *r_rid = rid_list; return 0; } else return -1; } /* Set the level of debugging to LEVEL and return the old level. -1 just returns the old level. A level of 0 disables debugging, 1 enables debugging, 2 enables additional tracing of the T=1 protocol, 3 additionally enables debugging for GetSlotStatus, other values are not yet defined. Note that libusb may provide its own debugging feature which is enabled by setting the envvar USB_DEBUG. */ int ccid_set_debug_level (int level) { int old = debug_level; if (level != -1) debug_level = level; return old; } char * ccid_get_reader_list (void) { char *reader_list; if (!initialized_usb) { usb_init (); initialized_usb = 1; } if (scan_or_find_devices (-1, NULL, &reader_list, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) return NULL; /* Error. */ return reader_list; } /* Open the reader with the internal number READERNO and return a pointer to be used as handle in HANDLE. Returns 0 on success. */ int ccid_open_reader (ccid_driver_t *handle, const char *readerid) { int rc = 0; struct usb_device *dev = NULL; usb_dev_handle *idev = NULL; int dev_fd = -1; char *rid = NULL; unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; int readerno; int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; *handle = NULL; if (!initialized_usb) { usb_init (); initialized_usb = 1; } /* See whether we want to use the reader ID string or a reader number. A readerno of -1 indicates that the reader ID string is to be used. */ if (readerid && strchr (readerid, ':')) readerno = -1; /* We want to use the readerid. */ else if (readerid) { readerno = atoi (readerid); if (readerno < 0) { DEBUGOUT ("no CCID readers found\n"); rc = CCID_DRIVER_ERR_NO_READER; goto leave; } } else readerno = 0; /* Default. */ if (scan_or_find_devices (readerno, readerid, &rid, &dev, &ifcdesc_extra, &ifcdesc_extra_len, &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr, &idev, &dev_fd) ) { if (readerno == -1) DEBUGOUT_1 ("no CCID reader with ID %s\n", readerid ); else DEBUGOUT_1 ("no CCID reader with number %d\n", readerno ); rc = CCID_DRIVER_ERR_NO_READER; goto leave; } /* Okay, this is a CCID reader. */ *handle = calloc (1, sizeof **handle); if (!*handle) { DEBUGOUT ("out of memory\n"); rc = CCID_DRIVER_ERR_OUT_OF_CORE; goto leave; } (*handle)->rid = rid; if (idev) /* Regular USB transport. */ { (*handle)->idev = idev; (*handle)->dev_fd = -1; (*handle)->id_vendor = dev->descriptor.idVendor; (*handle)->id_product = dev->descriptor.idProduct; (*handle)->bcd_device = dev->descriptor.bcdDevice; (*handle)->ifc_no = ifc_no; (*handle)->ep_bulk_out = ep_bulk_out; (*handle)->ep_bulk_in = ep_bulk_in; (*handle)->ep_intr = ep_intr; } else if (dev_fd != -1) /* Device transport. */ { (*handle)->idev = NULL; (*handle)->dev_fd = dev_fd; (*handle)->id_vendor = 0; /* Magic vendor for special transport. */ (*handle)->id_product = ifc_no; /* Transport type */ prepare_special_transport (*handle); } else { assert (!"no transport"); /* Bug. */ } DEBUGOUT_2 ("using CCID reader %d (ID=%s)\n", readerno, rid ); if (idev) { if (parse_ccid_descriptor (*handle, ifcdesc_extra, ifcdesc_extra_len)) { DEBUGOUT ("device not supported\n"); rc = CCID_DRIVER_ERR_NO_READER; goto leave; } rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); rc = CCID_DRIVER_ERR_CARD_IO_ERROR; goto leave; } } leave: free (ifcdesc_extra); if (rc) { free (rid); if (idev) usb_close (idev); if (dev_fd != -1) close (dev_fd); free (*handle); *handle = NULL; } return rc; } static void do_close_reader (ccid_driver_t handle) { int rc; unsigned char msg[100]; size_t msglen; unsigned char seqno; if (!handle->powered_off) { msg[0] = PC_to_RDR_IccPowerOff; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); msglen = 10; rc = bulk_out (handle, msg, msglen, 0); if (!rc) bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus, seqno, 2000, 0); handle->powered_off = 1; } if (handle->idev) { usb_release_interface (handle->idev, handle->ifc_no); usb_close (handle->idev); handle->idev = NULL; } if (handle->dev_fd != -1) { close (handle->dev_fd); handle->dev_fd = -1; } } /* Reset a reader on HANDLE. This is useful in case a reader has been plugged of and inserted at a different port. By resetting the handle, the same reader will be get used. Note, that on error the handle won't get released. This does not return an ATR, so ccid_get_atr should be called right after this one. */ int ccid_shutdown_reader (ccid_driver_t handle) { int rc = 0; struct usb_device *dev = NULL; usb_dev_handle *idev = NULL; unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; if (!handle || !handle->rid) return CCID_DRIVER_ERR_INV_VALUE; do_close_reader (handle); if (scan_or_find_devices (-1, handle->rid, NULL, &dev, &ifcdesc_extra, &ifcdesc_extra_len, &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr, &idev, NULL) || !idev) { DEBUGOUT_1 ("no CCID reader with ID %s\n", handle->rid); return CCID_DRIVER_ERR_NO_READER; } if (idev) { handle->idev = idev; handle->ifc_no = ifc_no; handle->ep_bulk_out = ep_bulk_out; handle->ep_bulk_in = ep_bulk_in; handle->ep_intr = ep_intr; if (parse_ccid_descriptor (handle, ifcdesc_extra, ifcdesc_extra_len)) { DEBUGOUT ("device not supported\n"); rc = CCID_DRIVER_ERR_NO_READER; goto leave; } rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); rc = CCID_DRIVER_ERR_CARD_IO_ERROR; goto leave; } } leave: free (ifcdesc_extra); if (rc) { if (handle->idev) usb_close (handle->idev); handle->idev = NULL; if (handle->dev_fd != -1) close (handle->dev_fd); handle->dev_fd = -1; } return rc; } int ccid_set_progress_cb (ccid_driver_t handle, void (*cb)(void *, const char *, int, int, int), void *cb_arg) { if (!handle || !handle->rid) return CCID_DRIVER_ERR_INV_VALUE; handle->progress_cb = cb; handle->progress_cb_arg = cb_arg; return 0; } /* Close the reader HANDLE. */ int ccid_close_reader (ccid_driver_t handle) { if (!handle || (!handle->idev && handle->dev_fd == -1)) return 0; do_close_reader (handle); free (handle->rid); free (handle); return 0; } /* Return False if a card is present and powered. */ int ccid_check_card_presence (ccid_driver_t handle) { (void)handle; /* Not yet implemented. */ return -1; } /* Write NBYTES of BUF to file descriptor FD. */ static int writen (int fd, const void *buf, size_t nbytes) { size_t nleft = nbytes; int nwritten; while (nleft > 0) { nwritten = write (fd, buf, nleft); if (nwritten < 0) { if (errno == EINTR) nwritten = 0; else return -1; } nleft -= nwritten; buf = (const char*)buf + nwritten; } return 0; } /* Write a MSG of length MSGLEN to the designated bulk out endpoint. Returns 0 on success. */ static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen, int no_debug) { int rc; /* No need to continue and clutter the log with USB write error messages after we got the first ENODEV. */ if (handle->enodev_seen) return CCID_DRIVER_ERR_NO_READER; if (debug_level && (!no_debug || debug_level >= 3)) { switch (msglen? msg[0]:0) { case PC_to_RDR_IccPowerOn: print_p2r_iccpoweron (msg, msglen); break; case PC_to_RDR_IccPowerOff: print_p2r_iccpoweroff (msg, msglen); break; case PC_to_RDR_GetSlotStatus: print_p2r_getslotstatus (msg, msglen); break; case PC_to_RDR_XfrBlock: print_p2r_xfrblock (msg, msglen); break; case PC_to_RDR_GetParameters: print_p2r_getparameters (msg, msglen); break; case PC_to_RDR_ResetParameters: print_p2r_resetparameters (msg, msglen); break; case PC_to_RDR_SetParameters: print_p2r_setparameters (msg, msglen); break; case PC_to_RDR_Escape: print_p2r_escape (msg, msglen); break; case PC_to_RDR_IccClock: print_p2r_iccclock (msg, msglen); break; case PC_to_RDR_T0APDU: print_p2r_to0apdu (msg, msglen); break; case PC_to_RDR_Secure: print_p2r_secure (msg, msglen); break; case PC_to_RDR_Mechanical: print_p2r_mechanical (msg, msglen); break; case PC_to_RDR_Abort: print_p2r_abort (msg, msglen); break; case PC_to_RDR_SetDataRate: print_p2r_setdatarate (msg, msglen); break; default: print_p2r_unknown (msg, msglen); break; } } if (handle->idev) { rc = usb_bulk_write (handle->idev, handle->ep_bulk_out, (char*)msg, msglen, 5000 /* ms timeout */); if (rc == msglen) return 0; #ifdef ENODEV if (rc == -(ENODEV)) { /* The Linux libusb returns a negative error value. Catch the most important one. */ errno = ENODEV; rc = -1; } #endif /*ENODEV*/ if (rc == -1) { DEBUGOUT_1 ("usb_bulk_write error: %s\n", strerror (errno)); #ifdef ENODEV if (errno == ENODEV) { handle->enodev_seen = 1; return CCID_DRIVER_ERR_NO_READER; } #endif /*ENODEV*/ } else DEBUGOUT_1 ("usb_bulk_write failed: %d\n", rc); } else { rc = writen (handle->dev_fd, msg, msglen); if (!rc) return 0; DEBUGOUT_2 ("writen to %d failed: %s\n", handle->dev_fd, strerror (errno)); } return CCID_DRIVER_ERR_CARD_IO_ERROR; } /* Read a maximum of LENGTH bytes from the bulk in endpoint into BUFFER and return the actual read number if bytes in NREAD. SEQNO is the sequence number used to send the request and EXPECTED_TYPE the type of message we expect. Does checks on the ccid header. TIMEOUT is the timeout value in ms. NO_DEBUG may be set to avoid debug messages in case of no error; this can be overriden with a glibal debug level of at least 3. Returns 0 on success. */ static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length, size_t *nread, int expected_type, int seqno, int timeout, int no_debug) { int rc; size_t msglen; int eagain_retries = 0; /* Fixme: The next line for the current Valgrind without support for USB IOCTLs. */ memset (buffer, 0, length); retry: if (handle->idev) { rc = usb_bulk_read (handle->idev, handle->ep_bulk_in, (char*)buffer, length, timeout); if (rc < 0) { rc = errno; DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc)); if (rc == EAGAIN && eagain_retries++ < 3) { my_sleep (1); goto retry; } return CCID_DRIVER_ERR_CARD_IO_ERROR; } *nread = msglen = rc; } else { rc = read (handle->dev_fd, buffer, length); if (rc < 0) { rc = errno; DEBUGOUT_2 ("read from %d failed: %s\n", handle->dev_fd, strerror (rc)); if (rc == EAGAIN && eagain_retries++ < 5) { my_sleep (1); goto retry; } return CCID_DRIVER_ERR_CARD_IO_ERROR; } *nread = msglen = rc; } eagain_retries = 0; if (msglen < 10) { DEBUGOUT_1 ("bulk-in msg too short (%u)\n", (unsigned int)msglen); abort_cmd (handle, seqno); return CCID_DRIVER_ERR_INV_VALUE; } if (buffer[5] != 0) { DEBUGOUT_1 ("unexpected bulk-in slot (%d)\n", buffer[5]); return CCID_DRIVER_ERR_INV_VALUE; } if (buffer[6] != seqno) { DEBUGOUT_2 ("bulk-in seqno does not match (%d/%d)\n", seqno, buffer[6]); /* Retry until we are synced again. */ goto retry; } /* We need to handle the time extension request before we check that we got the expected message type. This is in particular required for the Cherry keyboard which sends a time extension request for each key hit. */ if ( !(buffer[7] & 0x03) && (buffer[7] & 0xC0) == 0x80) { /* Card present and active, time extension requested. */ DEBUGOUT_2 ("time extension requested (%02X,%02X)\n", buffer[7], buffer[8]); goto retry; } if (buffer[0] != expected_type) { DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]); abort_cmd (handle, seqno); return CCID_DRIVER_ERR_INV_VALUE; } if (debug_level && (!no_debug || debug_level >= 3)) { switch (buffer[0]) { case RDR_to_PC_DataBlock: print_r2p_datablock (buffer, msglen); break; case RDR_to_PC_SlotStatus: print_r2p_slotstatus (buffer, msglen); break; case RDR_to_PC_Parameters: print_r2p_parameters (buffer, msglen); break; case RDR_to_PC_Escape: print_r2p_escape (buffer, msglen); break; case RDR_to_PC_DataRate: print_r2p_datarate (buffer, msglen); break; default: print_r2p_unknown (buffer, msglen); break; } } if (CCID_COMMAND_FAILED (buffer)) print_command_failed (buffer); /* Check whether a card is at all available. Note: If you add new error codes here, check whether they need to be ignored in send_escape_cmd. */ switch ((buffer[7] & 0x03)) { case 0: /* no error */ break; case 1: return CCID_DRIVER_ERR_CARD_INACTIVE; case 2: return CCID_DRIVER_ERR_NO_CARD; case 3: /* RFU */ break; } return 0; } /* Send an abort sequence and wait until everything settled. */ static int abort_cmd (ccid_driver_t handle, int seqno) { int rc; char dummybuf[8]; unsigned char msg[100]; size_t msglen; if (!handle->idev) { /* I don't know how to send an abort to non-USB devices. */ rc = CCID_DRIVER_ERR_NOT_SUPPORTED; } seqno &= 0xff; DEBUGOUT_1 ("sending abort sequence for seqno %d\n", seqno); /* Send the abort command to the control pipe. Note that we don't need to keep track of sent abort commands because there should never be another thread using the same slot concurrently. */ rc = usb_control_msg (handle->idev, 0x21,/* bmRequestType: host-to-device, class specific, to interface. */ 1, /* ABORT */ (seqno << 8 | 0 /* slot */), handle->ifc_no, dummybuf, 0, 1000 /* ms timeout */); if (rc < 0) { DEBUGOUT_1 ("usb_control_msg error: %s\n", strerror (errno)); return CCID_DRIVER_ERR_CARD_IO_ERROR; } /* Now send the abort command to the bulk out pipe using the same SEQNO and SLOT. Do this in a loop to so that all seqno are tried. */ seqno--; /* Adjust for next increment. */ do { seqno++; msg[0] = PC_to_RDR_Abort; msg[5] = 0; /* slot */ msg[6] = seqno; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ msglen = 10; set_msg_len (msg, 0); rc = usb_bulk_write (handle->idev, handle->ep_bulk_out, (char*)msg, msglen, 5000 /* ms timeout */); if (rc == msglen) rc = 0; else if (rc == -1) DEBUGOUT_1 ("usb_bulk_write error in abort_cmd: %s\n", strerror (errno)); else DEBUGOUT_1 ("usb_bulk_write failed in abort_cmd: %d\n", rc); if (rc) return rc; rc = usb_bulk_read (handle->idev, handle->ep_bulk_in, (char*)msg, sizeof msg, 5000 /*ms timeout*/); if (rc < 0) { DEBUGOUT_1 ("usb_bulk_read error in abort_cmd: %s\n", strerror (errno)); return CCID_DRIVER_ERR_CARD_IO_ERROR; } msglen = rc; if (msglen < 10) { DEBUGOUT_1 ("bulk-in msg in abort_cmd too short (%u)\n", (unsigned int)msglen); return CCID_DRIVER_ERR_INV_VALUE; } if (msg[5] != 0) { DEBUGOUT_1 ("unexpected bulk-in slot (%d) in abort_cmd\n", msg[5]); return CCID_DRIVER_ERR_INV_VALUE; } DEBUGOUT_3 ("status: %02X error: %02X octet[9]: %02X\n", msg[7], msg[8], msg[9]); if (CCID_COMMAND_FAILED (msg)) print_command_failed (msg); } while (msg[0] != RDR_to_PC_SlotStatus && msg[5] != 0 && msg[6] != seqno); handle->seqno = ((seqno + 1) & 0xff); DEBUGOUT ("sending abort sequence succeeded\n"); return 0; } /* Note that this function won't return the error codes NO_CARD or CARD_INACTIVE. IF RESULT is not NULL, the result from the operation will get returned in RESULT and its length in RESULTLEN. If the response is larger than RESULTMAX, an error is returned and the required buffer length returned in RESULTLEN. */ static int send_escape_cmd (ccid_driver_t handle, const unsigned char *data, size_t datalen, unsigned char *result, size_t resultmax, size_t *resultlen) { int rc; unsigned char msg[100]; size_t msglen; unsigned char seqno; if (resultlen) *resultlen = 0; if (datalen > sizeof msg - 10) return CCID_DRIVER_ERR_INV_VALUE; /* Escape data too large. */ msg[0] = PC_to_RDR_Escape; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ memcpy (msg+10, data, datalen); msglen = 10 + datalen; set_msg_len (msg, datalen); rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Escape, seqno, 5000, 0); if (result) switch (rc) { /* We need to ignore certain errorcode here. */ case 0: case CCID_DRIVER_ERR_CARD_INACTIVE: case CCID_DRIVER_ERR_NO_CARD: { if (msglen > resultmax) rc = CCID_DRIVER_ERR_INV_VALUE; /* Response too large. */ else { memcpy (result, msg, msglen); *resultlen = msglen; } rc = 0; } break; default: break; } return rc; } int ccid_transceive_escape (ccid_driver_t handle, const unsigned char *data, size_t datalen, unsigned char *resp, size_t maxresplen, size_t *nresp) { return send_escape_cmd (handle, data, datalen, resp, maxresplen, nresp); } /* experimental */ int ccid_poll (ccid_driver_t handle) { int rc; unsigned char msg[10]; size_t msglen; int i, j; if (handle->idev) { rc = usb_bulk_read (handle->idev, handle->ep_intr, (char*)msg, sizeof msg, 0 /* ms timeout */ ); if (rc < 0 && errno == ETIMEDOUT) return 0; } else return 0; if (rc < 0) { DEBUGOUT_1 ("usb_intr_read error: %s\n", strerror (errno)); return CCID_DRIVER_ERR_CARD_IO_ERROR; } msglen = rc; rc = 0; if (msglen < 1) { DEBUGOUT ("intr-in msg too short\n"); return CCID_DRIVER_ERR_INV_VALUE; } if (msg[0] == RDR_to_PC_NotifySlotChange) { DEBUGOUT ("notify slot change:"); for (i=1; i < msglen; i++) for (j=0; j < 4; j++) DEBUGOUT_CONT_3 (" %d:%c%c", (i-1)*4+j, (msg[i] & (1<<(j*2)))? 'p':'-', (msg[i] & (2<<(j*2)))? '*':' '); DEBUGOUT_LF (); } else if (msg[0] == RDR_to_PC_HardwareError) { DEBUGOUT ("hardware error occured\n"); } else { DEBUGOUT_1 ("unknown intr-in msg of type %02X\n", msg[0]); } return 0; } /* Note that this function won't return the error codes NO_CARD or CARD_INACTIVE */ int ccid_slot_status (ccid_driver_t handle, int *statusbits) { int rc; unsigned char msg[100]; size_t msglen; unsigned char seqno; int retries = 0; retry: msg[0] = PC_to_RDR_GetSlotStatus; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); rc = bulk_out (handle, msg, 10, 1); if (rc) return rc; /* Note that we set the NO_DEBUG flag here, so that the logs won't get cluttered up by a ticker function checking for the slot status and debugging enabled. */ rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus, seqno, retries? 1000 : 200, 1); if (rc == CCID_DRIVER_ERR_CARD_IO_ERROR && retries < 3) { if (!retries) { DEBUGOUT ("USB: CALLING USB_CLEAR_HALT\n"); usb_clear_halt (handle->idev, handle->ep_bulk_in); usb_clear_halt (handle->idev, handle->ep_bulk_out); } else DEBUGOUT ("USB: RETRYING bulk_in AGAIN\n"); retries++; goto retry; } if (rc && rc != CCID_DRIVER_ERR_NO_CARD && rc != CCID_DRIVER_ERR_CARD_INACTIVE) return rc; *statusbits = (msg[7] & 3); return 0; } /* Return the ATR of the card. This is not a cached value and thus an actual reset is done. */ int ccid_get_atr (ccid_driver_t handle, unsigned char *atr, size_t maxatrlen, size_t *atrlen) { int rc; int statusbits; unsigned char msg[100]; unsigned char *tpdu; size_t msglen, tpdulen; unsigned char seqno; int use_crc = 0; unsigned int edc; int tried_iso = 0; int got_param; /* First check whether a card is available. */ rc = ccid_slot_status (handle, &statusbits); if (rc) return rc; if (statusbits == 2) return CCID_DRIVER_ERR_NO_CARD; /* For an inactive and also for an active card, issue the PowerOn command to get the ATR. */ again: msg[0] = PC_to_RDR_IccPowerOn; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* power select (0=auto, 1=5V, 2=3V, 3=1.8V) */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); msglen = 10; rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_DataBlock, seqno, 5000, 0); if (rc) return rc; if (!tried_iso && CCID_COMMAND_FAILED (msg) && CCID_ERROR_CODE (msg) == 0xbb && ((handle->id_vendor == VENDOR_CHERRY && handle->id_product == 0x0005) || (handle->id_vendor == VENDOR_GEMPC && handle->id_product == 0x4433) )) { tried_iso = 1; /* Try switching to ISO mode. */ if (!send_escape_cmd (handle, (const unsigned char*)"\xF1\x01", 2, NULL, 0, NULL)) goto again; } else if (CCID_COMMAND_FAILED (msg)) return CCID_DRIVER_ERR_CARD_IO_ERROR; handle->powered_off = 0; if (atr) { size_t n = msglen - 10; if (n > maxatrlen) n = maxatrlen; memcpy (atr, msg+10, n); *atrlen = n; } got_param = 0; msg[0] = PC_to_RDR_GetParameters; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, 0); msglen = 10; rc = bulk_out (handle, msg, msglen, 0); if (!rc) rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Parameters, seqno, 2000, 0); if (rc) DEBUGOUT ("GetParameters failed\n"); else if (msglen == 17 && msg[9] == 1) got_param = 1; /* Setup parameters to select T=1. */ msg[0] = PC_to_RDR_SetParameters; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 1; /* Select T=1. */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ if (!got_param) { /* FIXME: Get those values from the ATR. */ msg[10]= 0x01; /* Fi/Di */ msg[11]= 0x10; /* LRC, direct convention. */ msg[12]= 0; /* Extra guardtime. */ msg[13]= 0x41; /* BWI/CWI */ msg[14]= 0; /* No clock stoppping. */ msg[15]= 254; /* IFSC */ msg[16]= 0; /* Does not support non default NAD values. */ } set_msg_len (msg, 7); msglen = 10 + 7; rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_Parameters, seqno, 5000, 0); if (rc) DEBUGOUT ("SetParameters failed (ignored)\n"); if (!rc && msglen > 15 && msg[15] >= 16 && msg[15] <= 254 ) handle->ifsc = msg[15]; else handle->ifsc = 128; /* Something went wrong, assume 128 bytes. */ handle->t1_ns = 0; handle->t1_nr = 0; /* Send an S-Block with our maximum IFSD to the CCID. */ if (!handle->apdu_level && !handle->auto_ifsd) { tpdu = msg+10; /* NAD: DAD=1, SAD=0 */ tpdu[0] = handle->nonnull_nad? ((1 << 4) | 0): 0; tpdu[1] = (0xc0 | 0 | 1); /* S-block request: change IFSD */ tpdu[2] = 1; tpdu[3] = handle->max_ifsd? handle->max_ifsd : 32; tpdulen = 4; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; msg[0] = PC_to_RDR_XfrBlock; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, tpdulen); msglen = 10 + tpdulen; if (debug_level > 1) DEBUGOUT_3 ("T=1: put %c-block seq=%d%s\n", ((msg[11] & 0xc0) == 0x80)? 'R' : (msg[11] & 0x80)? 'S' : 'I', ((msg[11] & 0x80)? !!(msg[11]& 0x10) : !!(msg[11] & 0x40)), (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; rc = bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_DataBlock, seqno, 5000, 0); if (rc) return rc; tpdu = msg + 10; tpdulen = msglen - 10; if (tpdulen < 4) return CCID_DRIVER_ERR_ABORTED; if (debug_level > 1) DEBUGOUT_4 ("T=1: got %c-block seq=%d err=%d%s\n", ((msg[11] & 0xc0) == 0x80)? 'R' : (msg[11] & 0x80)? 'S' : 'I', ((msg[11] & 0x80)? !!(msg[11]& 0x10) : !!(msg[11] & 0x40)), ((msg[11] & 0xc0) == 0x80)? (msg[11] & 0x0f) : 0, (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); if ((tpdu[1] & 0xe0) != 0xe0 || tpdu[2] != 1) { DEBUGOUT ("invalid response for S-block (Change-IFSD)\n"); return -1; } DEBUGOUT_1 ("IFSD has been set to %d\n", tpdu[3]); } return 0; } static unsigned int compute_edc (const unsigned char *data, size_t datalen, int use_crc) { if (use_crc) { return 0x42; /* Not yet implemented. */ } else { unsigned char crc = 0; for (; datalen; datalen--) crc ^= *data++; return crc; } } /* Return true if APDU is an extended length one. */ static int is_exlen_apdu (const unsigned char *apdu, size_t apdulen) { if (apdulen < 7 || apdu[4]) return 0; /* Too short or no Z byte. */ return 1; } /* Helper for ccid_transceive used for APDU level exchanges. */ static int ccid_transceive_apdu_level (ccid_driver_t handle, const unsigned char *apdu_buf, size_t apdu_buflen, unsigned char *resp, size_t maxresplen, size_t *nresp) { int rc; unsigned char send_buffer[10+261+300], recv_buffer[10+261+300]; const unsigned char *apdu; size_t apdulen; unsigned char *msg; size_t msglen; unsigned char seqno; int bwi = 4; msg = send_buffer; apdu = apdu_buf; apdulen = apdu_buflen; assert (apdulen); /* The maximum length for a short APDU T=1 block is 261. For an extended APDU T=1 block the maximum length 65544; however extended APDU exchange level is not yet supported. */ if (apdulen > 261) return CCID_DRIVER_ERR_INV_VALUE; /* Invalid length. */ msg[0] = PC_to_RDR_XfrBlock; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = bwi; /* bBWI */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ memcpy (msg+10, apdu, apdulen); set_msg_len (msg, apdulen); msglen = 10 + apdulen; rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; msg = recv_buffer; rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, RDR_to_PC_DataBlock, seqno, 5000, 0); if (rc) return rc; apdu = msg + 10; apdulen = msglen - 10; if (resp) { if (apdulen > maxresplen) { DEBUGOUT_2 ("provided buffer too short for received data " "(%u/%u)\n", (unsigned int)apdulen, (unsigned int)maxresplen); return CCID_DRIVER_ERR_INV_VALUE; } memcpy (resp, apdu, apdulen); *nresp = apdulen; } return 0; } /* Protocol T=1 overview Block Structure: Prologue Field: 1 byte Node Address (NAD) 1 byte Protocol Control Byte (PCB) 1 byte Length (LEN) Information Field: 0-254 byte APDU or Control Information (INF) Epilogue Field: 1 byte Error Detection Code (EDC) NAD: bit 7 unused bit 4..6 Destination Node Address (DAD) bit 3 unused bit 2..0 Source Node Address (SAD) If node adresses are not used, SAD and DAD should be set to 0 on the first block sent to the card. If they are used they should have different values (0 for one is okay); that first block sets up the addresses of the nodes. PCB: Information Block (I-Block): bit 7 0 bit 6 Sequence number (yep, that is modulo 2) bit 5 Chaining flag bit 4..0 reserved Received-Ready Block (R-Block): bit 7 1 bit 6 0 bit 5 0 bit 4 Sequence number bit 3..0 0 = no error 1 = EDC or parity error 2 = other error other values are reserved Supervisory Block (S-Block): bit 7 1 bit 6 1 bit 5 clear=request,set=response bit 4..0 0 = resyncronisation request 1 = information field size request 2 = abort request 3 = extension of BWT request 4 = VPP error other values are reserved */ int ccid_transceive (ccid_driver_t handle, const unsigned char *apdu_buf, size_t apdu_buflen, unsigned char *resp, size_t maxresplen, size_t *nresp) { int rc; /* The size of the buffer used to be 10+259. For the via_escape hack we need one extra byte, thus 11+259. */ unsigned char send_buffer[11+259], recv_buffer[11+259]; const unsigned char *apdu; size_t apdulen; unsigned char *msg, *tpdu, *p; size_t msglen, tpdulen, last_tpdulen, n; unsigned char seqno; unsigned int edc; int use_crc = 0; int hdrlen, pcboff; size_t dummy_nresp; int via_escape = 0; int next_chunk = 1; int sending = 1; int retries = 0; int resyncing = 0; int nad_byte; if (!nresp) nresp = &dummy_nresp; *nresp = 0; /* Smarter readers allow to send APDUs directly; divert here. */ if (handle->apdu_level) { /* We employ a hack for Omnikey readers which are able to send TPDUs using an escape sequence. There is no documentation but the Windows driver does it this way. Tested using a CM6121. This method works also for the Cherry XX44 keyboards; however there are problems with the ccid_tranceive_secure which leads to a loss of sync on the CCID level. If Cherry wants to make their keyboard work again, they should hand over some docs. */ if ((handle->id_vendor == VENDOR_OMNIKEY || (!handle->idev && handle->id_product == TRANSPORT_CM4040)) && handle->apdu_level < 2 && is_exlen_apdu (apdu_buf, apdu_buflen)) via_escape = 1; else return ccid_transceive_apdu_level (handle, apdu_buf, apdu_buflen, resp, maxresplen, nresp); } /* The other readers we support require sending TPDUs. */ tpdulen = 0; /* Avoid compiler warning about no initialization. */ msg = send_buffer; hdrlen = via_escape? 11 : 10; /* NAD: DAD=1, SAD=0 */ nad_byte = handle->nonnull_nad? ((1 << 4) | 0): 0; if (via_escape) nad_byte = 0; last_tpdulen = 0; /* Avoid gcc warning (controlled by RESYNCING). */ for (;;) { if (next_chunk) { next_chunk = 0; apdu = apdu_buf; apdulen = apdu_buflen; assert (apdulen); /* Construct an I-Block. */ tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = ((handle->t1_ns & 1) << 6); /* I-block */ if (apdulen > handle->ifsc ) { apdulen = handle->ifsc; apdu_buf += handle->ifsc; apdu_buflen -= handle->ifsc; tpdu[1] |= (1 << 5); /* Set more bit. */ } tpdu[2] = apdulen; memcpy (tpdu+3, apdu, apdulen); tpdulen = 3 + apdulen; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; } if (via_escape) { msg[0] = PC_to_RDR_Escape; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* RFU */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ msg[10] = 0x1a; /* Omnikey command to send a TPDU. */ set_msg_len (msg, 1 + tpdulen); } else { msg[0] = PC_to_RDR_XfrBlock; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 4; /* bBWI */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ set_msg_len (msg, tpdulen); } msglen = hdrlen + tpdulen; if (!resyncing) last_tpdulen = tpdulen; pcboff = hdrlen+1; if (debug_level > 1) DEBUGOUT_3 ("T=1: put %c-block seq=%d%s\n", ((msg[pcboff] & 0xc0) == 0x80)? 'R' : (msg[pcboff] & 0x80)? 'S' : 'I', ((msg[pcboff] & 0x80)? !!(msg[pcboff]& 0x10) : !!(msg[pcboff] & 0x40)), (!(msg[pcboff] & 0x80) && (msg[pcboff] & 0x20)? " [more]":"")); rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; msg = recv_buffer; rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, via_escape? RDR_to_PC_Escape : RDR_to_PC_DataBlock, seqno, 5000, 0); if (rc) return rc; tpdu = msg + hdrlen; tpdulen = msglen - hdrlen; resyncing = 0; if (tpdulen < 4) { usb_clear_halt (handle->idev, handle->ep_bulk_in); return CCID_DRIVER_ERR_ABORTED; } if (debug_level > 1) DEBUGOUT_4 ("T=1: got %c-block seq=%d err=%d%s\n", ((msg[pcboff] & 0xc0) == 0x80)? 'R' : (msg[pcboff] & 0x80)? 'S' : 'I', ((msg[pcboff] & 0x80)? !!(msg[pcboff]& 0x10) : !!(msg[pcboff] & 0x40)), ((msg[pcboff] & 0xc0) == 0x80)? (msg[pcboff] & 0x0f) : 0, (!(msg[pcboff] & 0x80) && (msg[pcboff] & 0x20)? " [more]":"")); if (!(tpdu[1] & 0x80)) { /* This is an I-block. */ retries = 0; if (sending) { /* last block sent was successful. */ handle->t1_ns ^= 1; sending = 0; } if (!!(tpdu[1] & 0x40) != handle->t1_nr) { /* Reponse does not match our sequence number. */ msg = send_buffer; tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = (0x80 | (handle->t1_nr & 1) << 4 | 2); /* R-block */ tpdu[2] = 0; tpdulen = 3; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; continue; } handle->t1_nr ^= 1; p = tpdu + 3; /* Skip the prologue field. */ n = tpdulen - 3 - 1; /* Strip the epilogue field. */ /* fixme: verify the checksum. */ if (resp) { if (n > maxresplen) { DEBUGOUT_2 ("provided buffer too short for received data " "(%u/%u)\n", (unsigned int)n, (unsigned int)maxresplen); return CCID_DRIVER_ERR_INV_VALUE; } memcpy (resp, p, n); resp += n; *nresp += n; maxresplen -= n; } if (!(tpdu[1] & 0x20)) return 0; /* No chaining requested - ready. */ msg = send_buffer; tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = (0x80 | (handle->t1_nr & 1) << 4); /* R-block */ tpdu[2] = 0; tpdulen = 3; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; } else if ((tpdu[1] & 0xc0) == 0x80) { /* This is a R-block. */ if ( (tpdu[1] & 0x0f)) { retries++; if (via_escape && retries == 1 && (msg[pcboff] & 0x0f)) { /* Error probably due to switching to TPDU. Send a resync request. We use the recv_buffer so that we don't corrupt the send_buffer. */ msg = recv_buffer; tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = 0xc0; /* S-block resync request. */ tpdu[2] = 0; tpdulen = 3; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; resyncing = 1; DEBUGOUT ("T=1: requesting resync\n"); } else if (retries > 3) { DEBUGOUT ("T=1: 3 failed retries\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } else { /* Error: repeat last block */ msg = send_buffer; tpdulen = last_tpdulen; } } else if (sending && !!(tpdu[1] & 0x10) == handle->t1_ns) { /* Response does not match our sequence number. */ DEBUGOUT ("R-block with wrong seqno received on more bit\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } else if (sending) { /* Send next chunk. */ retries = 0; msg = send_buffer; next_chunk = 1; handle->t1_ns ^= 1; } else { DEBUGOUT ("unexpected ACK R-block received\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } } else { /* This is a S-block. */ retries = 0; DEBUGOUT_2 ("T=1: S-block %s received cmd=%d\n", (tpdu[1] & 0x20)? "response": "request", (tpdu[1] & 0x1f)); if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 1 && tpdu[2] == 1) { /* Information field size request. */ unsigned char ifsc = tpdu[3]; if (ifsc < 16 || ifsc > 254) return CCID_DRIVER_ERR_CARD_IO_ERROR; msg = send_buffer; tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = (0xc0 | 0x20 | 1); /* S-block response */ tpdu[2] = 1; tpdu[3] = ifsc; tpdulen = 4; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; DEBUGOUT_1 ("T=1: requesting an ifsc=%d\n", ifsc); } else if ( !(tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 3 && tpdu[2]) { /* Wait time extension request. */ unsigned char bwi = tpdu[3]; msg = send_buffer; tpdu = msg + hdrlen; tpdu[0] = nad_byte; tpdu[1] = (0xc0 | 0x20 | 3); /* S-block response */ tpdu[2] = 1; tpdu[3] = bwi; tpdulen = 4; edc = compute_edc (tpdu, tpdulen, use_crc); if (use_crc) tpdu[tpdulen++] = (edc >> 8); tpdu[tpdulen++] = edc; DEBUGOUT_1 ("T=1: waittime extension of bwi=%d\n", bwi); print_progress (handle); } else if ( (tpdu[1] & 0x20) && (tpdu[1] & 0x1f) == 0 && !tpdu[2]) { DEBUGOUT ("T=1: resync ack from reader\n"); /* Repeat previous block. */ msg = send_buffer; tpdulen = last_tpdulen; } else return CCID_DRIVER_ERR_CARD_IO_ERROR; } } /* end T=1 protocol loop. */ return 0; } /* Send the CCID Secure command to the reader. APDU_BUF should contain the APDU template. PIN_MODE defines how the pin gets formatted: 1 := The PIN is ASCII encoded and of variable length. The length of the PIN entered will be put into Lc by the reader. The APDU should me made up of 4 bytes without Lc. PINLEN_MIN and PINLEN_MAX define the limits for the pin length. 0 may be used t enable reasonable defaults. PIN_PADLEN should be 0. When called with RESP and NRESP set to NULL, the function will merely check whether the reader supports the secure command for the given APDU and PIN_MODE. */ int ccid_transceive_secure (ccid_driver_t handle, const unsigned char *apdu_buf, size_t apdu_buflen, int pin_mode, int pinlen_min, int pinlen_max, int pin_padlen, unsigned char *resp, size_t maxresplen, size_t *nresp) { int rc; unsigned char send_buffer[10+259], recv_buffer[10+259]; unsigned char *msg, *tpdu, *p; size_t msglen, tpdulen, n; unsigned char seqno; size_t dummy_nresp; int testmode; int cherry_mode = 0; testmode = !resp && !nresp; if (!nresp) nresp = &dummy_nresp; *nresp = 0; if (apdu_buflen >= 4 && apdu_buf[1] == 0x20 && (handle->has_pinpad & 1)) ; else if (apdu_buflen >= 4 && apdu_buf[1] == 0x24 && (handle->has_pinpad & 2)) return CCID_DRIVER_ERR_NOT_SUPPORTED; /* Not yet by our code. */ else return CCID_DRIVER_ERR_NO_KEYPAD; if (pin_mode != 1) return CCID_DRIVER_ERR_NOT_SUPPORTED; if (pin_padlen != 0) return CCID_DRIVER_ERR_NOT_SUPPORTED; if (!pinlen_min) pinlen_min = 1; if (!pinlen_max) pinlen_max = 25; /* Note that the 25 is the maximum value the SPR532 allows. */ if (pinlen_min < 1 || pinlen_min > 25 || pinlen_max < 1 || pinlen_max > 25 || pinlen_min > pinlen_max) return CCID_DRIVER_ERR_INV_VALUE; /* We have only tested a few readers so better don't risk anything and do not allow the use with other readers. */ switch (handle->id_vendor) { case VENDOR_SCM: /* Tested with SPR 532. */ case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */ + case VENDOR_FSIJ: /* Tested with the gnuk code (2011-01-05). */ break; case VENDOR_CHERRY: /* The CHERRY XX44 keyboard echos an asterisk for each entered character on the keyboard channel. We use a special variant of PC_to_RDR_Secure which directs these characters to the smart card's bulk-in channel. We also need to append a zero Lc byte to the APDU. It seems that it will be replaced with the actual length instead of being appended before the APDU is send to the card. */ cherry_mode = 1; break; default: return CCID_DRIVER_ERR_NOT_SUPPORTED; } if (testmode) return 0; /* Success */ msg = send_buffer; if (handle->id_vendor == VENDOR_SCM) { DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n"); rc = send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3, NULL, 0, NULL); if (rc) return rc; } msg[0] = cherry_mode? 0x89 : PC_to_RDR_Secure; msg[5] = 0; /* slot */ msg[6] = seqno = handle->seqno++; msg[7] = 0; /* bBWI */ msg[8] = 0; /* RFU */ msg[9] = 0; /* RFU */ msg[10] = 0; /* Perform PIN verification. */ msg[11] = 0; /* Timeout in seconds. */ msg[12] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */ if (handle->id_vendor == VENDOR_SCM) { /* For the SPR532 the next 2 bytes need to be zero. We do this for all SCM products. Kudos to Martin Paljak for this hint. */ msg[13] = msg[14] = 0; } else { msg[13] = 0x00; /* bmPINBlockString: 0 bits of pin length to insert. 0 bytes of PIN block size. */ msg[14] = 0x00; /* bmPINLengthFormat: Units are bytes, position is 0. */ } /* The following is a little endian word. */ msg[15] = pinlen_max; /* wPINMaxExtraDigit-Maximum. */ msg[16] = pinlen_min; /* wPINMaxExtraDigit-Minimum. */ msg[17] = 0x02; /* bEntryValidationCondition: Validation key pressed */ if (pinlen_min && pinlen_max && pinlen_min == pinlen_max) msg[17] |= 0x01; /* Max size reached. */ msg[18] = 0xff; /* bNumberMessage: Default. */ msg[19] = 0x04; /* wLangId-High. */ msg[20] = 0x09; /* wLangId-Low: English FIXME: use the first entry. */ msg[21] = 0; /* bMsgIndex. */ /* bTeoProlog follows: */ msg[22] = handle->nonnull_nad? ((1 << 4) | 0): 0; msg[23] = ((handle->t1_ns & 1) << 6); /* I-block */ msg[24] = 0; /* The apdulen will be filled in by the reader. */ /* APDU follows: */ msg[25] = apdu_buf[0]; /* CLA */ msg[26] = apdu_buf[1]; /* INS */ msg[27] = apdu_buf[2]; /* P1 */ msg[28] = apdu_buf[3]; /* P2 */ msglen = 29; if (cherry_mode) msg[msglen++] = 0; /* An EDC is not required. */ set_msg_len (msg, msglen - 10); rc = bulk_out (handle, msg, msglen, 0); if (rc) return rc; msg = recv_buffer; rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, RDR_to_PC_DataBlock, seqno, 30000, 0); if (rc) return rc; tpdu = msg + 10; tpdulen = msglen - 10; if (handle->apdu_level) { if (resp) { if (tpdulen > maxresplen) { DEBUGOUT_2 ("provided buffer too short for received data " "(%u/%u)\n", (unsigned int)tpdulen, (unsigned int)maxresplen); return CCID_DRIVER_ERR_INV_VALUE; } memcpy (resp, tpdu, tpdulen); *nresp = tpdulen; } return 0; } if (tpdulen < 4) { usb_clear_halt (handle->idev, handle->ep_bulk_in); return CCID_DRIVER_ERR_ABORTED; } if (debug_level > 1) DEBUGOUT_4 ("T=1: got %c-block seq=%d err=%d%s\n", ((msg[11] & 0xc0) == 0x80)? 'R' : (msg[11] & 0x80)? 'S' : 'I', ((msg[11] & 0x80)? !!(msg[11]& 0x10) : !!(msg[11] & 0x40)), ((msg[11] & 0xc0) == 0x80)? (msg[11] & 0x0f) : 0, (!(msg[11] & 0x80) && (msg[11] & 0x20)? " [more]":"")); if (!(tpdu[1] & 0x80)) { /* This is an I-block. */ /* Last block sent was successful. */ handle->t1_ns ^= 1; if (!!(tpdu[1] & 0x40) != handle->t1_nr) { /* Reponse does not match our sequence number. */ DEBUGOUT ("I-block with wrong seqno received\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } handle->t1_nr ^= 1; p = tpdu + 3; /* Skip the prologue field. */ n = tpdulen - 3 - 1; /* Strip the epilogue field. */ /* fixme: verify the checksum. */ if (resp) { if (n > maxresplen) { DEBUGOUT_2 ("provided buffer too short for received data " "(%u/%u)\n", (unsigned int)n, (unsigned int)maxresplen); return CCID_DRIVER_ERR_INV_VALUE; } memcpy (resp, p, n); resp += n; *nresp += n; maxresplen -= n; } if (!(tpdu[1] & 0x20)) return 0; /* No chaining requested - ready. */ DEBUGOUT ("chaining requested but not supported for Secure operation\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } else if ((tpdu[1] & 0xc0) == 0x80) { /* This is a R-block. */ if ( (tpdu[1] & 0x0f)) { /* Error: repeat last block */ DEBUGOUT ("No retries supported for Secure operation\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } else if (!!(tpdu[1] & 0x10) == handle->t1_ns) { /* Reponse does not match our sequence number. */ DEBUGOUT ("R-block with wrong seqno received on more bit\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } else { /* Send next chunk. */ DEBUGOUT ("chaining not supported on Secure operation\n"); return CCID_DRIVER_ERR_CARD_IO_ERROR; } } else { /* This is a S-block. */ DEBUGOUT_2 ("T=1: S-block %s received cmd=%d for Secure operation\n", (tpdu[1] & 0x20)? "response": "request", (tpdu[1] & 0x1f)); return CCID_DRIVER_ERR_CARD_IO_ERROR; } return 0; } #ifdef TEST static void print_error (int err) { const char *p; char buf[50]; switch (err) { case 0: p = "success"; case CCID_DRIVER_ERR_OUT_OF_CORE: p = "out of core"; break; case CCID_DRIVER_ERR_INV_VALUE: p = "invalid value"; break; case CCID_DRIVER_ERR_NO_DRIVER: p = "no driver"; break; case CCID_DRIVER_ERR_NOT_SUPPORTED: p = "not supported"; break; case CCID_DRIVER_ERR_LOCKING_FAILED: p = "locking failed"; break; case CCID_DRIVER_ERR_BUSY: p = "busy"; break; case CCID_DRIVER_ERR_NO_CARD: p = "no card"; break; case CCID_DRIVER_ERR_CARD_INACTIVE: p = "card inactive"; break; case CCID_DRIVER_ERR_CARD_IO_ERROR: p = "card I/O error"; break; case CCID_DRIVER_ERR_GENERAL_ERROR: p = "general error"; break; case CCID_DRIVER_ERR_NO_READER: p = "no reader"; break; case CCID_DRIVER_ERR_ABORTED: p = "aborted"; break; default: sprintf (buf, "0x%05x", err); p = buf; break; } fprintf (stderr, "operation failed: %s\n", p); } static void print_data (const unsigned char *data, size_t length) { if (length >= 2) { fprintf (stderr, "operation status: %02X%02X\n", data[length-2], data[length-1]); length -= 2; } if (length) { fputs (" returned data:", stderr); for (; length; length--, data++) fprintf (stderr, " %02X", *data); putc ('\n', stderr); } } static void print_result (int rc, const unsigned char *data, size_t length) { if (rc) print_error (rc); else if (data) print_data (data, length); } int main (int argc, char **argv) { int rc; ccid_driver_t ccid; int slotstat; unsigned char result[512]; size_t resultlen; int no_pinpad = 0; int verify_123456 = 0; int did_verify = 0; int no_poll = 0; if (argc) { argc--; argv++; } while (argc) { if ( !strcmp (*argv, "--list")) { char *p; p = ccid_get_reader_list (); if (!p) return 1; fputs (p, stderr); free (p); return 0; } else if ( !strcmp (*argv, "--debug")) { ccid_set_debug_level (ccid_set_debug_level (-1)+1); argc--; argv++; } else if ( !strcmp (*argv, "--no-poll")) { no_poll = 1; argc--; argv++; } else if ( !strcmp (*argv, "--no-pinpad")) { no_pinpad = 1; argc--; argv++; } else if ( !strcmp (*argv, "--verify-123456")) { verify_123456 = 1; argc--; argv++; } else break; } rc = ccid_open_reader (&ccid, argc? *argv:NULL); if (rc) return 1; if (!no_poll) ccid_poll (ccid); fputs ("getting ATR ...\n", stderr); rc = ccid_get_atr (ccid, NULL, 0, NULL); if (rc) { print_error (rc); return 1; } if (!no_poll) ccid_poll (ccid); fputs ("getting slot status ...\n", stderr); rc = ccid_slot_status (ccid, &slotstat); if (rc) { print_error (rc); return 1; } if (!no_poll) ccid_poll (ccid); fputs ("selecting application OpenPGP ....\n", stderr); { static unsigned char apdu[] = { 0, 0xA4, 4, 0, 6, 0xD2, 0x76, 0x00, 0x01, 0x24, 0x01}; rc = ccid_transceive (ccid, apdu, sizeof apdu, result, sizeof result, &resultlen); print_result (rc, result, resultlen); } if (!no_poll) ccid_poll (ccid); fputs ("getting OpenPGP DO 0x65 ....\n", stderr); { static unsigned char apdu[] = { 0, 0xCA, 0, 0x65, 254 }; rc = ccid_transceive (ccid, apdu, sizeof apdu, result, sizeof result, &resultlen); print_result (rc, result, resultlen); } if (!no_pinpad) { } if (!no_pinpad) { static unsigned char apdu[] = { 0, 0x20, 0, 0x81 }; if (ccid_transceive_secure (ccid, apdu, sizeof apdu, 1, 0, 0, 0, NULL, 0, NULL)) fputs ("can't verify using a PIN-Pad reader\n", stderr); else { fputs ("verifying CHV1 using the PINPad ....\n", stderr); rc = ccid_transceive_secure (ccid, apdu, sizeof apdu, 1, 0, 0, 0, result, sizeof result, &resultlen); print_result (rc, result, resultlen); did_verify = 1; } } if (verify_123456 && !did_verify) { fputs ("verifying that CHV1 is 123456....\n", stderr); { static unsigned char apdu[] = {0, 0x20, 0, 0x81, 6, '1','2','3','4','5','6'}; rc = ccid_transceive (ccid, apdu, sizeof apdu, result, sizeof result, &resultlen); print_result (rc, result, resultlen); } } if (!rc) { fputs ("getting OpenPGP DO 0x5E ....\n", stderr); { static unsigned char apdu[] = { 0, 0xCA, 0, 0x5E, 254 }; rc = ccid_transceive (ccid, apdu, sizeof apdu, result, sizeof result, &resultlen); print_result (rc, result, resultlen); } } ccid_close_reader (ccid); return 0; } /* * Local Variables: * compile-command: "gcc -DTEST -Wall -I/usr/local/include -lusb -g ccid-driver.c" * End: */ #endif /*TEST*/ #endif /*HAVE_LIBUSB*/