scd: Support multiple readers by CCID driver.
* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
(apdu_close_reader): ... by this function now.
(apdu_prepare_exit): Likewise.
(open_ccid_reader): Open with dev_list.
(apdu_dev_list_start, apdu_dev_list_finish): New.
(apdu_open_one_reader): New.
(apdu_open_reader): Support multiple readers.
* scd/app.c (select_application): With SCAN, opening all readers
available, and register as new APP.
(app_write_learn_status): app->ref_count == 0 is valid for APP which is
not yet used.
(app_list_start, app_list_finish): New.
* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
Add BAI.
(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
(ccid_dev_scan, ccid_dev_scan_finish): New.
(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
(ccid_open_reader): Support multiple readers.
(ccid_set_progress_cb, ccid_close_reader): No RID any more.
--
With this change, multiple readers/tokens are supported by the internal
CCID driver of GnuPG. Until the changes of upper layers (scdaemon,
gpg-agent, and gpg front end), only a single reader is used, though.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-06 09:14:13 +09:00
|
|
|
/* ccid-driver.h - USB ChipCardInterfaceDevices driver
|
|
|
|
* Copyright (C) 2003 Free Software Foundation, Inc.
|
2003-09-02 19:06:34 +00:00
|
|
|
*
|
|
|
|
* 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
|
2007-07-04 19:49:40 +00:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-09-02 19:06:34 +00:00
|
|
|
* (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
|
2016-11-05 12:02:19 +01:00
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2003-09-05 07:40:41 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
2012-06-05 19:29:22 +02:00
|
|
|
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
2003-09-05 07:40:41 +00:00
|
|
|
* 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.
|
2004-10-14 09:12:36 +00:00
|
|
|
*
|
|
|
|
* $Id$
|
2003-09-02 19:06:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef CCID_DRIVER_H
|
|
|
|
#define CCID_DRIVER_H
|
|
|
|
|
2013-08-30 09:28:17 +02:00
|
|
|
|
|
|
|
#ifdef CCID_DRIVER_INCLUDE_USB_IDS
|
|
|
|
/* We need to know the vendor to do some hacks. */
|
|
|
|
enum {
|
|
|
|
VENDOR_CHERRY = 0x046a,
|
|
|
|
VENDOR_SCM = 0x04e6,
|
|
|
|
VENDOR_OMNIKEY= 0x076b,
|
|
|
|
VENDOR_GEMPC = 0x08e6,
|
|
|
|
VENDOR_VEGA = 0x0982,
|
2013-04-24 08:36:31 +09:00
|
|
|
VENDOR_REINER = 0x0c4b,
|
2013-08-30 09:28:17 +02:00
|
|
|
VENDOR_KAAN = 0x0d46,
|
|
|
|
VENDOR_FSIJ = 0x234b,
|
|
|
|
VENDOR_VASCO = 0x1a44
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Some product ids. */
|
|
|
|
#define SCM_SCR331 0xe001
|
|
|
|
#define SCM_SCR331DI 0x5111
|
|
|
|
#define SCM_SCR335 0x5115
|
|
|
|
#define SCM_SCR3320 0x5117
|
|
|
|
#define SCM_SPR532 0xe003 /* Also used succeeding model SPR332. */
|
|
|
|
#define CHERRY_ST2000 0x003e
|
|
|
|
#define VASCO_920 0x0920
|
|
|
|
#define GEMPC_PINPAD 0x3478
|
2014-06-25 20:25:28 +02:00
|
|
|
#define GEMPC_CT30 0x3437
|
2013-08-30 09:28:17 +02:00
|
|
|
#define VEGA_ALPHA 0x0008
|
2013-04-24 08:36:31 +09:00
|
|
|
#define CYBERJACK_GO 0x0504
|
2013-08-30 09:28:17 +02:00
|
|
|
|
|
|
|
#endif /*CCID_DRIVER_INCLUDE_USB_IDS*/
|
|
|
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
/* The CID driver returns the same error codes as the status words
|
2004-07-16 15:45:25 +00:00
|
|
|
used by GnuPG's apdu.h. For ease of maintenance they should always
|
|
|
|
match. */
|
2011-02-04 12:57:53 +01:00
|
|
|
#define CCID_DRIVER_ERR_OUT_OF_CORE 0x10001
|
2004-07-16 15:45:25 +00:00
|
|
|
#define CCID_DRIVER_ERR_INV_VALUE 0x10002
|
|
|
|
#define CCID_DRIVER_ERR_INCOMPLETE_CARD_RESPONSE = 0x10003
|
|
|
|
#define CCID_DRIVER_ERR_NO_DRIVER 0x10004
|
|
|
|
#define CCID_DRIVER_ERR_NOT_SUPPORTED 0x10005
|
|
|
|
#define CCID_DRIVER_ERR_LOCKING_FAILED 0x10006
|
|
|
|
#define CCID_DRIVER_ERR_BUSY 0x10007
|
|
|
|
#define CCID_DRIVER_ERR_NO_CARD 0x10008
|
|
|
|
#define CCID_DRIVER_ERR_CARD_INACTIVE 0x10009
|
|
|
|
#define CCID_DRIVER_ERR_CARD_IO_ERROR 0x1000a
|
|
|
|
#define CCID_DRIVER_ERR_GENERAL_ERROR 0x1000b
|
|
|
|
#define CCID_DRIVER_ERR_NO_READER 0x1000c
|
2004-08-05 09:24:36 +00:00
|
|
|
#define CCID_DRIVER_ERR_ABORTED 0x1000d
|
scd: Rename 'keypad' to 'pinpad'.
* NEWS: Mention scd changes.
* agent/divert-scd.c (getpin_cb): Change message.
* agent/call-scd.c (inq_needpin): Change the protocol to
POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
* scd/command.c (pin_cb): Likewise.
* scd/apdu.c (struct reader_table_s): Rename member functions.
(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
* scd/iso7816.h (iso7816_check_pinpad): Rename.
* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
(iso7816_check_pinpad): Rename.
(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
the change.
* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
* scd/ccid-driver.c (ccid_transceive_secure): Use it.
* scd/app-dinsig.c (verify_pin): Follow the change.
* scd/app-nks.c (verify_pin): Follow the change.
* scd/app-openpgp.c (check_pinpad_request): Rename.
(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
the change.
* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
* scd/scdaemon.h (opt): Rename to disable_pinpad,
enable_pinpad_varlen.
* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
disable-pinpad.
2013-02-07 10:07:51 +09:00
|
|
|
#define CCID_DRIVER_ERR_NO_PINPAD 0x1000e
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
|
|
struct ccid_driver_s;
|
|
|
|
typedef struct ccid_driver_s *ccid_driver_t;
|
|
|
|
|
scd: Support multiple readers by CCID driver.
* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
(apdu_close_reader): ... by this function now.
(apdu_prepare_exit): Likewise.
(open_ccid_reader): Open with dev_list.
(apdu_dev_list_start, apdu_dev_list_finish): New.
(apdu_open_one_reader): New.
(apdu_open_reader): Support multiple readers.
* scd/app.c (select_application): With SCAN, opening all readers
available, and register as new APP.
(app_write_learn_status): app->ref_count == 0 is valid for APP which is
not yet used.
(app_list_start, app_list_finish): New.
* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
Add BAI.
(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
(ccid_dev_scan, ccid_dev_scan_finish): New.
(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
(ccid_open_reader): Support multiple readers.
(ccid_set_progress_cb, ccid_close_reader): No RID any more.
--
With this change, multiple readers/tokens are supported by the internal
CCID driver of GnuPG. Until the changes of upper layers (scdaemon,
gpg-agent, and gpg front end), only a single reader is used, though.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-06 09:14:13 +09:00
|
|
|
struct ccid_dev_table;
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
int ccid_set_debug_level (int level);
|
|
|
|
char *ccid_get_reader_list (void);
|
scd: Support multiple readers by CCID driver.
* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
(apdu_close_reader): ... by this function now.
(apdu_prepare_exit): Likewise.
(open_ccid_reader): Open with dev_list.
(apdu_dev_list_start, apdu_dev_list_finish): New.
(apdu_open_one_reader): New.
(apdu_open_reader): Support multiple readers.
* scd/app.c (select_application): With SCAN, opening all readers
available, and register as new APP.
(app_write_learn_status): app->ref_count == 0 is valid for APP which is
not yet used.
(app_list_start, app_list_finish): New.
* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
Add BAI.
(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
(ccid_dev_scan, ccid_dev_scan_finish): New.
(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
(ccid_open_reader): Support multiple readers.
(ccid_set_progress_cb, ccid_close_reader): No RID any more.
--
With this change, multiple readers/tokens are supported by the internal
CCID driver of GnuPG. Until the changes of upper layers (scdaemon,
gpg-agent, and gpg front end), only a single reader is used, though.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-06 09:14:13 +09:00
|
|
|
|
|
|
|
gpg_error_t ccid_dev_scan (int *idx_max, struct ccid_dev_table **t_p);
|
|
|
|
void ccid_dev_scan_finish (struct ccid_dev_table *tbl, int max);
|
|
|
|
unsigned int ccid_get_BAI (int, struct ccid_dev_table *tbl);
|
|
|
|
int ccid_compare_BAI (ccid_driver_t handle, unsigned int);
|
|
|
|
int ccid_open_reader (const char *spec_reader_name,
|
|
|
|
int idx, struct ccid_dev_table *ccid_table,
|
|
|
|
ccid_driver_t *handle, char **rdrname_p);
|
2011-02-04 12:57:53 +01:00
|
|
|
int ccid_set_progress_cb (ccid_driver_t handle,
|
2009-07-13 09:59:50 +00:00
|
|
|
void (*cb)(void *, const char *, int, int, int),
|
|
|
|
void *cb_arg);
|
2004-09-30 14:34:34 +00:00
|
|
|
int ccid_shutdown_reader (ccid_driver_t handle);
|
2003-10-21 17:12:50 +00:00
|
|
|
int ccid_close_reader (ccid_driver_t handle);
|
2003-09-02 19:06:34 +00:00
|
|
|
int ccid_get_atr (ccid_driver_t handle,
|
|
|
|
unsigned char *atr, size_t maxatrlen, size_t *atrlen);
|
2004-04-20 14:17:10 +00:00
|
|
|
int ccid_slot_status (ccid_driver_t handle, int *statusbits);
|
2003-09-02 19:06:34 +00:00
|
|
|
int ccid_transceive (ccid_driver_t handle,
|
|
|
|
const unsigned char *apdu, size_t apdulen,
|
|
|
|
unsigned char *resp, size_t maxresplen, size_t *nresp);
|
2004-10-06 13:13:51 +00:00
|
|
|
int ccid_transceive_secure (ccid_driver_t handle,
|
|
|
|
const unsigned char *apdu, size_t apdulen,
|
scd: Support multiple readers by CCID driver.
* scd/apdu.c (new_reader_slot): Lock is now in apdu_dev_list_start.
(close_pcsc_reader_direct, close_ccid_reader): RDRNAME is handled...
(apdu_close_reader): ... by this function now.
(apdu_prepare_exit): Likewise.
(open_ccid_reader): Open with dev_list.
(apdu_dev_list_start, apdu_dev_list_finish): New.
(apdu_open_one_reader): New.
(apdu_open_reader): Support multiple readers.
* scd/app.c (select_application): With SCAN, opening all readers
available, and register as new APP.
(app_write_learn_status): app->ref_count == 0 is valid for APP which is
not yet used.
(app_list_start, app_list_finish): New.
* scd/ccid-driver.c (struct ccid_driver_s): Remove RID and BCD_DEVICE.
Add BAI.
(parse_ccid_descriptor): BCD_DEVICE is now on the arguments.
(ccid_dev_scan, ccid_dev_scan_finish): New.
(ccid_get_BAI, ccid_compare_BAI, ccid_open_usb_reader): New.
(ccid_open_reader): Support multiple readers.
(ccid_set_progress_cb, ccid_close_reader): No RID any more.
--
With this change, multiple readers/tokens are supported by the internal
CCID driver of GnuPG. Until the changes of upper layers (scdaemon,
gpg-agent, and gpg front end), only a single reader is used, though.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2017-01-06 09:14:13 +09:00
|
|
|
pininfo_t *pininfo,
|
2004-10-06 13:13:51 +00:00
|
|
|
unsigned char *resp, size_t maxresplen, size_t *nresp);
|
2005-11-28 11:52:25 +00:00
|
|
|
int ccid_transceive_escape (ccid_driver_t handle,
|
|
|
|
const unsigned char *data, size_t datalen,
|
|
|
|
unsigned char *resp, size_t maxresplen,
|
|
|
|
size_t *nresp);
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif /*CCID_DRIVER_H*/
|