2003-08-05 17:11:04 +00:00
|
|
|
|
/* apdu.c - ISO 7816 APDU functions and low level I/O
|
2011-02-23 10:15:34 +01:00
|
|
|
|
* Copyright (C) 2003, 2004, 2008, 2009, 2010,
|
|
|
|
|
* 2011 Free Software Foundation, Inc.
|
2003-08-05 17:11:04 +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-08-05 17:11:04 +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
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2005-05-18 10:48:06 +00:00
|
|
|
|
/* NOTE: This module is also used by other software, thus the use of
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
the macro USE_NPTH is mandatory. For GnuPG this macro is
|
2005-05-18 10:48:06 +00:00
|
|
|
|
guaranteed to be defined true. */
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <assert.h>
|
2004-07-27 11:35:52 +00:00
|
|
|
|
#include <signal.h>
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2004-04-20 14:17:10 +00:00
|
|
|
|
# include <unistd.h>
|
|
|
|
|
# include <fcntl.h>
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
# include <npth.h>
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#endif
|
2005-04-27 12:09:21 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* If requested include the definitions for the remote APDU protocol
|
|
|
|
|
code. */
|
|
|
|
|
#ifdef USE_G10CODE_RAPDU
|
|
|
|
|
#include "rapdu.h"
|
|
|
|
|
#endif /*USE_G10CODE_RAPDU*/
|
|
|
|
|
|
2004-03-16 10:49:37 +00:00
|
|
|
|
#if defined(GNUPG_SCD_MAIN_HEADER)
|
|
|
|
|
#include GNUPG_SCD_MAIN_HEADER
|
|
|
|
|
#elif GNUPG_MAJOR_VERSION == 1
|
2003-10-02 10:27:34 +00:00
|
|
|
|
/* This is used with GnuPG version < 1.9. The code has been source
|
|
|
|
|
copied from the current GnuPG >= 1.9 and is maintained over
|
|
|
|
|
there. */
|
|
|
|
|
#include "options.h"
|
|
|
|
|
#include "errors.h"
|
|
|
|
|
#include "memory.h"
|
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "i18n.h"
|
2009-07-21 14:21:05 +00:00
|
|
|
|
#include "dynload.h"
|
2003-10-02 10:27:34 +00:00
|
|
|
|
#include "cardglue.h"
|
|
|
|
|
#else /* GNUPG_MAJOR_VERSION != 1 */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include "scdaemon.h"
|
2009-03-19 07:09:31 +00:00
|
|
|
|
#include "exechelp.h"
|
2003-10-02 10:27:34 +00:00
|
|
|
|
#endif /* GNUPG_MAJOR_VERSION != 1 */
|
2015-02-11 10:27:57 +01:00
|
|
|
|
#include "host2net.h"
|
2003-10-02 10:27:34 +00:00
|
|
|
|
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
#include "iso7816.h"
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#include "apdu.h"
|
2013-08-30 09:28:17 +02:00
|
|
|
|
#define CCID_DRIVER_INCLUDE_USB_IDS 1
|
2003-09-02 19:06:34 +00:00
|
|
|
|
#include "ccid-driver.h"
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
/* Due to conflicting use of threading libraries we usually can't link
|
2014-07-22 16:16:33 +02:00
|
|
|
|
against libpcsclite if we are using Pth. Instead we use a wrapper
|
|
|
|
|
program. Note that with nPth there is no need for a wrapper. */
|
|
|
|
|
#ifdef USE_PTH /* Right, plain old Pth. */
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if !defined(HAVE_W32_SYSTEM) && !defined(__CYGWIN__)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#define NEED_PCSC_WRAPPER 1
|
|
|
|
|
#endif
|
2004-12-15 14:15:54 +00:00
|
|
|
|
#endif
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
#define MAX_READER 4 /* Number of readers we support concurrently. */
|
|
|
|
|
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2003-10-21 17:12:50 +00:00
|
|
|
|
#define DLSTDCALL __stdcall
|
|
|
|
|
#else
|
|
|
|
|
#define DLSTDCALL
|
|
|
|
|
#endif
|
|
|
|
|
|
2013-03-22 10:41:59 +09:00
|
|
|
|
#if defined(__APPLE__) || defined(_WIN32) || defined(__CYGWIN__)
|
2013-08-01 11:01:01 +02:00
|
|
|
|
typedef unsigned int pcsc_dword_t;
|
2013-03-22 10:41:59 +09:00
|
|
|
|
#else
|
|
|
|
|
typedef unsigned long pcsc_dword_t;
|
|
|
|
|
#endif
|
|
|
|
|
|
2003-08-18 17:34:28 +00:00
|
|
|
|
/* A structure to collect information pertaining to one reader
|
|
|
|
|
slot. */
|
|
|
|
|
struct reader_table_s {
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int used; /* True if slot is used. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
unsigned short port; /* Port number: 0 = unused, 1 - dev/tty */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
/* Function pointers intialized to the various backends. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int (*connect_card)(int);
|
|
|
|
|
int (*disconnect_card)(int);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int (*close_reader)(int);
|
2004-09-30 14:34:34 +00:00
|
|
|
|
int (*shutdown_reader)(int);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int (*reset_reader)(int);
|
|
|
|
|
int (*get_status_reader)(int, unsigned int *);
|
|
|
|
|
int (*send_apdu_reader)(int,unsigned char *,size_t,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
unsigned char *, size_t *, pininfo_t *);
|
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
|
|
|
|
int (*check_pinpad)(int, int, pininfo_t *);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
void (*dump_status_reader)(int);
|
2009-07-13 09:59:22 +00:00
|
|
|
|
int (*set_progress_cb)(int, gcry_handler_progress_t, void*);
|
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
|
|
|
|
int (*pinpad_verify)(int, int, int, int, int, pininfo_t *);
|
|
|
|
|
int (*pinpad_modify)(int, int, int, int, int, pininfo_t *);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
struct {
|
|
|
|
|
ccid_driver_t handle;
|
|
|
|
|
} ccid;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
struct {
|
2013-03-22 10:41:59 +09:00
|
|
|
|
long context;
|
|
|
|
|
long card;
|
|
|
|
|
pcsc_dword_t protocol;
|
|
|
|
|
pcsc_dword_t verify_ioctl;
|
|
|
|
|
pcsc_dword_t modify_ioctl;
|
2013-08-30 11:06:50 +09:00
|
|
|
|
int pinmin;
|
|
|
|
|
int pinmax;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
int req_fd;
|
|
|
|
|
int rsp_fd;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
2003-08-05 17:11:04 +00:00
|
|
|
|
} pcsc;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
#ifdef USE_G10CODE_RAPDU
|
|
|
|
|
struct {
|
|
|
|
|
rapdu_t handle;
|
|
|
|
|
} rapdu;
|
|
|
|
|
#endif /*USE_G10CODE_RAPDU*/
|
2004-10-20 08:54:45 +00:00
|
|
|
|
char *rdrname; /* Name of the connected reader or NULL if unknown. */
|
2008-12-18 16:34:28 +00:00
|
|
|
|
int any_status; /* True if we have seen any status. */
|
2004-10-20 08:54:45 +00:00
|
|
|
|
int last_status;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int status;
|
2005-09-05 14:36:36 +00:00
|
|
|
|
int is_t0; /* True if we know that we are running T=0. */
|
2013-08-21 16:45:48 +02:00
|
|
|
|
int is_spr532; /* True if we know that the reader is a SPR532. */
|
2013-08-30 11:06:50 +09:00
|
|
|
|
int pinpad_varlen_supported; /* True if we know that the reader
|
|
|
|
|
supports variable length pinpad
|
|
|
|
|
input. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
unsigned char atr[33];
|
2004-07-16 15:45:25 +00:00
|
|
|
|
size_t atrlen; /* A zero length indicates that the ATR has
|
|
|
|
|
not yet been read; i.e. the card is not
|
|
|
|
|
ready for use. */
|
2004-04-20 14:17:10 +00:00
|
|
|
|
unsigned int change_counter;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2004-04-20 14:17:10 +00:00
|
|
|
|
int lock_initialized;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_mutex_t lock;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#endif
|
2003-08-18 17:34:28 +00:00
|
|
|
|
};
|
|
|
|
|
typedef struct reader_table_s *reader_table_t;
|
|
|
|
|
|
|
|
|
|
/* A global table to keep track of active readers. */
|
|
|
|
|
static struct reader_table_s reader_table[MAX_READER];
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ct API function pointer. */
|
2003-10-21 17:12:50 +00:00
|
|
|
|
static char (* DLSTDCALL CT_init) (unsigned short ctn, unsigned short Pn);
|
|
|
|
|
static char (* DLSTDCALL CT_data) (unsigned short ctn, unsigned char *dad,
|
|
|
|
|
unsigned char *sad, unsigned short lc,
|
|
|
|
|
unsigned char *cmd, unsigned short *lr,
|
|
|
|
|
unsigned char *rsp);
|
|
|
|
|
static char (* DLSTDCALL CT_close) (unsigned short ctn);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* PC/SC constants and function pointer. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#define PCSC_SCOPE_USER 0
|
|
|
|
|
#define PCSC_SCOPE_TERMINAL 1
|
|
|
|
|
#define PCSC_SCOPE_SYSTEM 2
|
|
|
|
|
#define PCSC_SCOPE_GLOBAL 3
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#define PCSC_PROTOCOL_T0 1
|
|
|
|
|
#define PCSC_PROTOCOL_T1 2
|
2010-11-17 13:21:24 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
# define PCSC_PROTOCOL_RAW 0x00010000 /* The active protocol. */
|
|
|
|
|
#else
|
|
|
|
|
# define PCSC_PROTOCOL_RAW 4
|
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
#define PCSC_SHARE_EXCLUSIVE 1
|
|
|
|
|
#define PCSC_SHARE_SHARED 2
|
|
|
|
|
#define PCSC_SHARE_DIRECT 3
|
|
|
|
|
|
|
|
|
|
#define PCSC_LEAVE_CARD 0
|
|
|
|
|
#define PCSC_RESET_CARD 1
|
|
|
|
|
#define PCSC_UNPOWER_CARD 2
|
|
|
|
|
#define PCSC_EJECT_CARD 3
|
|
|
|
|
|
2010-11-17 13:21:24 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
# define PCSC_UNKNOWN 0x0000 /* The driver is not aware of the status. */
|
|
|
|
|
# define PCSC_ABSENT 0x0001 /* Card is absent. */
|
|
|
|
|
# define PCSC_PRESENT 0x0002 /* Card is present. */
|
|
|
|
|
# define PCSC_SWALLOWED 0x0003 /* Card is present and electrical connected. */
|
|
|
|
|
# define PCSC_POWERED 0x0004 /* Card is powered. */
|
|
|
|
|
# define PCSC_NEGOTIABLE 0x0005 /* Card is awaiting PTS. */
|
|
|
|
|
# define PCSC_SPECIFIC 0x0006 /* Card is ready for use. */
|
|
|
|
|
#else
|
|
|
|
|
# define PCSC_UNKNOWN 0x0001
|
|
|
|
|
# define PCSC_ABSENT 0x0002 /* Card is absent. */
|
|
|
|
|
# define PCSC_PRESENT 0x0004 /* Card is present. */
|
|
|
|
|
# define PCSC_SWALLOWED 0x0008 /* Card is present and electrical connected. */
|
|
|
|
|
# define PCSC_POWERED 0x0010 /* Card is powered. */
|
|
|
|
|
# define PCSC_NEGOTIABLE 0x0020 /* Card is awaiting PTS. */
|
|
|
|
|
# define PCSC_SPECIFIC 0x0040 /* Card is ready for use. */
|
|
|
|
|
#endif
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
|
|
|
|
#define PCSC_STATE_UNAWARE 0x0000 /* Want status. */
|
|
|
|
|
#define PCSC_STATE_IGNORE 0x0001 /* Ignore this reader. */
|
|
|
|
|
#define PCSC_STATE_CHANGED 0x0002 /* State has changed. */
|
|
|
|
|
#define PCSC_STATE_UNKNOWN 0x0004 /* Reader unknown. */
|
|
|
|
|
#define PCSC_STATE_UNAVAILABLE 0x0008 /* Status unavailable. */
|
|
|
|
|
#define PCSC_STATE_EMPTY 0x0010 /* Card removed. */
|
|
|
|
|
#define PCSC_STATE_PRESENT 0x0020 /* Card inserted. */
|
|
|
|
|
#define PCSC_STATE_ATRMATCH 0x0040 /* ATR matches card. */
|
|
|
|
|
#define PCSC_STATE_EXCLUSIVE 0x0080 /* Exclusive Mode. */
|
|
|
|
|
#define PCSC_STATE_INUSE 0x0100 /* Shared mode. */
|
|
|
|
|
#define PCSC_STATE_MUTE 0x0200 /* Unresponsive card. */
|
2010-11-17 13:21:24 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
# define PCSC_STATE_UNPOWERED 0x0400 /* Card not powerred up. */
|
|
|
|
|
#endif
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/* Some PC/SC error codes. */
|
|
|
|
|
#define PCSC_E_CANCELLED 0x80100002
|
|
|
|
|
#define PCSC_E_CANT_DISPOSE 0x8010000E
|
|
|
|
|
#define PCSC_E_INSUFFICIENT_BUFFER 0x80100008
|
|
|
|
|
#define PCSC_E_INVALID_ATR 0x80100015
|
|
|
|
|
#define PCSC_E_INVALID_HANDLE 0x80100003
|
|
|
|
|
#define PCSC_E_INVALID_PARAMETER 0x80100004
|
|
|
|
|
#define PCSC_E_INVALID_TARGET 0x80100005
|
|
|
|
|
#define PCSC_E_INVALID_VALUE 0x80100011
|
|
|
|
|
#define PCSC_E_NO_MEMORY 0x80100006
|
|
|
|
|
#define PCSC_E_UNKNOWN_READER 0x80100009
|
|
|
|
|
#define PCSC_E_TIMEOUT 0x8010000A
|
|
|
|
|
#define PCSC_E_SHARING_VIOLATION 0x8010000B
|
|
|
|
|
#define PCSC_E_NO_SMARTCARD 0x8010000C
|
|
|
|
|
#define PCSC_E_UNKNOWN_CARD 0x8010000D
|
|
|
|
|
#define PCSC_E_PROTO_MISMATCH 0x8010000F
|
|
|
|
|
#define PCSC_E_NOT_READY 0x80100010
|
|
|
|
|
#define PCSC_E_SYSTEM_CANCELLED 0x80100012
|
|
|
|
|
#define PCSC_E_NOT_TRANSACTED 0x80100016
|
|
|
|
|
#define PCSC_E_READER_UNAVAILABLE 0x80100017
|
2012-10-31 11:05:55 +09:00
|
|
|
|
#define PCSC_E_NO_SERVICE 0x8010001D
|
2015-12-07 00:13:59 +01:00
|
|
|
|
#define PCSC_E_SERVICE_STOPPED 0x8010001E
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#define PCSC_W_REMOVED_CARD 0x80100069
|
|
|
|
|
|
2013-08-21 16:45:48 +02:00
|
|
|
|
/* Fix pcsc-lite ABI incompatibilty. */
|
|
|
|
|
#ifndef SCARD_CTL_CODE
|
2013-10-29 09:07:05 +09:00
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
#include <winioctl.h>
|
|
|
|
|
#define SCARD_CTL_CODE(code) CTL_CODE(FILE_DEVICE_SMARTCARD, (code), \
|
|
|
|
|
METHOD_BUFFERED, FILE_ANY_ACCESS)
|
|
|
|
|
#else
|
|
|
|
|
#define SCARD_CTL_CODE(code) (0x42000000 + (code))
|
|
|
|
|
#endif
|
2013-08-21 16:45:48 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400)
|
2013-08-30 11:06:50 +09:00
|
|
|
|
#define CM_IOCTL_VENDOR_IFD_EXCHANGE SCARD_CTL_CODE(1)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
#define FEATURE_VERIFY_PIN_DIRECT 0x06
|
|
|
|
|
#define FEATURE_MODIFY_PIN_DIRECT 0x07
|
2013-08-30 11:06:50 +09:00
|
|
|
|
#define FEATURE_GET_TLV_PROPERTIES 0x12
|
|
|
|
|
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_bEntryValidationCondition 2
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_bTimeOut2 3
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_bMinPINSize 6
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_bMaxPINSize 7
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_wIdVendor 11
|
|
|
|
|
#define PCSCv2_PART10_PROPERTY_wIdProduct 12
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
/* The PC/SC error is defined as a long as per specs. Due to left
|
|
|
|
|
shifts bit 31 will get sign extended. We use this mask to fix
|
|
|
|
|
it. */
|
|
|
|
|
#define PCSC_ERR_MASK(a) ((a) & 0xffffffff)
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
|
|
|
|
struct pcsc_io_request_s
|
2004-10-20 08:54:45 +00:00
|
|
|
|
{
|
2005-02-24 17:36:11 +00:00
|
|
|
|
unsigned long protocol;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
unsigned long pci_len;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct pcsc_io_request_s *pcsc_io_request_t;
|
|
|
|
|
|
2013-03-22 10:41:59 +09:00
|
|
|
|
#ifdef __APPLE__
|
|
|
|
|
#pragma pack(1)
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
struct pcsc_readerstate_s
|
|
|
|
|
{
|
|
|
|
|
const char *reader;
|
|
|
|
|
void *user_data;
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t current_state;
|
|
|
|
|
pcsc_dword_t event_state;
|
|
|
|
|
pcsc_dword_t atrlen;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
unsigned char atr[33];
|
|
|
|
|
};
|
|
|
|
|
|
2013-03-22 10:41:59 +09:00
|
|
|
|
#ifdef __APPLE__
|
|
|
|
|
#pragma pack()
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
typedef struct pcsc_readerstate_s *pcsc_readerstate_t;
|
|
|
|
|
|
2013-03-22 10:41:59 +09:00
|
|
|
|
long (* DLSTDCALL pcsc_establish_context) (pcsc_dword_t scope,
|
2003-10-21 17:12:50 +00:00
|
|
|
|
const void *reserved1,
|
|
|
|
|
const void *reserved2,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
long *r_context);
|
|
|
|
|
long (* DLSTDCALL pcsc_release_context) (long context);
|
|
|
|
|
long (* DLSTDCALL pcsc_list_readers) (long context,
|
2003-10-21 17:12:50 +00:00
|
|
|
|
const char *groups,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
char *readers, pcsc_dword_t*readerslen);
|
|
|
|
|
long (* DLSTDCALL pcsc_get_status_change) (long context,
|
|
|
|
|
pcsc_dword_t timeout,
|
2004-10-20 08:54:45 +00:00
|
|
|
|
pcsc_readerstate_t readerstates,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t nreaderstates);
|
|
|
|
|
long (* DLSTDCALL pcsc_connect) (long context,
|
2003-10-21 17:12:50 +00:00
|
|
|
|
const char *reader,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t share_mode,
|
|
|
|
|
pcsc_dword_t preferred_protocols,
|
|
|
|
|
long *r_card,
|
|
|
|
|
pcsc_dword_t *r_active_protocol);
|
|
|
|
|
long (* DLSTDCALL pcsc_reconnect) (long card,
|
|
|
|
|
pcsc_dword_t share_mode,
|
|
|
|
|
pcsc_dword_t preferred_protocols,
|
|
|
|
|
pcsc_dword_t initialization,
|
|
|
|
|
pcsc_dword_t *r_active_protocol);
|
|
|
|
|
long (* DLSTDCALL pcsc_disconnect) (long card,
|
|
|
|
|
pcsc_dword_t disposition);
|
|
|
|
|
long (* DLSTDCALL pcsc_status) (long card,
|
|
|
|
|
char *reader, pcsc_dword_t *readerlen,
|
|
|
|
|
pcsc_dword_t *r_state,
|
|
|
|
|
pcsc_dword_t *r_protocol,
|
|
|
|
|
unsigned char *atr, pcsc_dword_t *atrlen);
|
|
|
|
|
long (* DLSTDCALL pcsc_begin_transaction) (long card);
|
|
|
|
|
long (* DLSTDCALL pcsc_end_transaction) (long card,
|
|
|
|
|
pcsc_dword_t disposition);
|
|
|
|
|
long (* DLSTDCALL pcsc_transmit) (long card,
|
2003-10-21 17:12:50 +00:00
|
|
|
|
const pcsc_io_request_t send_pci,
|
|
|
|
|
const unsigned char *send_buffer,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t send_len,
|
2003-10-21 17:12:50 +00:00
|
|
|
|
pcsc_io_request_t recv_pci,
|
|
|
|
|
unsigned char *recv_buffer,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t *recv_len);
|
|
|
|
|
long (* DLSTDCALL pcsc_set_timeout) (long context,
|
|
|
|
|
pcsc_dword_t timeout);
|
|
|
|
|
long (* DLSTDCALL pcsc_control) (long card,
|
|
|
|
|
pcsc_dword_t control_code,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
const void *send_buffer,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t send_len,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
void *recv_buffer,
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t recv_len,
|
|
|
|
|
pcsc_dword_t *bytes_returned);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
/* Prototypes. */
|
2013-10-29 09:07:05 +09:00
|
|
|
|
static int pcsc_vendor_specific_init (int slot);
|
2005-09-05 14:36:36 +00:00
|
|
|
|
static int pcsc_get_status (int slot, unsigned int *status);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
static int reset_pcsc_reader (int slot);
|
2009-02-25 10:58:56 +00:00
|
|
|
|
static int apdu_get_status_internal (int slot, int hang, int no_atr_reset,
|
|
|
|
|
unsigned int *status,
|
|
|
|
|
unsigned int *changed);
|
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
|
|
|
|
static int check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo);
|
|
|
|
|
static int pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo);
|
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
|
|
|
|
static int pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo);
|
2005-09-05 14:36:36 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
2003-08-05 17:11:04 +00:00
|
|
|
|
Helper
|
|
|
|
|
*/
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2014-03-07 09:46:44 +01:00
|
|
|
|
static int
|
|
|
|
|
lock_slot (int slot)
|
|
|
|
|
{
|
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
err = npth_mutex_lock (&reader_table[slot].lock);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to acquire apdu lock: %s\n", strerror (err));
|
|
|
|
|
return SW_HOST_LOCKING_FAILED;
|
|
|
|
|
}
|
|
|
|
|
#endif /*USE_NPTH*/
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
trylock_slot (int slot)
|
|
|
|
|
{
|
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
err = npth_mutex_trylock (&reader_table[slot].lock);
|
|
|
|
|
if (err == EBUSY)
|
|
|
|
|
return SW_HOST_BUSY;
|
|
|
|
|
else if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("failed to acquire apdu lock: %s\n", strerror (err));
|
|
|
|
|
return SW_HOST_LOCKING_FAILED;
|
|
|
|
|
}
|
|
|
|
|
#endif /*USE_NPTH*/
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
unlock_slot (int slot)
|
|
|
|
|
{
|
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
err = npth_mutex_unlock (&reader_table[slot].lock);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("failed to release apdu lock: %s\n", strerror (errno));
|
|
|
|
|
#endif /*USE_NPTH*/
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Find an unused reader slot for PORTSTR and put it into the reader
|
2014-03-07 09:46:44 +01:00
|
|
|
|
table. Return -1 on error or the index into the reader table.
|
|
|
|
|
Acquire slot's lock on successful return. Caller needs to unlock it. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
static int
|
|
|
|
|
new_reader_slot (void)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int i, reader = -1;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
int err;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
for (i=0; i < MAX_READER; i++)
|
|
|
|
|
{
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!reader_table[i].used && reader == -1)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
reader = i;
|
|
|
|
|
}
|
|
|
|
|
if (reader == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("new_reader_slot: out of slots\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (!reader_table[reader].lock_initialized)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = npth_mutex_init (&reader_table[reader].lock, NULL);
|
|
|
|
|
if (err)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
log_error ("error initializing mutex: %s\n", strerror (err));
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
reader_table[reader].lock_initialized = 1;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#endif /*USE_NPTH*/
|
2014-03-07 09:46:44 +01:00
|
|
|
|
if (lock_slot (reader))
|
|
|
|
|
{
|
|
|
|
|
log_error ("error locking mutex: %s\n", strerror (errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[reader].connect_card = NULL;
|
|
|
|
|
reader_table[reader].disconnect_card = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[reader].close_reader = NULL;
|
2004-09-30 14:34:34 +00:00
|
|
|
|
reader_table[reader].shutdown_reader = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[reader].reset_reader = NULL;
|
|
|
|
|
reader_table[reader].get_status_reader = NULL;
|
|
|
|
|
reader_table[reader].send_apdu_reader = NULL;
|
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
|
|
|
|
reader_table[reader].check_pinpad = check_pcsc_pinpad;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[reader].dump_status_reader = NULL;
|
2009-07-13 09:59:22 +00:00
|
|
|
|
reader_table[reader].set_progress_cb = NULL;
|
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
|
|
|
|
reader_table[reader].pinpad_verify = pcsc_pinpad_verify;
|
|
|
|
|
reader_table[reader].pinpad_modify = pcsc_pinpad_modify;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
reader_table[reader].used = 1;
|
2008-12-18 16:34:28 +00:00
|
|
|
|
reader_table[reader].any_status = 0;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
reader_table[reader].last_status = 0;
|
2005-09-05 14:36:36 +00:00
|
|
|
|
reader_table[reader].is_t0 = 1;
|
2013-08-21 16:45:48 +02:00
|
|
|
|
reader_table[reader].is_spr532 = 0;
|
2013-08-30 11:06:50 +09:00
|
|
|
|
reader_table[reader].pinpad_varlen_supported = 0;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
reader_table[reader].pcsc.req_fd = -1;
|
|
|
|
|
reader_table[reader].pcsc.rsp_fd = -1;
|
|
|
|
|
reader_table[reader].pcsc.pid = (pid_t)(-1);
|
2003-08-26 09:01:18 +00:00
|
|
|
|
#endif
|
2011-11-28 16:16:38 +09:00
|
|
|
|
reader_table[reader].pcsc.verify_ioctl = 0;
|
|
|
|
|
reader_table[reader].pcsc.modify_ioctl = 0;
|
2013-08-30 11:06:50 +09:00
|
|
|
|
reader_table[reader].pcsc.pinmin = -1;
|
|
|
|
|
reader_table[reader].pcsc.pinmax = -1;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return reader;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-16 15:45:25 +00:00
|
|
|
|
dump_reader_status (int slot)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (!opt.verbose)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (reader_table[slot].dump_status_reader)
|
|
|
|
|
reader_table[slot].dump_status_reader (slot);
|
|
|
|
|
|
|
|
|
|
if (reader_table[slot].status != -1
|
|
|
|
|
&& reader_table[slot].atrlen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_info ("slot %d: ATR=", slot);
|
|
|
|
|
log_printhex ("", reader_table[slot].atr, reader_table[slot].atrlen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
host_sw_string (long err)
|
|
|
|
|
{
|
|
|
|
|
switch (err)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
case 0: return "okay";
|
|
|
|
|
case SW_HOST_OUT_OF_CORE: return "out of core";
|
|
|
|
|
case SW_HOST_INV_VALUE: return "invalid value";
|
|
|
|
|
case SW_HOST_NO_DRIVER: return "no driver";
|
|
|
|
|
case SW_HOST_NOT_SUPPORTED: return "not supported";
|
|
|
|
|
case SW_HOST_LOCKING_FAILED: return "locking failed";
|
|
|
|
|
case SW_HOST_BUSY: return "busy";
|
|
|
|
|
case SW_HOST_NO_CARD: return "no card";
|
|
|
|
|
case SW_HOST_CARD_INACTIVE: return "card inactive";
|
|
|
|
|
case SW_HOST_CARD_IO_ERROR: return "card I/O error";
|
|
|
|
|
case SW_HOST_GENERAL_ERROR: return "general error";
|
|
|
|
|
case SW_HOST_NO_READER: return "no reader";
|
2004-08-05 09:24:36 +00:00
|
|
|
|
case SW_HOST_ABORTED: return "aborted";
|
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
|
|
|
|
case SW_HOST_NO_PINPAD: return "no pinpad";
|
2011-02-04 12:57:53 +01:00
|
|
|
|
case SW_HOST_ALREADY_CONNECTED: return "already connected";
|
2004-07-16 15:45:25 +00:00
|
|
|
|
default: return "unknown host status error";
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
apdu_strerror (int rc)
|
|
|
|
|
{
|
|
|
|
|
switch (rc)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
case SW_EOF_REACHED : return "eof reached";
|
|
|
|
|
case SW_EEPROM_FAILURE : return "eeprom failure";
|
|
|
|
|
case SW_WRONG_LENGTH : return "wrong length";
|
|
|
|
|
case SW_CHV_WRONG : return "CHV wrong";
|
|
|
|
|
case SW_CHV_BLOCKED : return "CHV blocked";
|
2014-07-24 16:16:53 +02:00
|
|
|
|
case SW_REF_DATA_INV : return "referenced data invalidated";
|
2004-07-16 15:45:25 +00:00
|
|
|
|
case SW_USE_CONDITIONS : return "use conditions not satisfied";
|
|
|
|
|
case SW_BAD_PARAMETER : return "bad parameter";
|
|
|
|
|
case SW_NOT_SUPPORTED : return "not supported";
|
|
|
|
|
case SW_FILE_NOT_FOUND : return "file not found";
|
|
|
|
|
case SW_RECORD_NOT_FOUND:return "record not found";
|
|
|
|
|
case SW_REF_NOT_FOUND : return "reference not found";
|
2011-12-14 18:48:47 +01:00
|
|
|
|
case SW_NOT_ENOUGH_MEMORY: return "not enough memory space in the file";
|
|
|
|
|
case SW_INCONSISTENT_LC: return "Lc inconsistent with TLV structure.";
|
|
|
|
|
case SW_INCORRECT_P0_P1: return "incorrect parameters P0,P1";
|
|
|
|
|
case SW_BAD_LC : return "Lc inconsistent with P0,P1";
|
|
|
|
|
case SW_BAD_P0_P1 : return "bad P0,P1";
|
2004-07-16 15:45:25 +00:00
|
|
|
|
case SW_INS_NOT_SUP : return "instruction not supported";
|
|
|
|
|
case SW_CLA_NOT_SUP : return "class not supported";
|
|
|
|
|
case SW_SUCCESS : return "success";
|
|
|
|
|
default:
|
|
|
|
|
if ((rc & ~0x00ff) == SW_MORE_DATA)
|
|
|
|
|
return "more data available";
|
|
|
|
|
if ( (rc & 0x10000) )
|
|
|
|
|
return host_sw_string (rc);
|
|
|
|
|
return "unknown status error";
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
|
|
|
|
ct API Interface
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static const char *
|
2003-08-05 17:11:04 +00:00
|
|
|
|
ct_error_string (long err)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
switch (err)
|
|
|
|
|
{
|
|
|
|
|
case 0: return "okay";
|
|
|
|
|
case -1: return "invalid data";
|
|
|
|
|
case -8: return "ct error";
|
|
|
|
|
case -10: return "transmission error";
|
|
|
|
|
case -11: return "memory allocation error";
|
|
|
|
|
case -128: return "HTSI error";
|
|
|
|
|
default: return "unknown CT-API error";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
static void
|
|
|
|
|
ct_dump_reader_status (int slot)
|
|
|
|
|
{
|
|
|
|
|
log_info ("reader slot %d: %s\n", slot,
|
|
|
|
|
reader_table[slot].status == 1? "Processor ICC present" :
|
|
|
|
|
reader_table[slot].status == 0? "Memory ICC present" :
|
|
|
|
|
"ICC not present" );
|
|
|
|
|
}
|
2003-08-14 12:20:08 +00:00
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Wait for the card in SLOT and activate it. Return a status word
|
|
|
|
|
error or 0 on success. */
|
|
|
|
|
static int
|
|
|
|
|
ct_activate_card (int slot)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
unsigned char dad[1], sad[1], cmd[11], buf[256];
|
|
|
|
|
unsigned short buflen;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Check whether card has been inserted. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dad[0] = 1; /* Destination address: CT. */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
sad[0] = 2; /* Source address: Host. */
|
2003-08-14 12:20:08 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
cmd[0] = 0x20; /* Class byte. */
|
|
|
|
|
cmd[1] = 0x13; /* Request status. */
|
|
|
|
|
cmd[2] = 0x00; /* From kernel. */
|
|
|
|
|
cmd[3] = 0x80; /* Return card's DO. */
|
|
|
|
|
cmd[4] = 0x00;
|
2003-08-14 12:20:08 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
buflen = DIM(buf);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rc = CT_data (slot, dad, sad, 5, cmd, &buflen, buf);
|
|
|
|
|
if (rc || buflen < 2 || buf[buflen-2] != 0x90)
|
|
|
|
|
{
|
|
|
|
|
log_error ("ct_activate_card: can't get status of reader %d: %s\n",
|
|
|
|
|
slot, ct_error_string (rc));
|
|
|
|
|
return SW_HOST_CARD_IO_ERROR;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/* Connected, now activate the card. */
|
|
|
|
|
dad[0] = 1; /* Destination address: CT. */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
sad[0] = 2; /* Source address: Host. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
cmd[0] = 0x20; /* Class byte. */
|
|
|
|
|
cmd[1] = 0x12; /* Request ICC. */
|
|
|
|
|
cmd[2] = 0x01; /* From first interface. */
|
|
|
|
|
cmd[3] = 0x01; /* Return card's ATR. */
|
|
|
|
|
cmd[4] = 0x00;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
buflen = DIM(buf);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rc = CT_data (slot, dad, sad, 5, cmd, &buflen, buf);
|
|
|
|
|
if (rc || buflen < 2 || buf[buflen-2] != 0x90)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("ct_activate_card(%d): activation failed: %s\n",
|
|
|
|
|
slot, ct_error_string (rc));
|
|
|
|
|
if (!rc)
|
|
|
|
|
log_printhex (" received data:", buf, buflen);
|
|
|
|
|
return SW_HOST_CARD_IO_ERROR;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Store the type and the ATR. */
|
|
|
|
|
if (buflen - 2 > DIM (reader_table[0].atr))
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("ct_activate_card(%d): ATR too long\n", slot);
|
|
|
|
|
return SW_HOST_CARD_IO_ERROR;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[slot].status = buf[buflen - 1];
|
|
|
|
|
memcpy (reader_table[slot].atr, buf, buflen - 2);
|
|
|
|
|
reader_table[slot].atrlen = buflen - 2;
|
|
|
|
|
return 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
static int
|
|
|
|
|
close_ct_reader (int slot)
|
|
|
|
|
{
|
2003-10-31 12:12:36 +00:00
|
|
|
|
CT_close (slot);
|
2003-10-21 17:12:50 +00:00
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static int
|
|
|
|
|
reset_ct_reader (int slot)
|
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* FIXME: Check is this is sufficient do do a reset. */
|
|
|
|
|
return ct_activate_card (slot);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ct_get_status (int slot, unsigned int *status)
|
|
|
|
|
{
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)slot;
|
2015-11-16 12:41:46 +01:00
|
|
|
|
/* The status we returned is wrong but we don't care because ctAPI
|
2008-10-14 18:18:21 +00:00
|
|
|
|
is not anymore required. */
|
|
|
|
|
*status = APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return 0;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
/* Actually send the APDU of length APDULEN to SLOT and return a
|
|
|
|
|
maximum of *BUFLEN data in BUFFER, the actual retruned size will be
|
|
|
|
|
set to BUFLEN. Returns: CT API error code. */
|
|
|
|
|
static int
|
|
|
|
|
ct_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
unsigned char *buffer, size_t *buflen, pininfo_t *pininfo)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
unsigned char dad[1], sad[1];
|
|
|
|
|
unsigned short ctbuflen;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)pininfo;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* If we don't have an ATR, we need to reset the reader first. */
|
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (rc = reset_ct_reader (slot)))
|
|
|
|
|
return rc;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dad[0] = 0; /* Destination address: Card. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
sad[0] = 2; /* Source address: Host. */
|
|
|
|
|
ctbuflen = *buflen;
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_printhex (" CT_data:", apdu, apdulen);
|
|
|
|
|
rc = CT_data (slot, dad, sad, apdulen, apdu, &ctbuflen, buffer);
|
|
|
|
|
*buflen = ctbuflen;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return rc? SW_HOST_CARD_IO_ERROR: 0;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
/* Open a reader and return an internal handle for it. PORT is a
|
|
|
|
|
non-negative value with the port number of the reader. USB readers
|
|
|
|
|
do have port numbers starting at 32769. */
|
|
|
|
|
static int
|
|
|
|
|
open_ct_reader (int port)
|
|
|
|
|
{
|
|
|
|
|
int rc, reader;
|
|
|
|
|
|
|
|
|
|
if (port < 0 || port > 0xffff)
|
|
|
|
|
{
|
|
|
|
|
log_error ("open_ct_reader: invalid port %d requested\n", port);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
reader = new_reader_slot ();
|
|
|
|
|
if (reader == -1)
|
|
|
|
|
return reader;
|
|
|
|
|
reader_table[reader].port = port;
|
|
|
|
|
|
|
|
|
|
rc = CT_init (reader, (unsigned short)port);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
log_error ("apdu_open_ct_reader failed on port %d: %s\n",
|
|
|
|
|
port, ct_error_string (rc));
|
|
|
|
|
reader_table[reader].used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (reader);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Only try to activate the card. */
|
|
|
|
|
rc = ct_activate_card (reader);
|
|
|
|
|
if (rc)
|
|
|
|
|
{
|
|
|
|
|
reader_table[reader].atrlen = 0;
|
|
|
|
|
rc = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
reader_table[reader].close_reader = close_ct_reader;
|
|
|
|
|
reader_table[reader].reset_reader = reset_ct_reader;
|
|
|
|
|
reader_table[reader].get_status_reader = ct_get_status;
|
|
|
|
|
reader_table[reader].send_apdu_reader = ct_send_apdu;
|
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
|
|
|
|
reader_table[reader].check_pinpad = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[reader].dump_status_reader = ct_dump_reader_status;
|
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
|
|
|
|
reader_table[reader].pinpad_verify = NULL;
|
|
|
|
|
reader_table[reader].pinpad_modify = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
dump_reader_status (reader);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (reader);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return reader;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
|
|
|
|
PC/SC Interface
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
writen (int fd, const void *buf, size_t nbytes)
|
|
|
|
|
{
|
|
|
|
|
size_t nleft = nbytes;
|
|
|
|
|
int nwritten;
|
|
|
|
|
|
|
|
|
|
/* log_printhex (" writen:", buf, nbytes); */
|
|
|
|
|
|
|
|
|
|
while (nleft > 0)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
nwritten = npth_write (fd, buf, nleft);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#else
|
|
|
|
|
nwritten = write (fd, buf, nleft);
|
|
|
|
|
#endif
|
|
|
|
|
if (nwritten < 0 && errno == EINTR)
|
|
|
|
|
continue;
|
|
|
|
|
if (nwritten < 0)
|
|
|
|
|
return -1;
|
|
|
|
|
nleft -= nwritten;
|
|
|
|
|
buf = (const char*)buf + nwritten;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read up to BUFLEN bytes from FD and return the number of bytes
|
|
|
|
|
actually read in NREAD. Returns -1 on error or 0 on success. */
|
|
|
|
|
static int
|
|
|
|
|
readn (int fd, void *buf, size_t buflen, size_t *nread)
|
|
|
|
|
{
|
|
|
|
|
size_t nleft = buflen;
|
|
|
|
|
int n;
|
|
|
|
|
/* void *orig_buf = buf; */
|
|
|
|
|
|
|
|
|
|
while (nleft > 0)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2009-06-29 10:43:57 +00:00
|
|
|
|
# ifdef HAVE_W32_SYSTEM
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
# error Cannot use npth_read here because it expects a system HANDLE.
|
2009-06-29 10:43:57 +00:00
|
|
|
|
# endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
n = npth_read (fd, buf, nleft);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#else
|
|
|
|
|
n = read (fd, buf, nleft);
|
|
|
|
|
#endif
|
2005-02-24 17:36:11 +00:00
|
|
|
|
if (n < 0 && errno == EINTR)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
continue;
|
|
|
|
|
if (n < 0)
|
|
|
|
|
return -1; /* read error. */
|
|
|
|
|
if (!n)
|
|
|
|
|
break; /* EOF */
|
|
|
|
|
nleft -= n;
|
|
|
|
|
buf = (char*)buf + n;
|
|
|
|
|
}
|
|
|
|
|
if (nread)
|
|
|
|
|
*nread = buflen - nleft;
|
|
|
|
|
|
|
|
|
|
/* log_printhex (" readn:", orig_buf, *nread); */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static const char *
|
|
|
|
|
pcsc_error_string (long err)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
return "okay";
|
|
|
|
|
if ((err & 0x80100000) != 0x80100000)
|
|
|
|
|
return "invalid PC/SC error code";
|
|
|
|
|
err &= 0xffff;
|
|
|
|
|
switch (err)
|
|
|
|
|
{
|
|
|
|
|
case 0x0002: s = "cancelled"; break;
|
|
|
|
|
case 0x000e: s = "can't dispose"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x0008: s = "insufficient buffer"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 0x0015: s = "invalid ATR"; break;
|
|
|
|
|
case 0x0003: s = "invalid handle"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x0004: s = "invalid parameter"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 0x0005: s = "invalid target"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x0011: s = "invalid value"; break;
|
|
|
|
|
case 0x0006: s = "no memory"; break;
|
|
|
|
|
case 0x0013: s = "comm error"; break;
|
|
|
|
|
case 0x0001: s = "internal error"; break;
|
|
|
|
|
case 0x0014: s = "unknown error"; break;
|
|
|
|
|
case 0x0007: s = "waited too long"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 0x0009: s = "unknown reader"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x000a: s = "timeout"; break;
|
|
|
|
|
case 0x000b: s = "sharing violation"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 0x000c: s = "no smartcard"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x000d: s = "unknown card"; break;
|
|
|
|
|
case 0x000f: s = "proto mismatch"; break;
|
|
|
|
|
case 0x0010: s = "not ready"; break;
|
|
|
|
|
case 0x0012: s = "system cancelled"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
case 0x0016: s = "not transacted"; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case 0x0017: s = "reader unavailable"; break;
|
|
|
|
|
case 0x0065: s = "unsupported card"; break;
|
|
|
|
|
case 0x0066: s = "unresponsive card"; break;
|
|
|
|
|
case 0x0067: s = "unpowered card"; break;
|
|
|
|
|
case 0x0068: s = "reset card"; break;
|
|
|
|
|
case 0x0069: s = "removed card"; break;
|
|
|
|
|
case 0x006a: s = "inserted card"; break;
|
|
|
|
|
case 0x001f: s = "unsupported feature"; break;
|
|
|
|
|
case 0x0019: s = "PCI too small"; break;
|
|
|
|
|
case 0x001a: s = "reader unsupported"; break;
|
|
|
|
|
case 0x001b: s = "duplicate reader"; break;
|
|
|
|
|
case 0x001c: s = "card unsupported"; break;
|
|
|
|
|
case 0x001d: s = "no service"; break;
|
|
|
|
|
case 0x001e: s = "service stopped"; break;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
default: s = "unknown PC/SC error code"; break;
|
|
|
|
|
}
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/* Map PC/SC error codes to our special host status words. */
|
|
|
|
|
static int
|
|
|
|
|
pcsc_error_to_sw (long ec)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
2006-11-20 16:49:41 +00:00
|
|
|
|
switch ( PCSC_ERR_MASK (ec) )
|
2005-02-24 17:36:11 +00:00
|
|
|
|
{
|
|
|
|
|
case 0: rc = 0; break;
|
|
|
|
|
|
|
|
|
|
case PCSC_E_CANCELLED: rc = SW_HOST_ABORTED; break;
|
|
|
|
|
case PCSC_E_NO_MEMORY: rc = SW_HOST_OUT_OF_CORE; break;
|
|
|
|
|
case PCSC_E_TIMEOUT: rc = SW_HOST_CARD_IO_ERROR; break;
|
2015-12-07 00:13:59 +01:00
|
|
|
|
case PCSC_E_NO_SERVICE:
|
|
|
|
|
case PCSC_E_SERVICE_STOPPED:
|
2012-06-24 10:45:49 +09:00
|
|
|
|
case PCSC_E_UNKNOWN_READER: rc = SW_HOST_NO_READER; break;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case PCSC_E_SHARING_VIOLATION: rc = SW_HOST_LOCKING_FAILED; break;
|
|
|
|
|
case PCSC_E_NO_SMARTCARD: rc = SW_HOST_NO_CARD; break;
|
|
|
|
|
case PCSC_W_REMOVED_CARD: rc = SW_HOST_NO_CARD; break;
|
|
|
|
|
|
|
|
|
|
case PCSC_E_INVALID_TARGET:
|
|
|
|
|
case PCSC_E_INVALID_VALUE:
|
2011-02-04 12:57:53 +01:00
|
|
|
|
case PCSC_E_INVALID_HANDLE:
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case PCSC_E_INVALID_PARAMETER:
|
|
|
|
|
case PCSC_E_INSUFFICIENT_BUFFER: rc = SW_HOST_INV_VALUE; break;
|
|
|
|
|
|
|
|
|
|
default: rc = SW_HOST_GENERAL_ERROR; break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
static void
|
|
|
|
|
dump_pcsc_reader_status (int slot)
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (reader_table[slot].pcsc.card)
|
|
|
|
|
{
|
|
|
|
|
log_info ("reader slot %d: active protocol:", slot);
|
|
|
|
|
if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T0))
|
|
|
|
|
log_printf (" T0");
|
|
|
|
|
else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
|
|
|
|
|
log_printf (" T1");
|
|
|
|
|
else if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_RAW))
|
|
|
|
|
log_printf (" raw");
|
|
|
|
|
log_printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
log_info ("reader slot %d: not connected\n", slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static int
|
2008-10-14 18:18:21 +00:00
|
|
|
|
pcsc_get_status_direct (int slot, unsigned int *status)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
2004-10-20 08:54:45 +00:00
|
|
|
|
long err;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
struct pcsc_readerstate_s rdrstates[1];
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
memset (rdrstates, 0, sizeof *rdrstates);
|
|
|
|
|
rdrstates[0].reader = reader_table[slot].rdrname;
|
|
|
|
|
rdrstates[0].current_state = PCSC_STATE_UNAWARE;
|
|
|
|
|
err = pcsc_get_status_change (reader_table[slot].pcsc.context,
|
|
|
|
|
0,
|
|
|
|
|
rdrstates, 1);
|
|
|
|
|
if (err == PCSC_E_TIMEOUT)
|
|
|
|
|
err = 0; /* Timeout is no error error here. */
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("pcsc_get_status_change failed: %s (0x%lx)\n",
|
2005-02-24 17:36:11 +00:00
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
return pcsc_error_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
/* log_debug */
|
|
|
|
|
/* ("pcsc_get_status_change: %s%s%s%s%s%s%s%s%s%s\n", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_IGNORE)? " ignore":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_CHANGED)? " changed":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_UNKNOWN)? " unknown":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_UNAVAILABLE)?" unavail":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_EMPTY)? " empty":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_PRESENT)? " present":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_ATRMATCH)? " atr":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_EXCLUSIVE)? " excl":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_INUSE)? " unuse":"", */
|
|
|
|
|
/* (rdrstates[0].event_state & PCSC_STATE_MUTE)? " mute":"" ); */
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
*status = 0;
|
|
|
|
|
if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
|
2013-03-26 12:43:24 +09:00
|
|
|
|
{
|
|
|
|
|
*status |= APDU_CARD_PRESENT;
|
|
|
|
|
if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
|
|
|
|
|
*status |= APDU_CARD_ACTIVE;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
/* We indicate a useful card if it is not in use by another
|
|
|
|
|
application. This is because we only use exclusive access
|
|
|
|
|
mode. */
|
|
|
|
|
if ( (*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
|
|
|
|
|
== (APDU_CARD_PRESENT|APDU_CARD_ACTIVE)
|
|
|
|
|
&& !(rdrstates[0].event_state & PCSC_STATE_INUSE) )
|
|
|
|
|
*status |= APDU_CARD_USABLE;
|
|
|
|
|
#else
|
|
|
|
|
/* Some winscard drivers may set EXCLUSIVE and INUSE at the same
|
|
|
|
|
time when we are the only user (SCM SCR335) under Windows. */
|
|
|
|
|
if ((*status & (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
|
|
|
|
|
== (APDU_CARD_PRESENT|APDU_CARD_ACTIVE))
|
|
|
|
|
*status |= APDU_CARD_USABLE;
|
|
|
|
|
#endif
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
2004-07-16 15:45:25 +00:00
|
|
|
|
static int
|
2008-10-14 18:18:21 +00:00
|
|
|
|
pcsc_get_status_wrapped (int slot, unsigned int *status)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
2004-10-20 08:54:45 +00:00
|
|
|
|
long err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
size_t len, full_len;
|
|
|
|
|
int i, n;
|
|
|
|
|
unsigned char msgbuf[9];
|
2005-09-05 14:36:36 +00:00
|
|
|
|
unsigned char buffer[16];
|
2005-02-24 17:36:11 +00:00
|
|
|
|
int sw = SW_HOST_CARD_IO_ERROR;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
if (slotp->pcsc.req_fd == -1
|
|
|
|
|
|| slotp->pcsc.rsp_fd == -1
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|| slotp->pcsc.pid == (pid_t)(-1) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_get_status: pcsc-wrapper not running\n");
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return sw;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
msgbuf[0] = 0x04; /* STATUS command. */
|
|
|
|
|
len = 0;
|
|
|
|
|
msgbuf[1] = (len >> 24);
|
|
|
|
|
msgbuf[2] = (len >> 16);
|
|
|
|
|
msgbuf[3] = (len >> 8);
|
|
|
|
|
msgbuf[4] = (len );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 5) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error sending PC/SC STATUS request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC STATUS response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf_to_size_t (msgbuf+1);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_status failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/* This is a proper error code, so return immediately. */
|
|
|
|
|
return pcsc_error_to_sw (err);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
full_len = len;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
/* The current version returns 3 words but we allow also for old
|
|
|
|
|
versions returning only 2 words. */
|
|
|
|
|
n = 12 < len ? 12 : len;
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, buffer, n, &len))
|
|
|
|
|
|| (len != 8 && len != 12))
|
2004-10-20 08:54:45 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC STATUS response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
slotp->is_t0 = (len == 12 && !!(buffer[11] & PCSC_PROTOCOL_T0));
|
|
|
|
|
|
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
full_len -= len;
|
|
|
|
|
/* Newer versions of the wrapper might send more status bytes.
|
|
|
|
|
Read them. */
|
|
|
|
|
while (full_len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char dummybuf[128];
|
|
|
|
|
|
|
|
|
|
n = full_len < DIM (dummybuf) ? full_len : DIM (dummybuf);
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, dummybuf, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC TRANSMIT response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
full_len -= n;
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
/* We are lucky: The wrapper already returns the data in the
|
|
|
|
|
required format. */
|
|
|
|
|
*status = buffer[3];
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return sw;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
static int
|
|
|
|
|
pcsc_get_status (int slot, unsigned int *status)
|
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return pcsc_get_status_wrapped (slot, status);
|
|
|
|
|
#else
|
|
|
|
|
return pcsc_get_status_direct (slot, status);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
pcsc_send_apdu_direct (int slot, unsigned char *apdu, size_t apdulen,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned char *buffer, size_t *buflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
struct pcsc_io_request_s send_pci;
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t recv_len;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
2014-03-07 09:46:44 +01:00
|
|
|
|
(void)pininfo;
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (err = reset_pcsc_reader (slot)))
|
|
|
|
|
return err;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_printhex (" PCSC_data:", apdu, apdulen);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
|
|
|
|
|
send_pci.protocol = PCSC_PROTOCOL_T1;
|
|
|
|
|
else
|
|
|
|
|
send_pci.protocol = PCSC_PROTOCOL_T0;
|
|
|
|
|
send_pci.pci_len = sizeof send_pci;
|
|
|
|
|
recv_len = *buflen;
|
|
|
|
|
err = pcsc_transmit (reader_table[slot].pcsc.card,
|
|
|
|
|
&send_pci, apdu, apdulen,
|
|
|
|
|
NULL, buffer, &recv_len);
|
|
|
|
|
*buflen = recv_len;
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("pcsc_transmit failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return pcsc_error_to_sw (err);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
2004-07-16 15:45:25 +00:00
|
|
|
|
static int
|
2008-10-14 18:18:21 +00:00
|
|
|
|
pcsc_send_apdu_wrapped (int slot, unsigned char *apdu, size_t apdulen,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned char *buffer, size_t *buflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
long err;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
reader_table_t slotp;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
size_t len, full_len;
|
|
|
|
|
int i, n;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
unsigned char msgbuf[9];
|
2005-02-24 17:36:11 +00:00
|
|
|
|
int sw = SW_HOST_CARD_IO_ERROR;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)pininfo;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (err = reset_pcsc_reader (slot)))
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_printhex (" PCSC_data:", apdu, apdulen);
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
if (slotp->pcsc.req_fd == -1
|
|
|
|
|
|| slotp->pcsc.rsp_fd == -1
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|| slotp->pcsc.pid == (pid_t)(-1) )
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("pcsc_send_apdu: pcsc-wrapper not running\n");
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return sw;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
msgbuf[0] = 0x03; /* TRANSMIT command. */
|
|
|
|
|
len = apdulen;
|
|
|
|
|
msgbuf[1] = (len >> 24);
|
|
|
|
|
msgbuf[2] = (len >> 16);
|
|
|
|
|
msgbuf[3] = (len >> 8);
|
|
|
|
|
msgbuf[4] = (len );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 5)
|
|
|
|
|
|| writen (slotp->pcsc.req_fd, apdu, len))
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("error sending PC/SC TRANSMIT request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("error receiving PC/SC TRANSMIT response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf_to_size_t (msgbuf+1);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_transmit failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return pcsc_error_to_sw (err);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
full_len = len;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
n = *buflen < len ? *buflen : len;
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, buffer, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC TRANSMIT response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
*buflen = n;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
full_len -= len;
|
|
|
|
|
if (full_len)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_send_apdu: provided buffer too short - truncated\n");
|
|
|
|
|
err = SW_HOST_INV_VALUE;
|
|
|
|
|
}
|
|
|
|
|
/* We need to read any rest of the response, to keep the
|
2008-09-23 09:57:45 +00:00
|
|
|
|
protocol running. */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
while (full_len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char dummybuf[128];
|
|
|
|
|
|
|
|
|
|
n = full_len < DIM (dummybuf) ? full_len : DIM (dummybuf);
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, dummybuf, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC TRANSMIT response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
full_len -= n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return sw;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
/* Send the APDU of length APDULEN to SLOT and return a maximum of
|
|
|
|
|
*BUFLEN data in BUFFER, the actual returned size will be stored at
|
|
|
|
|
BUFLEN. Returns: A status word. */
|
|
|
|
|
static int
|
|
|
|
|
pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned char *buffer, size_t *buflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return pcsc_send_apdu_wrapped (slot, apdu, apdulen, buffer, buflen, pininfo);
|
|
|
|
|
#else
|
|
|
|
|
return pcsc_send_apdu_direct (slot, apdu, apdulen, buffer, buflen, pininfo);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2011-11-28 16:16:38 +09:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
2013-03-22 10:41:59 +09:00
|
|
|
|
control_pcsc_direct (int slot, pcsc_dword_t ioctl_code,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
const unsigned char *cntlbuf, size_t len,
|
2013-03-26 09:03:55 +09:00
|
|
|
|
unsigned char *buffer, pcsc_dword_t *buflen)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
|
|
|
|
|
err = pcsc_control (reader_table[slot].pcsc.card, ioctl_code,
|
2015-03-15 12:15:55 +01:00
|
|
|
|
cntlbuf, len, buffer, buflen? *buflen:0, buflen);
|
2011-11-28 16:16:38 +09:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_control failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
return pcsc_error_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
2013-03-22 10:41:59 +09:00
|
|
|
|
control_pcsc_wrapped (int slot, pcsc_dword_t ioctl_code,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
const unsigned char *cntlbuf, size_t len,
|
2013-03-26 09:03:55 +09:00
|
|
|
|
unsigned char *buffer, pcsc_dword_t *buflen)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
long err = PCSC_E_NOT_TRANSACTED;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
unsigned char msgbuf[9];
|
|
|
|
|
int i, n;
|
|
|
|
|
size_t full_len;
|
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
|
|
|
|
msgbuf[0] = 0x06; /* CONTROL command. */
|
|
|
|
|
msgbuf[1] = ((len + 4) >> 24);
|
|
|
|
|
msgbuf[2] = ((len + 4) >> 16);
|
|
|
|
|
msgbuf[3] = ((len + 4) >> 8);
|
|
|
|
|
msgbuf[4] = ((len + 4) );
|
|
|
|
|
msgbuf[5] = (ioctl_code >> 24);
|
|
|
|
|
msgbuf[6] = (ioctl_code >> 16);
|
|
|
|
|
msgbuf[7] = (ioctl_code >> 8);
|
|
|
|
|
msgbuf[8] = (ioctl_code );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 9)
|
|
|
|
|
|| writen (slotp->pcsc.req_fd, cntlbuf, len))
|
|
|
|
|
{
|
|
|
|
|
log_error ("error sending PC/SC CONTROL request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC CONTROL response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf32_to_size_t (msgbuf+1);
|
2011-11-28 16:16:38 +09:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2011-11-28 16:16:38 +09:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_control failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
return pcsc_error_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
full_len = len;
|
|
|
|
|
|
2015-03-15 12:15:55 +01:00
|
|
|
|
if (buflen)
|
|
|
|
|
n = *buflen < len ? *buflen : len;
|
|
|
|
|
else
|
|
|
|
|
n = 0;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, buffer, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC CONTROL response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-03-15 12:15:55 +01:00
|
|
|
|
if (buflen)
|
|
|
|
|
*buflen = n;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
|
|
|
|
full_len -= len;
|
|
|
|
|
if (full_len)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_send_apdu: provided buffer too short - truncated\n");
|
|
|
|
|
err = PCSC_E_INVALID_VALUE;
|
|
|
|
|
}
|
|
|
|
|
/* We need to read any rest of the response, to keep the
|
|
|
|
|
protocol running. */
|
|
|
|
|
while (full_len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char dummybuf[128];
|
|
|
|
|
|
|
|
|
|
n = full_len < DIM (dummybuf) ? full_len : DIM (dummybuf);
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, dummybuf, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC CONTROL response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
full_len -= n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2011-11-28 16:16:38 +09:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
|
|
|
|
return pcsc_error_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Do some control with the value of IOCTL_CODE to the card inserted
|
|
|
|
|
to SLOT. Input buffer is specified by CNTLBUF of length LEN.
|
|
|
|
|
Output buffer is specified by BUFFER of length *BUFLEN, and the
|
|
|
|
|
actual output size will be stored at BUFLEN. Returns: A status word.
|
|
|
|
|
This routine is used for PIN pad input support. */
|
|
|
|
|
static int
|
2013-03-22 10:41:59 +09:00
|
|
|
|
control_pcsc (int slot, pcsc_dword_t ioctl_code,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
const unsigned char *cntlbuf, size_t len,
|
2013-03-26 09:03:55 +09:00
|
|
|
|
unsigned char *buffer, pcsc_dword_t *buflen)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return control_pcsc_wrapped (slot, ioctl_code, cntlbuf, len, buffer, buflen);
|
|
|
|
|
#else
|
|
|
|
|
return control_pcsc_direct (slot, ioctl_code, cntlbuf, len, buffer, buflen);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
close_pcsc_reader_direct (int slot)
|
|
|
|
|
{
|
|
|
|
|
pcsc_release_context (reader_table[slot].pcsc.context);
|
|
|
|
|
xfree (reader_table[slot].rdrname);
|
|
|
|
|
reader_table[slot].rdrname = NULL;
|
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
close_pcsc_reader_wrapped (int slot)
|
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
size_t len;
|
|
|
|
|
int i;
|
|
|
|
|
unsigned char msgbuf[9];
|
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
|
|
|
|
if (slotp->pcsc.req_fd == -1
|
|
|
|
|
|| slotp->pcsc.rsp_fd == -1
|
|
|
|
|
|| slotp->pcsc.pid == (pid_t)(-1) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("close_pcsc_reader: pcsc-wrapper not running\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
msgbuf[0] = 0x02; /* CLOSE command. */
|
|
|
|
|
len = 0;
|
|
|
|
|
msgbuf[1] = (len >> 24);
|
|
|
|
|
msgbuf[2] = (len >> 16);
|
|
|
|
|
msgbuf[3] = (len >> 8);
|
|
|
|
|
msgbuf[4] = (len );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 5) )
|
|
|
|
|
{
|
|
|
|
|
log_error ("error sending PC/SC CLOSE request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC CLOSE response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf32_to_size_t (msgbuf+1);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (err)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("pcsc_close failed: %s (0x%lx)\n",
|
2004-07-16 15:45:25 +00:00
|
|
|
|
pcsc_error_string (err), err);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
/* We will close the wrapper in any case - errors are merely
|
|
|
|
|
informational. */
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
close_pcsc_reader (int slot)
|
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return close_pcsc_reader_wrapped (slot);
|
|
|
|
|
#else
|
|
|
|
|
return close_pcsc_reader_direct (slot);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Connect a PC/SC card. */
|
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
connect_pcsc_card (int slot)
|
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
|
|
|
|
|
assert (slot >= 0 && slot < MAX_READER);
|
|
|
|
|
|
|
|
|
|
if (reader_table[slot].pcsc.card)
|
|
|
|
|
return SW_HOST_ALREADY_CONNECTED;
|
|
|
|
|
|
|
|
|
|
reader_table[slot].atrlen = 0;
|
|
|
|
|
reader_table[slot].last_status = 0;
|
|
|
|
|
reader_table[slot].is_t0 = 0;
|
|
|
|
|
|
|
|
|
|
err = pcsc_connect (reader_table[slot].pcsc.context,
|
|
|
|
|
reader_table[slot].rdrname,
|
|
|
|
|
PCSC_SHARE_EXCLUSIVE,
|
|
|
|
|
PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1,
|
|
|
|
|
&reader_table[slot].pcsc.card,
|
|
|
|
|
&reader_table[slot].pcsc.protocol);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
reader_table[slot].pcsc.card = 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (err != PCSC_E_NO_SMARTCARD)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("pcsc_connect failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char reader[250];
|
2013-03-22 10:41:59 +09:00
|
|
|
|
pcsc_dword_t readerlen, atrlen;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
pcsc_dword_t card_state, card_protocol;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
2013-10-25 09:57:31 +09:00
|
|
|
|
pcsc_vendor_specific_init (slot);
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
atrlen = DIM (reader_table[0].atr);
|
|
|
|
|
readerlen = sizeof reader -1 ;
|
|
|
|
|
err = pcsc_status (reader_table[slot].pcsc.card,
|
|
|
|
|
reader, &readerlen,
|
|
|
|
|
&card_state, &card_protocol,
|
|
|
|
|
reader_table[slot].atr, &atrlen);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("pcsc_status failed: %s (0x%lx) %lu\n",
|
2014-03-07 09:46:44 +01:00
|
|
|
|
pcsc_error_string (err), err, (long unsigned int)readerlen);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (atrlen > DIM (reader_table[0].atr))
|
|
|
|
|
log_bug ("ATR returned by pcsc_status is too large\n");
|
|
|
|
|
reader_table[slot].atrlen = atrlen;
|
|
|
|
|
/* If we got to here we know that a card is present
|
|
|
|
|
and usable. Remember this. */
|
|
|
|
|
reader_table[slot].last_status = ( APDU_CARD_USABLE
|
|
|
|
|
| APDU_CARD_PRESENT
|
2008-12-18 16:34:28 +00:00
|
|
|
|
| APDU_CARD_ACTIVE);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[slot].is_t0 = !!(card_protocol & PCSC_PROTOCOL_T0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dump_reader_status (slot);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return pcsc_error_to_sw (err);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Disconnect a PC/SC card. Note that this succeeds even if the card
|
|
|
|
|
is not connected. */
|
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
disconnect_pcsc_card (int slot)
|
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
|
|
|
|
|
assert (slot >= 0 && slot < MAX_READER);
|
|
|
|
|
|
|
|
|
|
if (!reader_table[slot].pcsc.card)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return 0;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
err = pcsc_disconnect (reader_table[slot].pcsc.card, PCSC_LEAVE_CARD);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_disconnect failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
return SW_HOST_CARD_IO_ERROR;
|
|
|
|
|
}
|
|
|
|
|
reader_table[slot].pcsc.card = 0;
|
|
|
|
|
return 0;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
2004-07-16 15:45:25 +00:00
|
|
|
|
static int
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reset_pcsc_reader_direct (int slot)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
sw = disconnect_pcsc_card (slot);
|
|
|
|
|
if (!sw)
|
|
|
|
|
sw = connect_pcsc_card (slot);
|
|
|
|
|
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
2008-10-14 18:18:21 +00:00
|
|
|
|
static int
|
|
|
|
|
reset_pcsc_reader_wrapped (int slot)
|
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
long err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
size_t len;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int i, n;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
unsigned char msgbuf[9];
|
2008-10-14 18:18:21 +00:00
|
|
|
|
unsigned int dummy_status;
|
|
|
|
|
int sw = SW_HOST_CARD_IO_ERROR;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
if (slotp->pcsc.req_fd == -1
|
|
|
|
|
|| slotp->pcsc.rsp_fd == -1
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|| slotp->pcsc.pid == (pid_t)(-1) )
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("pcsc_get_status: pcsc-wrapper not running\n");
|
|
|
|
|
return sw;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
msgbuf[0] = 0x05; /* RESET command. */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
len = 0;
|
|
|
|
|
msgbuf[1] = (len >> 24);
|
|
|
|
|
msgbuf[2] = (len >> 16);
|
|
|
|
|
msgbuf[3] = (len >> 8);
|
|
|
|
|
msgbuf[4] = (len );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 5) )
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("error sending PC/SC RESET request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC RESET response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf32_to_size_t (msgbuf+1);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
|
|
|
|
if (len > DIM (slotp->atr))
|
|
|
|
|
{
|
|
|
|
|
log_error ("PC/SC returned a too large ATR (len=%lx)\n",
|
|
|
|
|
(unsigned long)len);
|
|
|
|
|
sw = SW_HOST_GENERAL_ERROR;
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("PC/SC RESET failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
/* If the error code is no smart card, we should not considere
|
|
|
|
|
this a major error and close the wrapper. */
|
|
|
|
|
sw = pcsc_error_to_sw (err);
|
|
|
|
|
if (err == PCSC_E_NO_SMARTCARD)
|
|
|
|
|
return sw;
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The open function may return a zero for the ATR length to
|
|
|
|
|
indicate that no card is present. */
|
|
|
|
|
n = len;
|
|
|
|
|
if (n)
|
|
|
|
|
{
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC RESET response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
slotp->atrlen = len;
|
|
|
|
|
|
|
|
|
|
/* Read the status so that IS_T0 will be set. */
|
|
|
|
|
pcsc_get_status (slot, &dummy_status);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
#endif /* !NEED_PCSC_WRAPPER */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Send an PC/SC reset command and return a status word on error or 0
|
|
|
|
|
on success. */
|
|
|
|
|
static int
|
|
|
|
|
reset_pcsc_reader (int slot)
|
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return reset_pcsc_reader_wrapped (slot);
|
|
|
|
|
#else
|
|
|
|
|
return reset_pcsc_reader_direct (slot);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
/* Examine reader specific parameters and initialize. This is mostly
|
|
|
|
|
for pinpad input. Called at opening the connection to the reader. */
|
|
|
|
|
static int
|
|
|
|
|
pcsc_vendor_specific_init (int slot)
|
|
|
|
|
{
|
|
|
|
|
unsigned char buf[256];
|
|
|
|
|
pcsc_dword_t len;
|
|
|
|
|
int sw;
|
|
|
|
|
int vendor = 0;
|
|
|
|
|
int product = 0;
|
|
|
|
|
pcsc_dword_t get_tlv_ioctl = (pcsc_dword_t)-1;
|
|
|
|
|
unsigned char *p;
|
|
|
|
|
|
|
|
|
|
len = sizeof (buf);
|
|
|
|
|
sw = control_pcsc (slot, CM_IOCTL_GET_FEATURE_REQUEST, NULL, 0, buf, &len);
|
|
|
|
|
if (sw)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_vendor_specific_init: GET_FEATURE_REQUEST failed: %d\n",
|
|
|
|
|
sw);
|
|
|
|
|
return SW_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
p = buf;
|
|
|
|
|
while (p < buf + len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char code = *p++;
|
|
|
|
|
int l = *p++;
|
|
|
|
|
unsigned int v = 0;
|
|
|
|
|
|
|
|
|
|
if (l == 1)
|
|
|
|
|
v = p[0];
|
|
|
|
|
else if (l == 2)
|
2015-02-11 10:27:57 +01:00
|
|
|
|
v = buf16_to_uint (p);
|
2013-08-30 11:06:50 +09:00
|
|
|
|
else if (l == 4)
|
2015-02-11 10:27:57 +01:00
|
|
|
|
v = buf32_to_uint (p);
|
2013-08-30 11:06:50 +09:00
|
|
|
|
|
|
|
|
|
if (code == FEATURE_VERIFY_PIN_DIRECT)
|
|
|
|
|
reader_table[slot].pcsc.verify_ioctl = v;
|
|
|
|
|
else if (code == FEATURE_MODIFY_PIN_DIRECT)
|
|
|
|
|
reader_table[slot].pcsc.modify_ioctl = v;
|
|
|
|
|
else if (code == FEATURE_GET_TLV_PROPERTIES)
|
|
|
|
|
get_tlv_ioctl = v;
|
|
|
|
|
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("feature: code=%02X, len=%d, v=%02X\n", code, l, v);
|
|
|
|
|
|
|
|
|
|
p += l;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-16 09:52:18 +09:00
|
|
|
|
if (get_tlv_ioctl == (pcsc_dword_t)-1)
|
2013-08-30 11:06:50 +09:00
|
|
|
|
{
|
2013-10-16 09:52:18 +09:00
|
|
|
|
/*
|
|
|
|
|
* For system which doesn't support GET_TLV_PROPERTIES,
|
|
|
|
|
* we put some heuristics here.
|
|
|
|
|
*/
|
|
|
|
|
if (reader_table[slot].rdrname)
|
|
|
|
|
{
|
|
|
|
|
if (strstr (reader_table[slot].rdrname, "SPRx32"))
|
|
|
|
|
{
|
|
|
|
|
reader_table[slot].is_spr532 = 1;
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
|
|
|
|
}
|
2015-06-22 14:31:25 +09:00
|
|
|
|
else if (strstr (reader_table[slot].rdrname, "ST-2xxx"))
|
|
|
|
|
{
|
|
|
|
|
reader_table[slot].pcsc.pinmax = 15;
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (strstr (reader_table[slot].rdrname, "cyberJack")
|
2013-10-16 09:52:18 +09:00
|
|
|
|
|| strstr (reader_table[slot].rdrname, "DIGIPASS")
|
|
|
|
|
|| strstr (reader_table[slot].rdrname, "Gnuk")
|
|
|
|
|
|| strstr (reader_table[slot].rdrname, "KAAN"))
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = sizeof (buf);
|
|
|
|
|
sw = control_pcsc (slot, get_tlv_ioctl, NULL, 0, buf, &len);
|
|
|
|
|
if (sw)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_vendor_specific_init: GET_TLV_IOCTL failed: %d\n", sw);
|
|
|
|
|
return SW_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
while (p < buf + len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char tag = *p++;
|
|
|
|
|
int l = *p++;
|
|
|
|
|
unsigned int v = 0;
|
|
|
|
|
|
|
|
|
|
/* Umm... here is little endian, while the encoding above is big. */
|
|
|
|
|
if (l == 1)
|
|
|
|
|
v = p[0];
|
|
|
|
|
else if (l == 2)
|
2015-02-12 20:40:39 +01:00
|
|
|
|
v = (((unsigned int)p[1] << 8) | p[0]);
|
2013-08-30 11:06:50 +09:00
|
|
|
|
else if (l == 4)
|
2015-02-12 20:40:39 +01:00
|
|
|
|
v = (((unsigned int)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
|
2013-08-30 11:06:50 +09:00
|
|
|
|
|
|
|
|
|
if (tag == PCSCv2_PART10_PROPERTY_bMinPINSize)
|
|
|
|
|
reader_table[slot].pcsc.pinmin = v;
|
|
|
|
|
else if (tag == PCSCv2_PART10_PROPERTY_bMaxPINSize)
|
|
|
|
|
reader_table[slot].pcsc.pinmax = v;
|
|
|
|
|
else if (tag == PCSCv2_PART10_PROPERTY_wIdVendor)
|
|
|
|
|
vendor = v;
|
|
|
|
|
else if (tag == PCSCv2_PART10_PROPERTY_wIdProduct)
|
|
|
|
|
product = v;
|
|
|
|
|
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("TLV properties: tag=%02X, len=%d, v=%08X\n", tag, l, v);
|
|
|
|
|
|
|
|
|
|
p += l;
|
|
|
|
|
}
|
|
|
|
|
|
2013-08-30 09:28:17 +02:00
|
|
|
|
if (vendor == VENDOR_VEGA && product == VEGA_ALPHA)
|
2013-08-30 11:06:50 +09:00
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* Please read the comment of ccid_vendor_specific_init in
|
|
|
|
|
* ccid-driver.c.
|
|
|
|
|
*/
|
|
|
|
|
const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
|
|
|
|
|
sw = control_pcsc (slot, CM_IOCTL_VENDOR_IFD_EXCHANGE,
|
|
|
|
|
cmd, sizeof (cmd), NULL, 0);
|
|
|
|
|
if (sw)
|
|
|
|
|
return SW_NOT_SUPPORTED;
|
|
|
|
|
}
|
2013-08-30 09:28:17 +02:00
|
|
|
|
else if (vendor == VENDOR_SCM && product == SCM_SPR532) /* SCM SPR532 */
|
2013-08-30 11:06:50 +09:00
|
|
|
|
{
|
|
|
|
|
reader_table[slot].is_spr532 = 1;
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
|
|
|
|
}
|
2015-06-22 14:31:25 +09:00
|
|
|
|
else if (vendor == 0x046a && product == 0x003e) /* Cherry ST-2xxx */
|
|
|
|
|
{
|
|
|
|
|
reader_table[slot].pcsc.pinmax = 15;
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (vendor == 0x0c4b /* Tested with Reiner cyberJack GO */
|
2013-10-16 09:52:18 +09:00
|
|
|
|
|| vendor == 0x1a44 /* Tested with Vasco DIGIPASS 920 */
|
|
|
|
|
|| vendor == 0x234b /* Tested with FSIJ Gnuk Token */
|
|
|
|
|
|| vendor == 0x0d46 /* Tested with KAAN Advanced??? */)
|
|
|
|
|
reader_table[slot].pinpad_varlen_supported = 1;
|
2013-08-30 11:06:50 +09:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
/* Open the PC/SC reader without using the wrapper. Returns -1 on
|
|
|
|
|
error or a slot number for the reader. */
|
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
open_pcsc_reader_direct (const char *portstr)
|
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
int slot;
|
|
|
|
|
char *list = NULL;
|
2015-04-30 12:36:38 +09:00
|
|
|
|
char *rdrname = NULL;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
pcsc_dword_t nreader;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
slot = new_reader_slot ();
|
|
|
|
|
if (slot == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* Fixme: Allocating a context for each slot is not required. One
|
|
|
|
|
global context should be sufficient. */
|
|
|
|
|
err = pcsc_establish_context (PCSC_SCOPE_SYSTEM, NULL, NULL,
|
|
|
|
|
&reader_table[slot].pcsc.context);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_establish_context failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
reader_table[slot].used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = pcsc_list_readers (reader_table[slot].pcsc.context,
|
|
|
|
|
NULL, NULL, &nreader);
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
list = xtrymalloc (nreader+1); /* Better add 1 for safety reasons. */
|
|
|
|
|
if (!list)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error allocating memory for reader list\n");
|
|
|
|
|
pcsc_release_context (reader_table[slot].pcsc.context);
|
|
|
|
|
reader_table[slot].used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return -1 /*SW_HOST_OUT_OF_CORE*/;
|
|
|
|
|
}
|
|
|
|
|
err = pcsc_list_readers (reader_table[slot].pcsc.context,
|
|
|
|
|
NULL, list, &nreader);
|
|
|
|
|
}
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("pcsc_list_readers failed: %s (0x%lx)\n",
|
|
|
|
|
pcsc_error_string (err), err);
|
|
|
|
|
pcsc_release_context (reader_table[slot].pcsc.context);
|
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
xfree (list);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return -1;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
p = list;
|
|
|
|
|
while (nreader)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (!*p && !p[1])
|
|
|
|
|
break;
|
2015-04-30 12:36:38 +09:00
|
|
|
|
log_info ("detected reader '%s'\n", p);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (nreader < (strlen (p)+1))
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response from pcsc_list_readers\n");
|
|
|
|
|
break;
|
|
|
|
|
}
|
2015-04-30 12:36:38 +09:00
|
|
|
|
if (!rdrname && portstr && !strncmp (p, portstr, strlen (portstr)))
|
|
|
|
|
rdrname = p;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
nreader -= strlen (p)+1;
|
|
|
|
|
p += strlen (p) + 1;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
2015-04-30 12:36:38 +09:00
|
|
|
|
if (!rdrname)
|
|
|
|
|
rdrname = list;
|
|
|
|
|
|
|
|
|
|
reader_table[slot].rdrname = xtrystrdup (rdrname);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (!reader_table[slot].rdrname)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
log_error ("error allocating memory for reader name\n");
|
|
|
|
|
pcsc_release_context (reader_table[slot].pcsc.context);
|
|
|
|
|
reader_table[slot].used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return -1;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
xfree (list);
|
|
|
|
|
list = NULL;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[slot].pcsc.card = 0;
|
|
|
|
|
reader_table[slot].atrlen = 0;
|
|
|
|
|
reader_table[slot].last_status = 0;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[slot].connect_card = connect_pcsc_card;
|
|
|
|
|
reader_table[slot].disconnect_card = disconnect_pcsc_card;
|
|
|
|
|
reader_table[slot].close_reader = close_pcsc_reader;
|
|
|
|
|
reader_table[slot].reset_reader = reset_pcsc_reader;
|
|
|
|
|
reader_table[slot].get_status_reader = pcsc_get_status;
|
|
|
|
|
reader_table[slot].send_apdu_reader = pcsc_send_apdu;
|
|
|
|
|
reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
dump_reader_status (slot);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return slot;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER */
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
/* Open the PC/SC reader using the pcsc_wrapper program. This is
|
|
|
|
|
needed to cope with different thread models and other peculiarities
|
|
|
|
|
of libpcsclite. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
static int
|
|
|
|
|
open_pcsc_reader_wrapped (const char *portstr)
|
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int slot;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
int fd, rp[2], wp[2];
|
|
|
|
|
int n, i;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
size_t len;
|
|
|
|
|
unsigned char msgbuf[9];
|
|
|
|
|
int err;
|
2005-09-05 14:36:36 +00:00
|
|
|
|
unsigned int dummy_status;
|
2011-08-10 14:11:30 +02:00
|
|
|
|
|
2015-11-16 12:41:46 +01:00
|
|
|
|
/* Note that we use the constant and not the function because this
|
2007-06-14 17:05:07 +00:00
|
|
|
|
code won't be be used under Windows. */
|
2006-11-21 11:00:14 +00:00
|
|
|
|
const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
|
2005-12-06 16:44:20 +00:00
|
|
|
|
|
|
|
|
|
if (access (wrapperpgm, X_OK))
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("can't run PC/SC access module '%s': %s\n",
|
2005-12-06 16:44:20 +00:00
|
|
|
|
wrapperpgm, strerror (errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
slot = new_reader_slot ();
|
|
|
|
|
if (slot == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
/* Fire up the PC/SCc wrapper. We don't use any fork/exec code from
|
|
|
|
|
the common directy but implement it directly so that this file
|
2004-07-16 15:45:25 +00:00
|
|
|
|
may still be source copied. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (pipe (rp) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error creating a pipe: %s\n", strerror (errno));
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (pipe (wp) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error creating a pipe: %s\n", strerror (errno));
|
|
|
|
|
close (rp[0]);
|
|
|
|
|
close (rp[1]);
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
pid = fork ();
|
|
|
|
|
if (pid == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error forking process: %s\n", strerror (errno));
|
|
|
|
|
close (rp[0]);
|
|
|
|
|
close (rp[1]);
|
|
|
|
|
close (wp[0]);
|
|
|
|
|
close (wp[1]);
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
slotp->pcsc.pid = pid;
|
|
|
|
|
|
|
|
|
|
if (!pid)
|
|
|
|
|
{ /*
|
|
|
|
|
=== Child ===
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Double fork. */
|
|
|
|
|
pid = fork ();
|
|
|
|
|
if (pid == -1)
|
2005-02-24 17:36:11 +00:00
|
|
|
|
_exit (31);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (pid)
|
|
|
|
|
_exit (0); /* Immediate exit this parent, so that the child
|
|
|
|
|
gets cleaned up by the init process. */
|
|
|
|
|
|
|
|
|
|
/* Connect our pipes. */
|
|
|
|
|
if (wp[0] != 0 && dup2 (wp[0], 0) == -1)
|
|
|
|
|
log_fatal ("dup2 stdin failed: %s\n", strerror (errno));
|
|
|
|
|
if (rp[1] != 1 && dup2 (rp[1], 1) == -1)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
log_fatal ("dup2 stdout failed: %s\n", strerror (errno));
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Send stderr to the bit bucket. */
|
|
|
|
|
fd = open ("/dev/null", O_WRONLY);
|
|
|
|
|
if (fd == -1)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_fatal ("can't open '/dev/null': %s", strerror (errno));
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (fd != 2 && dup2 (fd, 2) == -1)
|
|
|
|
|
log_fatal ("dup2 stderr failed: %s\n", strerror (errno));
|
|
|
|
|
|
|
|
|
|
/* Close all other files. */
|
2009-03-19 07:09:31 +00:00
|
|
|
|
close_all_fds (3, NULL);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2005-12-06 16:44:20 +00:00
|
|
|
|
execl (wrapperpgm,
|
2004-04-20 14:17:10 +00:00
|
|
|
|
"pcsc-wrapper",
|
|
|
|
|
"--",
|
|
|
|
|
"1", /* API version */
|
|
|
|
|
opt.pcsc_driver, /* Name of the PC/SC library. */
|
|
|
|
|
NULL);
|
|
|
|
|
_exit (31);
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
2004-04-20 14:17:10 +00:00
|
|
|
|
=== Parent ===
|
|
|
|
|
*/
|
|
|
|
|
close (wp[0]);
|
|
|
|
|
close (rp[1]);
|
|
|
|
|
slotp->pcsc.req_fd = wp[1];
|
|
|
|
|
slotp->pcsc.rsp_fd = rp[0];
|
|
|
|
|
|
|
|
|
|
/* Wait for the intermediate child to terminate. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
#define WAIT npth_waitpid
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#else
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#define WAIT waitpid
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#endif
|
|
|
|
|
while ( (i=WAIT (pid, NULL, 0)) == -1 && errno == EINTR)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
#undef WAIT
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
/* Now send the open request. */
|
|
|
|
|
msgbuf[0] = 0x01; /* OPEN command. */
|
|
|
|
|
len = portstr? strlen (portstr):0;
|
|
|
|
|
msgbuf[1] = (len >> 24);
|
|
|
|
|
msgbuf[2] = (len >> 16);
|
|
|
|
|
msgbuf[3] = (len >> 8);
|
|
|
|
|
msgbuf[4] = (len );
|
|
|
|
|
if ( writen (slotp->pcsc.req_fd, msgbuf, 5)
|
|
|
|
|
|| (portstr && writen (slotp->pcsc.req_fd, portstr, len)))
|
|
|
|
|
{
|
|
|
|
|
log_error ("error sending PC/SC OPEN request: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
/* Read the response. */
|
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, msgbuf, 9, &len)) || len != 9)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC OPEN response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
len = buf32_to_size_t (msgbuf+1);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (msgbuf[0] != 0x81 || len < 4)
|
|
|
|
|
{
|
|
|
|
|
log_error ("invalid response header from PC/SC received\n");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
len -= 4; /* Already read the error code. */
|
|
|
|
|
if (len > DIM (slotp->atr))
|
|
|
|
|
{
|
2005-07-20 15:05:05 +00:00
|
|
|
|
log_error ("PC/SC returned a too large ATR (len=%lx)\n",
|
|
|
|
|
(unsigned long)len);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2015-02-11 10:27:57 +01:00
|
|
|
|
err = PCSC_ERR_MASK (buf32_to_ulong (msgbuf+5));
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err));
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|
|
|
|
|
slotp->last_status = 0;
|
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
/* The open request may return a zero for the ATR length to
|
2004-10-20 08:54:45 +00:00
|
|
|
|
indicate that no card is present. */
|
2004-04-20 14:17:10 +00:00
|
|
|
|
n = len;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (n)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if ((i=readn (slotp->pcsc.rsp_fd, slotp->atr, n, &len)) || len != n)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error receiving PC/SC OPEN response: %s\n",
|
|
|
|
|
i? strerror (errno) : "premature EOF");
|
|
|
|
|
goto command_failed;
|
|
|
|
|
}
|
|
|
|
|
/* If we got to here we know that a card is present
|
|
|
|
|
and usable. Thus remember this. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
slotp->last_status = ( APDU_CARD_USABLE
|
|
|
|
|
| APDU_CARD_PRESENT
|
2008-12-18 16:34:28 +00:00
|
|
|
|
| APDU_CARD_ACTIVE);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
slotp->atrlen = len;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[slot].close_reader = close_pcsc_reader;
|
|
|
|
|
reader_table[slot].reset_reader = reset_pcsc_reader;
|
|
|
|
|
reader_table[slot].get_status_reader = pcsc_get_status;
|
|
|
|
|
reader_table[slot].send_apdu_reader = pcsc_send_apdu;
|
|
|
|
|
reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pcsc_vendor_specific_init (slot);
|
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
/* Read the status so that IS_T0 will be set. */
|
|
|
|
|
pcsc_get_status (slot, &dummy_status);
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dump_reader_status (slot);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return slot;
|
|
|
|
|
|
|
|
|
|
command_failed:
|
|
|
|
|
close (slotp->pcsc.req_fd);
|
|
|
|
|
close (slotp->pcsc.rsp_fd);
|
|
|
|
|
slotp->pcsc.req_fd = -1;
|
|
|
|
|
slotp->pcsc.rsp_fd = -1;
|
2012-04-09 20:52:22 -04:00
|
|
|
|
if (slotp->pcsc.pid != -1)
|
|
|
|
|
kill (slotp->pcsc.pid, SIGTERM);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
slotp->pcsc.pid = (pid_t)(-1);
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/* There is no way to return SW. */
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return -1;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
}
|
|
|
|
|
#endif /*NEED_PCSC_WRAPPER*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
static int
|
|
|
|
|
open_pcsc_reader (const char *portstr)
|
|
|
|
|
{
|
|
|
|
|
#ifdef NEED_PCSC_WRAPPER
|
|
|
|
|
return open_pcsc_reader_wrapped (portstr);
|
|
|
|
|
#else
|
|
|
|
|
return open_pcsc_reader_direct (portstr);
|
|
|
|
|
#endif
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-11-28 16:16:38 +09:00
|
|
|
|
/* Check whether the reader supports the ISO command code COMMAND
|
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
|
|
|
|
on the pinpad. Return 0 on success. */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
static int
|
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
|
|
|
|
check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
2013-08-30 11:06:50 +09:00
|
|
|
|
int r;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2013-11-11 16:41:43 +09:00
|
|
|
|
if (reader_table[slot].pcsc.pinmin >= 0)
|
|
|
|
|
pininfo->minlen = reader_table[slot].pcsc.pinmin;
|
|
|
|
|
|
|
|
|
|
if (reader_table[slot].pcsc.pinmax >= 0)
|
|
|
|
|
pininfo->maxlen = reader_table[slot].pcsc.pinmax;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2013-11-13 16:43:26 +09:00
|
|
|
|
if (!pininfo->minlen)
|
|
|
|
|
pininfo->minlen = 1;
|
|
|
|
|
if (!pininfo->maxlen)
|
|
|
|
|
pininfo->maxlen = 15;
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
if ((command == ISO7816_VERIFY && reader_table[slot].pcsc.verify_ioctl != 0)
|
|
|
|
|
|| (command == ISO7816_CHANGE_REFERENCE_DATA
|
|
|
|
|
&& reader_table[slot].pcsc.modify_ioctl != 0))
|
|
|
|
|
r = 0; /* Success */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
else
|
2013-08-30 11:06:50 +09:00
|
|
|
|
r = SW_NOT_SUPPORTED;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("check_pcsc_pinpad: command=%02X, r=%d\n",
|
|
|
|
|
(unsigned int)command, r);
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
if (reader_table[slot].pinpad_varlen_supported)
|
|
|
|
|
pininfo->fixedlen = 0;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
return r;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
}
|
|
|
|
|
|
2011-12-02 13:57:12 +09:00
|
|
|
|
#define PIN_VERIFY_STRUCTURE_SIZE 24
|
2011-11-28 16:16:38 +09:00
|
|
|
|
static int
|
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
|
|
|
|
pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
unsigned char *pin_verify;
|
2013-01-09 16:40:41 +09:00
|
|
|
|
int len = PIN_VERIFY_STRUCTURE_SIZE + pininfo->fixedlen;
|
2015-06-23 10:10:15 +09:00
|
|
|
|
/*
|
|
|
|
|
* The result buffer is only expected to have two-byte result on
|
|
|
|
|
* return. However, some implementation uses this buffer for lower
|
|
|
|
|
* layer too and it assumes that there is enough space for lower
|
|
|
|
|
* layer communication. Such an implementation fails for TPDU
|
|
|
|
|
* readers with "insufficient buffer", as it needs header and
|
|
|
|
|
* trailer. Six is the number for header + result + trailer (TPDU).
|
|
|
|
|
*/
|
|
|
|
|
unsigned char result[6];
|
|
|
|
|
pcsc_dword_t resultlen = 6;
|
2013-08-21 16:45:48 +02:00
|
|
|
|
int no_lc;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (sw = reset_pcsc_reader (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
2013-01-09 16:40:41 +09:00
|
|
|
|
if (pininfo->fixedlen < 0 || pininfo->fixedlen >= 16)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
return SW_NOT_SUPPORTED;
|
|
|
|
|
|
|
|
|
|
pin_verify = xtrymalloc (len);
|
|
|
|
|
if (!pin_verify)
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
|
2013-08-21 16:45:48 +02:00
|
|
|
|
no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pin_verify[0] = 0x00; /* bTimeOut */
|
|
|
|
|
pin_verify[1] = 0x00; /* bTimeOut2 */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
pin_verify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
|
2013-01-09 16:40:41 +09:00
|
|
|
|
pin_verify[3] = pininfo->fixedlen; /* bmPINBlockString */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
pin_verify[4] = 0x00; /* bmPINLengthFormat */
|
|
|
|
|
pin_verify[5] = pininfo->maxlen; /* wPINMaxExtraDigit */
|
|
|
|
|
pin_verify[6] = pininfo->minlen; /* wPINMaxExtraDigit */
|
|
|
|
|
pin_verify[7] = 0x02; /* bEntryValidationCondition: Validation key pressed */
|
|
|
|
|
if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
|
|
|
|
|
pin_verify[7] |= 0x01; /* Max size reached. */
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pin_verify[8] = 0x01; /* bNumberMessage: One message */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
pin_verify[9] = 0x09; /* wLangId: 0x0409: US English */
|
|
|
|
|
pin_verify[10] = 0x04; /* wLangId: 0x0409: US English */
|
|
|
|
|
pin_verify[11] = 0x00; /* bMsgIndex */
|
|
|
|
|
pin_verify[12] = 0x00; /* bTeoPrologue[0] */
|
|
|
|
|
pin_verify[13] = 0x00; /* bTeoPrologue[1] */
|
2013-08-21 16:45:48 +02:00
|
|
|
|
pin_verify[14] = pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
|
|
|
|
|
pin_verify[15] = pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
|
2011-11-28 16:16:38 +09:00
|
|
|
|
pin_verify[16] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_verify[17] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_verify[18] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_verify[19] = class; /* abData[0] */
|
|
|
|
|
pin_verify[20] = ins; /* abData[1] */
|
|
|
|
|
pin_verify[21] = p0; /* abData[2] */
|
|
|
|
|
pin_verify[22] = p1; /* abData[3] */
|
2013-01-09 16:40:41 +09:00
|
|
|
|
pin_verify[23] = pininfo->fixedlen; /* abData[4] */
|
|
|
|
|
if (pininfo->fixedlen)
|
|
|
|
|
memset (&pin_verify[24], 0xff, pininfo->fixedlen);
|
2013-08-21 16:45:48 +02:00
|
|
|
|
else if (no_lc)
|
|
|
|
|
len--;
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|
2011-12-20 13:34:27 +09:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
|
|
|
|
|
class, ins, p0, p1, len, pininfo->maxlen);
|
|
|
|
|
|
2011-11-28 16:16:38 +09:00
|
|
|
|
sw = control_pcsc (slot, reader_table[slot].pcsc.verify_ioctl,
|
|
|
|
|
pin_verify, len, result, &resultlen);
|
|
|
|
|
xfree (pin_verify);
|
|
|
|
|
if (sw || resultlen < 2)
|
2011-12-20 13:34:27 +09:00
|
|
|
|
{
|
|
|
|
|
log_error ("control_pcsc failed: %d\n", sw);
|
|
|
|
|
return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
}
|
2011-11-28 16:16:38 +09:00
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
2011-12-20 13:34:27 +09:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug (" response: sw=%04X datalen=%d\n", sw, (unsigned int)resultlen);
|
2011-11-28 16:16:38 +09:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
2011-11-29 11:59:32 +09:00
|
|
|
|
|
|
|
|
|
|
2011-12-02 13:57:12 +09:00
|
|
|
|
#define PIN_MODIFY_STRUCTURE_SIZE 29
|
2011-11-29 11:59:32 +09:00
|
|
|
|
static int
|
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
|
|
|
|
pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2011-11-29 11:59:32 +09:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
unsigned char *pin_modify;
|
2013-01-09 16:40:41 +09:00
|
|
|
|
int len = PIN_MODIFY_STRUCTURE_SIZE + 2 * pininfo->fixedlen;
|
2015-06-23 10:10:15 +09:00
|
|
|
|
unsigned char result[6]; /* See the comment at pinpad_verify. */
|
|
|
|
|
pcsc_dword_t resultlen = 6;
|
2013-08-21 16:45:48 +02:00
|
|
|
|
int no_lc;
|
2011-11-29 11:59:32 +09:00
|
|
|
|
|
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (sw = reset_pcsc_reader (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
2013-01-09 16:40:41 +09:00
|
|
|
|
if (pininfo->fixedlen < 0 || pininfo->fixedlen >= 16)
|
2011-11-29 11:59:32 +09:00
|
|
|
|
return SW_NOT_SUPPORTED;
|
|
|
|
|
|
|
|
|
|
pin_modify = xtrymalloc (len);
|
|
|
|
|
if (!pin_modify)
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
|
2013-08-21 16:45:48 +02:00
|
|
|
|
no_lc = (!pininfo->fixedlen && reader_table[slot].is_spr532);
|
|
|
|
|
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pin_modify[0] = 0x00; /* bTimeOut */
|
|
|
|
|
pin_modify[1] = 0x00; /* bTimeOut2 */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[2] = 0x82; /* bmFormatString: Byte, pos=0, left, ASCII. */
|
2013-01-09 16:40:41 +09:00
|
|
|
|
pin_modify[3] = pininfo->fixedlen; /* bmPINBlockString */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[4] = 0x00; /* bmPINLengthFormat */
|
|
|
|
|
pin_modify[5] = 0x00; /* bInsertionOffsetOld */
|
2013-01-09 16:40:41 +09:00
|
|
|
|
pin_modify[6] = pininfo->fixedlen; /* bInsertionOffsetNew */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[7] = pininfo->maxlen; /* wPINMaxExtraDigit */
|
|
|
|
|
pin_modify[8] = pininfo->minlen; /* wPINMaxExtraDigit */
|
2011-12-02 13:57:12 +09:00
|
|
|
|
pin_modify[9] = (p0 == 0 ? 0x03 : 0x01);
|
|
|
|
|
/* bConfirmPIN
|
|
|
|
|
* 0x00: new PIN once
|
|
|
|
|
* 0x01: new PIN twice (confirmation)
|
|
|
|
|
* 0x02: old PIN and new PIN once
|
|
|
|
|
* 0x03: old PIN and new PIN twice (confirmation)
|
|
|
|
|
*/
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[10] = 0x02; /* bEntryValidationCondition: Validation key pressed */
|
|
|
|
|
if (pininfo->minlen && pininfo->maxlen && pininfo->minlen == pininfo->maxlen)
|
|
|
|
|
pin_modify[10] |= 0x01; /* Max size reached. */
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pin_modify[11] = 0x03; /* bNumberMessage: Three messages */
|
2013-08-21 16:45:48 +02:00
|
|
|
|
pin_modify[12] = 0x09; /* wLangId: 0x0409: US English */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[13] = 0x04; /* wLangId: 0x0409: US English */
|
|
|
|
|
pin_modify[14] = 0x00; /* bMsgIndex1 */
|
2013-08-30 11:06:50 +09:00
|
|
|
|
pin_modify[15] = 0x01; /* bMsgIndex2 */
|
|
|
|
|
pin_modify[16] = 0x02; /* bMsgIndex3 */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[17] = 0x00; /* bTeoPrologue[0] */
|
|
|
|
|
pin_modify[18] = 0x00; /* bTeoPrologue[1] */
|
2013-08-21 16:45:48 +02:00
|
|
|
|
pin_modify[19] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* bTeoPrologue[2] */
|
|
|
|
|
pin_modify[20] = 2 * pininfo->fixedlen + 0x05 - no_lc; /* ulDataLength */
|
2011-11-29 11:59:32 +09:00
|
|
|
|
pin_modify[21] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_modify[22] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_modify[23] = 0x00; /* ulDataLength */
|
|
|
|
|
pin_modify[24] = class; /* abData[0] */
|
|
|
|
|
pin_modify[25] = ins; /* abData[1] */
|
|
|
|
|
pin_modify[26] = p0; /* abData[2] */
|
|
|
|
|
pin_modify[27] = p1; /* abData[3] */
|
2013-01-09 16:40:41 +09:00
|
|
|
|
pin_modify[28] = 2 * pininfo->fixedlen; /* abData[4] */
|
|
|
|
|
if (pininfo->fixedlen)
|
|
|
|
|
memset (&pin_modify[29], 0xff, 2 * pininfo->fixedlen);
|
2013-08-21 16:45:48 +02:00
|
|
|
|
else if (no_lc)
|
|
|
|
|
len--;
|
2011-11-29 11:59:32 +09:00
|
|
|
|
|
2011-12-20 13:34:27 +09:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("send secure: c=%02X i=%02X p1=%02X p2=%02X len=%d pinmax=%d\n",
|
|
|
|
|
class, ins, p0, p1, len, (int)pininfo->maxlen);
|
|
|
|
|
|
2011-11-29 11:59:32 +09:00
|
|
|
|
sw = control_pcsc (slot, reader_table[slot].pcsc.modify_ioctl,
|
|
|
|
|
pin_modify, len, result, &resultlen);
|
|
|
|
|
xfree (pin_modify);
|
|
|
|
|
if (sw || resultlen < 2)
|
2011-12-20 13:34:27 +09:00
|
|
|
|
{
|
|
|
|
|
log_error ("control_pcsc failed: %d\n", sw);
|
|
|
|
|
return sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
}
|
2011-11-29 11:59:32 +09:00
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
2011-12-20 13:34:27 +09:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug (" response: sw=%04X datalen=%d\n", sw, (unsigned int)resultlen);
|
2011-11-29 11:59:32 +09:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
#ifdef HAVE_LIBUSB
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
2004-07-16 15:45:25 +00:00
|
|
|
|
Internal CCID driver interface.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dump_ccid_reader_status (int slot)
|
|
|
|
|
{
|
|
|
|
|
log_info ("reader slot %d: using ccid driver\n", slot);
|
2003-09-02 19:06:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
static int
|
|
|
|
|
close_ccid_reader (int slot)
|
|
|
|
|
{
|
|
|
|
|
ccid_close_reader (reader_table[slot].ccid.handle);
|
2015-11-09 16:15:44 +09:00
|
|
|
|
reader_table[slot].rdrname = NULL;
|
2003-10-21 17:12:50 +00:00
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
return 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
static int
|
|
|
|
|
shutdown_ccid_reader (int slot)
|
|
|
|
|
{
|
|
|
|
|
ccid_shutdown_reader (reader_table[slot].ccid.handle);
|
|
|
|
|
return 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static int
|
|
|
|
|
reset_ccid_reader (int slot)
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
reader_table_t slotp = reader_table + slot;
|
|
|
|
|
unsigned char atr[33];
|
|
|
|
|
size_t atrlen;
|
|
|
|
|
|
|
|
|
|
err = ccid_get_atr (slotp->ccid.handle, atr, sizeof atr, &atrlen);
|
|
|
|
|
if (err)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return err;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* If the reset was successful, update the ATR. */
|
|
|
|
|
assert (sizeof slotp->atr >= sizeof atr);
|
|
|
|
|
slotp->atrlen = atrlen;
|
|
|
|
|
memcpy (slotp->atr, atr, atrlen);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dump_reader_status (slot);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2009-07-13 09:59:22 +00:00
|
|
|
|
static int
|
|
|
|
|
set_progress_cb_ccid_reader (int slot, gcry_handler_progress_t cb, void *cb_arg)
|
|
|
|
|
{
|
|
|
|
|
reader_table_t slotp = reader_table + slot;
|
|
|
|
|
|
|
|
|
|
return ccid_set_progress_cb (slotp->ccid.handle, cb, cb_arg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static int
|
|
|
|
|
get_status_ccid (int slot, unsigned int *status)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
int bits;
|
|
|
|
|
|
|
|
|
|
rc = ccid_slot_status (reader_table[slot].ccid.handle, &bits);
|
|
|
|
|
if (rc)
|
2009-07-16 15:54:59 +00:00
|
|
|
|
return rc;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
if (bits == 0)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
*status = (APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
else if (bits == 1)
|
2008-10-14 18:18:21 +00:00
|
|
|
|
*status = APDU_CARD_PRESENT;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
else
|
2004-04-20 14:17:10 +00:00
|
|
|
|
*status = 0;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
|
|
|
|
/* Actually send the APDU of length APDULEN to SLOT and return a
|
|
|
|
|
maximum of *BUFLEN data in BUFFER, the actual returned size will be
|
|
|
|
|
set to BUFLEN. Returns: Internal CCID driver error code. */
|
|
|
|
|
static int
|
|
|
|
|
send_apdu_ccid (int slot, unsigned char *apdu, size_t apdulen,
|
2005-11-28 11:52:25 +00:00
|
|
|
|
unsigned char *buffer, size_t *buflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2003-09-02 19:06:34 +00:00
|
|
|
|
{
|
|
|
|
|
long err;
|
|
|
|
|
size_t maxbuflen;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* If we don't have an ATR, we need to reset the reader first. */
|
|
|
|
|
if (!reader_table[slot].atrlen
|
|
|
|
|
&& (err = reset_ccid_reader (slot)))
|
|
|
|
|
return err;
|
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
2009-05-20 16:12:25 +00:00
|
|
|
|
log_printhex (" raw apdu:", apdu, apdulen);
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
|
|
|
|
maxbuflen = *buflen;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
if (pininfo)
|
|
|
|
|
err = ccid_transceive_secure (reader_table[slot].ccid.handle,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
apdu, apdulen, pininfo,
|
2005-11-28 11:52:25 +00:00
|
|
|
|
buffer, maxbuflen, buflen);
|
|
|
|
|
else
|
|
|
|
|
err = ccid_transceive (reader_table[slot].ccid.handle,
|
|
|
|
|
apdu, apdulen,
|
|
|
|
|
buffer, maxbuflen, buflen);
|
2003-09-02 19:06:34 +00:00
|
|
|
|
if (err)
|
|
|
|
|
log_error ("ccid_transceive failed: (0x%lx)\n",
|
|
|
|
|
err);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
|
|
|
|
return err;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
|
|
|
|
|
/* Check whether the CCID reader supports the ISO command code COMMAND
|
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
|
|
|
|
on the pinpad. Return 0 on success. For a description of the pin
|
2005-11-28 11:52:25 +00:00
|
|
|
|
parameters, see ccid-driver.c */
|
|
|
|
|
static int
|
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
|
|
|
|
check_ccid_pinpad (int slot, int command, pininfo_t *pininfo)
|
2005-11-28 11:52:25 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned char apdu[] = { 0, 0, 0, 0x81 };
|
|
|
|
|
|
|
|
|
|
apdu[1] = command;
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
return ccid_transceive_secure (reader_table[slot].ccid.handle, apdu,
|
|
|
|
|
sizeof apdu, pininfo, NULL, 0, NULL);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-11-28 16:16:38 +09:00
|
|
|
|
static int
|
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
|
|
|
|
ccid_pinpad_operation (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
unsigned char apdu[4];
|
|
|
|
|
int err, sw;
|
|
|
|
|
unsigned char result[2];
|
|
|
|
|
size_t resultlen = 2;
|
|
|
|
|
|
|
|
|
|
apdu[0] = class;
|
|
|
|
|
apdu[1] = ins;
|
|
|
|
|
apdu[2] = p0;
|
|
|
|
|
apdu[3] = p1;
|
|
|
|
|
err = ccid_transceive_secure (reader_table[slot].ccid.handle,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
apdu, sizeof apdu, pininfo,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
result, 2, &resultlen);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
if (resultlen < 2)
|
|
|
|
|
return SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
|
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Open the reader and try to read an ATR. */
|
|
|
|
|
static int
|
2004-09-30 14:34:34 +00:00
|
|
|
|
open_ccid_reader (const char *portstr)
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
int slot;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
|
|
|
|
|
slot = new_reader_slot ();
|
|
|
|
|
if (slot == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
2015-11-09 16:15:44 +09:00
|
|
|
|
err = ccid_open_reader (&slotp->ccid.handle, portstr,
|
|
|
|
|
(const char **)&slotp->rdrname);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = ccid_get_atr (slotp->ccid.handle,
|
|
|
|
|
slotp->atr, sizeof slotp->atr, &slotp->atrlen);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
slotp->atrlen = 0;
|
|
|
|
|
err = 0;
|
|
|
|
|
}
|
2004-10-20 08:54:45 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* If we got to here we know that a card is present
|
|
|
|
|
and usable. Thus remember this. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[slot].last_status = (APDU_CARD_USABLE
|
|
|
|
|
| APDU_CARD_PRESENT
|
2008-12-18 16:34:28 +00:00
|
|
|
|
| APDU_CARD_ACTIVE);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
reader_table[slot].close_reader = close_ccid_reader;
|
2004-09-30 14:34:34 +00:00
|
|
|
|
reader_table[slot].shutdown_reader = shutdown_ccid_reader;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[slot].reset_reader = reset_ccid_reader;
|
|
|
|
|
reader_table[slot].get_status_reader = get_status_ccid;
|
|
|
|
|
reader_table[slot].send_apdu_reader = send_apdu_ccid;
|
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
|
|
|
|
reader_table[slot].check_pinpad = check_ccid_pinpad;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[slot].dump_status_reader = dump_ccid_reader_status;
|
2009-07-13 09:59:22 +00:00
|
|
|
|
reader_table[slot].set_progress_cb = set_progress_cb_ccid_reader;
|
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
|
|
|
|
reader_table[slot].pinpad_verify = ccid_pinpad_operation;
|
|
|
|
|
reader_table[slot].pinpad_modify = ccid_pinpad_operation;
|
2009-03-26 19:27:04 +00:00
|
|
|
|
/* Our CCID reader code does not support T=0 at all, thus reset the
|
|
|
|
|
flag. */
|
|
|
|
|
reader_table[slot].is_t0 = 0;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dump_reader_status (slot);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return slot;
|
2003-09-02 19:06:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
#endif /* HAVE_LIBUSB */
|
|
|
|
|
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
#ifdef USE_G10CODE_RAPDU
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
2004-07-16 15:45:25 +00:00
|
|
|
|
The Remote APDU Interface.
|
|
|
|
|
|
|
|
|
|
This uses the Remote APDU protocol to contact a reader.
|
|
|
|
|
|
|
|
|
|
The port number is actually an index into the list of ports as
|
|
|
|
|
returned via the protocol.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
rapdu_status_to_sw (int status)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
switch (status)
|
|
|
|
|
{
|
|
|
|
|
case RAPDU_STATUS_SUCCESS: rc = 0; break;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
case RAPDU_STATUS_INVCMD:
|
|
|
|
|
case RAPDU_STATUS_INVPROT:
|
|
|
|
|
case RAPDU_STATUS_INVSEQ:
|
2004-07-16 15:45:25 +00:00
|
|
|
|
case RAPDU_STATUS_INVCOOKIE:
|
|
|
|
|
case RAPDU_STATUS_INVREADER: rc = SW_HOST_INV_VALUE; break;
|
|
|
|
|
|
|
|
|
|
case RAPDU_STATUS_TIMEOUT: rc = SW_HOST_CARD_IO_ERROR; break;
|
|
|
|
|
case RAPDU_STATUS_CARDIO: rc = SW_HOST_CARD_IO_ERROR; break;
|
|
|
|
|
case RAPDU_STATUS_NOCARD: rc = SW_HOST_NO_CARD; break;
|
|
|
|
|
case RAPDU_STATUS_CARDCHG: rc = SW_HOST_NO_CARD; break;
|
|
|
|
|
case RAPDU_STATUS_BUSY: rc = SW_HOST_BUSY; break;
|
|
|
|
|
case RAPDU_STATUS_NEEDRESET: rc = SW_HOST_CARD_INACTIVE; break;
|
|
|
|
|
|
|
|
|
|
default: rc = SW_HOST_GENERAL_ERROR; break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
static int
|
2004-07-16 15:45:25 +00:00
|
|
|
|
close_rapdu_reader (int slot)
|
2003-10-21 17:12:50 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rapdu_release (reader_table[slot].rapdu.handle);
|
2003-10-21 17:12:50 +00:00
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
static int
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reset_rapdu_reader (int slot)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
rapdu_msg_t msg = NULL;
|
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
|
|
|
|
err = rapdu_send_cmd (slotp->rapdu.handle, RAPDU_CMD_RESET);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("sending rapdu command RESET failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return rapdu_status_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
err = rapdu_read_msg (slotp->rapdu.handle, &msg);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("receiving rapdu message failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return rapdu_status_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
if (msg->cmd != RAPDU_STATUS_SUCCESS || !msg->datalen)
|
|
|
|
|
{
|
|
|
|
|
int sw = rapdu_status_to_sw (msg->cmd);
|
|
|
|
|
log_error ("rapdu command RESET failed: %s\n",
|
|
|
|
|
rapdu_strerror (msg->cmd));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2008-08-11 07:42:25 +00:00
|
|
|
|
if (msg->datalen > DIM (slotp->atr))
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("ATR returned by the RAPDU layer is too large\n");
|
|
|
|
|
rapdu_msg_release (msg);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return SW_HOST_INV_VALUE;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
slotp->atrlen = msg->datalen;
|
|
|
|
|
memcpy (slotp->atr, msg->data, msg->datalen);
|
|
|
|
|
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return 0;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-16 15:45:25 +00:00
|
|
|
|
my_rapdu_get_status (int slot, unsigned int *status)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
2004-08-05 09:24:36 +00:00
|
|
|
|
int err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
rapdu_msg_t msg = NULL;
|
|
|
|
|
int oldslot;
|
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
|
|
|
|
|
|
|
|
|
oldslot = rapdu_set_reader (slotp->rapdu.handle, slot);
|
|
|
|
|
err = rapdu_send_cmd (slotp->rapdu.handle, RAPDU_CMD_GET_STATUS);
|
|
|
|
|
rapdu_set_reader (slotp->rapdu.handle, oldslot);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("sending rapdu command GET_STATUS failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
return rapdu_status_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
err = rapdu_read_msg (slotp->rapdu.handle, &msg);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("receiving rapdu message failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return rapdu_status_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
if (msg->cmd != RAPDU_STATUS_SUCCESS || !msg->datalen)
|
|
|
|
|
{
|
|
|
|
|
int sw = rapdu_status_to_sw (msg->cmd);
|
|
|
|
|
log_error ("rapdu command GET_STATUS failed: %s\n",
|
|
|
|
|
rapdu_strerror (msg->cmd));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
*status = msg->data[0];
|
|
|
|
|
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return 0;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
}
|
2003-10-21 17:12:50 +00:00
|
|
|
|
|
|
|
|
|
|
2003-08-18 17:34:28 +00:00
|
|
|
|
/* Actually send the APDU of length APDULEN to SLOT and return a
|
|
|
|
|
maximum of *BUFLEN data in BUFFER, the actual returned size will be
|
2005-04-27 12:09:21 +00:00
|
|
|
|
set to BUFLEN. Returns: APDU error code. */
|
2003-08-18 17:34:28 +00:00
|
|
|
|
static int
|
2004-07-16 15:45:25 +00:00
|
|
|
|
my_rapdu_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
|
2005-11-28 11:52:25 +00:00
|
|
|
|
unsigned char *buffer, size_t *buflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2003-08-18 17:34:28 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int err;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
rapdu_msg_t msg = NULL;
|
|
|
|
|
size_t maxlen = *buflen;
|
|
|
|
|
|
|
|
|
|
slotp = reader_table + slot;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
*buflen = 0;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_printhex (" APDU_data:", apdu, apdulen);
|
|
|
|
|
|
|
|
|
|
if (apdulen < 4)
|
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("rapdu_send_apdu: APDU is too short\n");
|
|
|
|
|
return SW_HOST_INV_VALUE;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
err = rapdu_send_apdu (slotp->rapdu.handle, apdu, apdulen);
|
|
|
|
|
if (err)
|
2003-08-18 17:34:28 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("sending rapdu command APDU failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return rapdu_status_to_sw (err);
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
err = rapdu_read_msg (slotp->rapdu.handle, &msg);
|
|
|
|
|
if (err)
|
2003-08-18 17:34:28 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_error ("receiving rapdu message failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return rapdu_status_to_sw (err);
|
|
|
|
|
}
|
|
|
|
|
if (msg->cmd != RAPDU_STATUS_SUCCESS || !msg->datalen)
|
|
|
|
|
{
|
|
|
|
|
int sw = rapdu_status_to_sw (msg->cmd);
|
|
|
|
|
log_error ("rapdu command APDU failed: %s\n",
|
|
|
|
|
rapdu_strerror (msg->cmd));
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (msg->datalen > maxlen)
|
|
|
|
|
{
|
|
|
|
|
log_error ("rapdu response apdu too large\n");
|
|
|
|
|
rapdu_msg_release (msg);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
return SW_HOST_INV_VALUE;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*buflen = msg->datalen;
|
|
|
|
|
memcpy (buffer, msg->data, msg->datalen);
|
|
|
|
|
|
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
open_rapdu_reader (int portno,
|
|
|
|
|
const unsigned char *cookie, size_t length,
|
|
|
|
|
int (*readfnc) (void *opaque,
|
|
|
|
|
void *buffer, size_t size),
|
|
|
|
|
void *readfnc_value,
|
|
|
|
|
int (*writefnc) (void *opaque,
|
|
|
|
|
const void *buffer, size_t size),
|
|
|
|
|
void *writefnc_value,
|
|
|
|
|
void (*closefnc) (void *opaque),
|
|
|
|
|
void *closefnc_value)
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
int slot;
|
|
|
|
|
reader_table_t slotp;
|
|
|
|
|
rapdu_msg_t msg = NULL;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
slot = new_reader_slot ();
|
|
|
|
|
if (slot == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
slotp = reader_table + slot;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
slotp->rapdu.handle = rapdu_new ();
|
|
|
|
|
if (!slotp->rapdu.handle)
|
|
|
|
|
{
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-09-05 14:36:36 +00:00
|
|
|
|
rapdu_set_reader (slotp->rapdu.handle, portno);
|
2003-08-18 17:34:28 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rapdu_set_iofunc (slotp->rapdu.handle,
|
|
|
|
|
readfnc, readfnc_value,
|
|
|
|
|
writefnc, writefnc_value,
|
|
|
|
|
closefnc, closefnc_value);
|
|
|
|
|
rapdu_set_cookie (slotp->rapdu.handle, cookie, length);
|
|
|
|
|
|
|
|
|
|
/* First try to get the current ATR, but if the card is inactive
|
|
|
|
|
issue a reset instead. */
|
|
|
|
|
err = rapdu_send_cmd (slotp->rapdu.handle, RAPDU_CMD_GET_ATR);
|
|
|
|
|
if (err == RAPDU_STATUS_NEEDRESET)
|
|
|
|
|
err = rapdu_send_cmd (slotp->rapdu.handle, RAPDU_CMD_RESET);
|
2003-08-18 17:34:28 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_info ("sending rapdu command GET_ATR/RESET failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
goto failure;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
err = rapdu_read_msg (slotp->rapdu.handle, &msg);
|
|
|
|
|
if (err)
|
2003-08-18 17:34:28 +00:00
|
|
|
|
{
|
2004-07-16 15:45:25 +00:00
|
|
|
|
log_info ("receiving rapdu message failed: %s\n",
|
|
|
|
|
err < 0 ? strerror (errno): rapdu_strerror (err));
|
|
|
|
|
goto failure;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (msg->cmd != RAPDU_STATUS_SUCCESS || !msg->datalen)
|
|
|
|
|
{
|
|
|
|
|
log_info ("rapdu command GET ATR failed: %s\n",
|
|
|
|
|
rapdu_strerror (msg->cmd));
|
|
|
|
|
goto failure;
|
|
|
|
|
}
|
2008-08-11 07:42:25 +00:00
|
|
|
|
if (msg->datalen > DIM (slotp->atr))
|
2004-07-16 15:45:25 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("ATR returned by the RAPDU layer is too large\n");
|
|
|
|
|
goto failure;
|
|
|
|
|
}
|
|
|
|
|
slotp->atrlen = msg->datalen;
|
|
|
|
|
memcpy (slotp->atr, msg->data, msg->datalen);
|
|
|
|
|
|
|
|
|
|
reader_table[slot].close_reader = close_rapdu_reader;
|
|
|
|
|
reader_table[slot].reset_reader = reset_rapdu_reader;
|
|
|
|
|
reader_table[slot].get_status_reader = my_rapdu_get_status;
|
|
|
|
|
reader_table[slot].send_apdu_reader = my_rapdu_send_apdu;
|
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
|
|
|
|
reader_table[slot].check_pinpad = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
reader_table[slot].dump_status_reader = NULL;
|
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
|
|
|
|
reader_table[slot].pinpad_verify = NULL;
|
|
|
|
|
reader_table[slot].pinpad_modify = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
dump_reader_status (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rapdu_msg_release (msg);
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return slot;
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
failure:
|
2004-07-16 15:45:25 +00:00
|
|
|
|
rapdu_msg_release (msg);
|
|
|
|
|
rapdu_release (slotp->rapdu.handle);
|
|
|
|
|
slotp->used = 0;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
unlock_slot (slot);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
2003-08-18 17:34:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
#endif /*USE_G10CODE_RAPDU*/
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
/*
|
2003-08-05 17:11:04 +00:00
|
|
|
|
Driver Access
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Open the reader and return an internal slot number or -1 on
|
2003-08-05 17:11:04 +00:00
|
|
|
|
error. If PORTSTR is NULL we default to a suitable port (for ctAPI:
|
2005-04-27 12:09:21 +00:00
|
|
|
|
the first USB reader. For PC/SC the first listed reader). */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int
|
2012-12-04 14:37:56 +09:00
|
|
|
|
apdu_open_reader (const char *portstr)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static int pcsc_api_loaded, ct_api_loaded;
|
2010-05-03 11:10:49 +00:00
|
|
|
|
int slot;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_open_reader: portstr=%s\n", portstr);
|
|
|
|
|
|
2003-09-02 19:06:34 +00:00
|
|
|
|
#ifdef HAVE_LIBUSB
|
|
|
|
|
if (!opt.disable_ccid)
|
|
|
|
|
{
|
2011-02-23 10:15:34 +01:00
|
|
|
|
static int once_available;
|
2010-05-03 11:10:49 +00:00
|
|
|
|
int i;
|
2004-09-30 14:34:34 +00:00
|
|
|
|
const char *s;
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
slot = open_ccid_reader (portstr);
|
2003-09-02 19:06:34 +00:00
|
|
|
|
if (slot != -1)
|
2011-02-23 10:15:34 +01:00
|
|
|
|
{
|
|
|
|
|
once_available = 1;
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_open_reader => slot=%d [ccid]\n", slot);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
return slot; /* got one */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we ever loaded successfully loaded a CCID reader we never
|
|
|
|
|
want to fallback to another driver. This solves a problem
|
|
|
|
|
where ccid was used, the card unplugged and then scdaemon
|
|
|
|
|
tries to find a new reader and will eventually try PC/SC over
|
|
|
|
|
and over again. To reset this flag "gpgconf --kill scdaemon"
|
|
|
|
|
can be used. */
|
|
|
|
|
if (once_available)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_open_reader => slot=-1 (once_avail)\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-09-30 14:34:34 +00:00
|
|
|
|
|
|
|
|
|
/* If a CCID reader specification has been given, the user does
|
|
|
|
|
not want a fallback to other drivers. */
|
|
|
|
|
if (portstr)
|
|
|
|
|
for (s=portstr, i=0; *s; s++)
|
|
|
|
|
if (*s == ':' && (++i == 3))
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2003-09-02 19:06:34 +00:00
|
|
|
|
}
|
2004-09-30 14:34:34 +00:00
|
|
|
|
|
2003-09-06 13:23:48 +00:00
|
|
|
|
#endif /* HAVE_LIBUSB */
|
2003-09-02 19:06:34 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (opt.ctapi_driver && *opt.ctapi_driver)
|
|
|
|
|
{
|
|
|
|
|
int port = portstr? atoi (portstr) : 32768;
|
|
|
|
|
|
|
|
|
|
if (!ct_api_loaded)
|
|
|
|
|
{
|
|
|
|
|
void *handle;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
handle = dlopen (opt.ctapi_driver, RTLD_LAZY);
|
|
|
|
|
if (!handle)
|
|
|
|
|
{
|
2004-04-20 14:17:10 +00:00
|
|
|
|
log_error ("apdu_open_reader: failed to open driver: %s\n",
|
2003-08-05 17:11:04 +00:00
|
|
|
|
dlerror ());
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
CT_init = dlsym (handle, "CT_init");
|
|
|
|
|
CT_data = dlsym (handle, "CT_data");
|
|
|
|
|
CT_close = dlsym (handle, "CT_close");
|
|
|
|
|
if (!CT_init || !CT_data || !CT_close)
|
|
|
|
|
{
|
2003-10-25 14:22:42 +00:00
|
|
|
|
log_error ("apdu_open_reader: invalid CT-API driver\n");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
dlclose (handle);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
ct_api_loaded = 1;
|
|
|
|
|
}
|
|
|
|
|
return open_ct_reader (port);
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* No ctAPI configured, so lets try the PC/SC API */
|
|
|
|
|
if (!pcsc_api_loaded)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-04-20 14:17:10 +00:00
|
|
|
|
#ifndef NEED_PCSC_WRAPPER
|
2003-08-05 17:11:04 +00:00
|
|
|
|
void *handle;
|
|
|
|
|
|
2003-09-06 13:23:48 +00:00
|
|
|
|
handle = dlopen (opt.pcsc_driver, RTLD_LAZY);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!handle)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("apdu_open_reader: failed to open driver '%s': %s\n",
|
2003-09-06 13:23:48 +00:00
|
|
|
|
opt.pcsc_driver, dlerror ());
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
pcsc_establish_context = dlsym (handle, "SCardEstablishContext");
|
|
|
|
|
pcsc_release_context = dlsym (handle, "SCardReleaseContext");
|
|
|
|
|
pcsc_list_readers = dlsym (handle, "SCardListReaders");
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2003-10-25 14:22:42 +00:00
|
|
|
|
if (!pcsc_list_readers)
|
|
|
|
|
pcsc_list_readers = dlsym (handle, "SCardListReadersA");
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#endif
|
|
|
|
|
pcsc_get_status_change = dlsym (handle, "SCardGetStatusChange");
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (!pcsc_get_status_change)
|
|
|
|
|
pcsc_get_status_change = dlsym (handle, "SCardGetStatusChangeA");
|
2003-10-25 14:22:42 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pcsc_connect = dlsym (handle, "SCardConnect");
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2003-10-25 14:22:42 +00:00
|
|
|
|
if (!pcsc_connect)
|
|
|
|
|
pcsc_connect = dlsym (handle, "SCardConnectA");
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#endif
|
|
|
|
|
pcsc_reconnect = dlsym (handle, "SCardReconnect");
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (!pcsc_reconnect)
|
|
|
|
|
pcsc_reconnect = dlsym (handle, "SCardReconnectA");
|
2003-10-25 14:22:42 +00:00
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pcsc_disconnect = dlsym (handle, "SCardDisconnect");
|
|
|
|
|
pcsc_status = dlsym (handle, "SCardStatus");
|
2005-11-28 11:52:25 +00:00
|
|
|
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
2003-10-31 12:12:36 +00:00
|
|
|
|
if (!pcsc_status)
|
2003-10-25 14:22:42 +00:00
|
|
|
|
pcsc_status = dlsym (handle, "SCardStatusA");
|
|
|
|
|
#endif
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pcsc_begin_transaction = dlsym (handle, "SCardBeginTransaction");
|
|
|
|
|
pcsc_end_transaction = dlsym (handle, "SCardEndTransaction");
|
|
|
|
|
pcsc_transmit = dlsym (handle, "SCardTransmit");
|
|
|
|
|
pcsc_set_timeout = dlsym (handle, "SCardSetTimeout");
|
2011-11-28 16:16:38 +09:00
|
|
|
|
pcsc_control = dlsym (handle, "SCardControl");
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
if (!pcsc_establish_context
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|| !pcsc_release_context
|
|
|
|
|
|| !pcsc_list_readers
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|| !pcsc_get_status_change
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|| !pcsc_connect
|
2004-10-20 08:54:45 +00:00
|
|
|
|
|| !pcsc_reconnect
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|| !pcsc_disconnect
|
|
|
|
|
|| !pcsc_status
|
|
|
|
|
|| !pcsc_begin_transaction
|
|
|
|
|
|| !pcsc_end_transaction
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|| !pcsc_transmit
|
2011-11-28 16:16:38 +09:00
|
|
|
|
|| !pcsc_control
|
2003-10-25 14:22:42 +00:00
|
|
|
|
/* || !pcsc_set_timeout */)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2003-10-25 14:22:42 +00:00
|
|
|
|
/* Note that set_timeout is currently not used and also not
|
|
|
|
|
available under Windows. */
|
|
|
|
|
log_error ("apdu_open_reader: invalid PC/SC driver "
|
2011-11-28 16:16:38 +09:00
|
|
|
|
"(%d%d%d%d%d%d%d%d%d%d%d%d%d)\n",
|
2003-10-25 14:22:42 +00:00
|
|
|
|
!!pcsc_establish_context,
|
2005-02-24 17:36:11 +00:00
|
|
|
|
!!pcsc_release_context,
|
|
|
|
|
!!pcsc_list_readers,
|
|
|
|
|
!!pcsc_get_status_change,
|
|
|
|
|
!!pcsc_connect,
|
|
|
|
|
!!pcsc_reconnect,
|
2003-10-25 14:22:42 +00:00
|
|
|
|
!!pcsc_disconnect,
|
|
|
|
|
!!pcsc_status,
|
|
|
|
|
!!pcsc_begin_transaction,
|
|
|
|
|
!!pcsc_end_transaction,
|
2005-02-24 17:36:11 +00:00
|
|
|
|
!!pcsc_transmit,
|
2011-11-28 16:16:38 +09:00
|
|
|
|
!!pcsc_set_timeout,
|
|
|
|
|
!!pcsc_control );
|
2003-08-05 17:11:04 +00:00
|
|
|
|
dlclose (handle);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#endif /*!NEED_PCSC_WRAPPER*/
|
2003-08-05 17:11:04 +00:00
|
|
|
|
pcsc_api_loaded = 1;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2010-05-03 11:10:49 +00:00
|
|
|
|
slot = open_pcsc_reader (portstr);
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_open_reader => slot=%d [pc/sc]\n", slot);
|
2010-05-03 11:10:49 +00:00
|
|
|
|
return slot;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Open an remote reader and return an internal slot number or -1 on
|
|
|
|
|
error. This function is an alternative to apdu_open_reader and used
|
|
|
|
|
with remote readers only. Note that the supplied CLOSEFNC will
|
|
|
|
|
only be called once and the slot will not be valid afther this.
|
|
|
|
|
|
2015-11-16 12:41:46 +01:00
|
|
|
|
If PORTSTR is NULL we default to the first available port.
|
2005-02-24 17:36:11 +00:00
|
|
|
|
*/
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int
|
|
|
|
|
apdu_open_remote_reader (const char *portstr,
|
|
|
|
|
const unsigned char *cookie, size_t length,
|
|
|
|
|
int (*readfnc) (void *opaque,
|
|
|
|
|
void *buffer, size_t size),
|
|
|
|
|
void *readfnc_value,
|
|
|
|
|
int (*writefnc) (void *opaque,
|
|
|
|
|
const void *buffer, size_t size),
|
|
|
|
|
void *writefnc_value,
|
|
|
|
|
void (*closefnc) (void *opaque),
|
|
|
|
|
void *closefnc_value)
|
|
|
|
|
{
|
|
|
|
|
#ifdef USE_G10CODE_RAPDU
|
|
|
|
|
return open_rapdu_reader (portstr? atoi (portstr) : 0,
|
|
|
|
|
cookie, length,
|
|
|
|
|
readfnc, readfnc_value,
|
|
|
|
|
writefnc, writefnc_value,
|
|
|
|
|
closefnc, closefnc_value);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#else
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)portstr;
|
|
|
|
|
(void)cookie;
|
|
|
|
|
(void)length;
|
|
|
|
|
(void)readfnc;
|
|
|
|
|
(void)readfnc_value;
|
|
|
|
|
(void)writefnc;
|
|
|
|
|
(void)writefnc_value;
|
|
|
|
|
(void)closefnc;
|
|
|
|
|
(void)closefnc_value;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
#ifdef _WIN32
|
2004-10-20 08:54:45 +00:00
|
|
|
|
errno = ENOENT;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
#else
|
|
|
|
|
errno = ENOSYS;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
#endif
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return -1;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
int
|
|
|
|
|
apdu_close_reader (int slot)
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int sw;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_close_reader: slot=%d\n", slot);
|
|
|
|
|
|
2003-10-21 17:12:50 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_close_reader => SW_HOST_NO_DRIVER\n");
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
sw = apdu_disconnect (slot);
|
|
|
|
|
if (sw)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
2015-12-03 11:26:24 +09:00
|
|
|
|
/*
|
|
|
|
|
* When the reader/token was removed it might come here.
|
|
|
|
|
* It should go through to call CLOSE_READER even if we got an error.
|
|
|
|
|
*/
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
2015-12-03 11:26:24 +09:00
|
|
|
|
log_debug ("apdu_close_reader => 0x%x (apdu_disconnect)\n", sw);
|
2011-12-14 10:21:15 +01:00
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (reader_table[slot].close_reader)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
sw = reader_table[slot].close_reader (slot);
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_close_reader => 0x%x (close_reader)\n", sw);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_close_reader => SW_HOST_NOT_SUPPORTED\n");
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
2003-10-21 17:12:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-16 15:54:59 +00:00
|
|
|
|
|
|
|
|
|
/* Function suitable for a cleanup function to close all reader. It
|
|
|
|
|
should not be used if the reader will be opened again. The reason
|
|
|
|
|
for implementing this to properly close USB devices so that they
|
|
|
|
|
will startup the next time without error. */
|
|
|
|
|
void
|
|
|
|
|
apdu_prepare_exit (void)
|
|
|
|
|
{
|
|
|
|
|
static int sentinel;
|
|
|
|
|
int slot;
|
|
|
|
|
|
|
|
|
|
if (!sentinel)
|
|
|
|
|
{
|
|
|
|
|
sentinel = 1;
|
|
|
|
|
for (slot = 0; slot < MAX_READER; slot++)
|
|
|
|
|
if (reader_table[slot].used)
|
|
|
|
|
{
|
|
|
|
|
apdu_disconnect (slot);
|
|
|
|
|
if (reader_table[slot].close_reader)
|
|
|
|
|
reader_table[slot].close_reader (slot);
|
|
|
|
|
reader_table[slot].used = 0;
|
|
|
|
|
}
|
|
|
|
|
sentinel = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
/* Shutdown a reader; that is basically the same as a close but keeps
|
2008-10-14 18:18:21 +00:00
|
|
|
|
the handle ready for later use. A apdu_reset_reader or apdu_connect
|
|
|
|
|
should be used to get it active again. */
|
2004-09-30 14:34:34 +00:00
|
|
|
|
int
|
|
|
|
|
apdu_shutdown_reader (int slot)
|
|
|
|
|
{
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int sw;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_shutdown_reader: slot=%d\n", slot);
|
|
|
|
|
|
2004-09-30 14:34:34 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_shutdown_reader => SW_HOST_NO_DRIVER\n");
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
sw = apdu_disconnect (slot);
|
|
|
|
|
if (sw)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_shutdown_reader => 0x%x (apdu_disconnect)\n",
|
|
|
|
|
sw);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2004-09-30 14:34:34 +00:00
|
|
|
|
if (reader_table[slot].shutdown_reader)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
sw = reader_table[slot].shutdown_reader (slot);
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_shutdown_reader => 0x%x (close_reader)\n", sw);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_shutdown_reader => SW_HOST_NOT_SUPPORTED\n");
|
2004-09-30 14:34:34 +00:00
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Enumerate all readers and return information on whether this reader
|
|
|
|
|
is in use. The caller should start with SLOT set to 0 and
|
|
|
|
|
increment it with each call until an error is returned. */
|
|
|
|
|
int
|
|
|
|
|
apdu_enum_reader (int slot, int *used)
|
|
|
|
|
{
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER)
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
*used = reader_table[slot].used;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
/* Connect a card. This is used to power up the card and make sure
|
2011-12-12 20:34:12 +01:00
|
|
|
|
that an ATR is available. Depending on the reader backend it may
|
|
|
|
|
return an error for an inactive card or if no card is
|
|
|
|
|
available. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int
|
|
|
|
|
apdu_connect (int slot)
|
|
|
|
|
{
|
2015-09-28 13:41:59 +09:00
|
|
|
|
int sw = 0;
|
|
|
|
|
unsigned int status = 0;
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_connect: slot=%d\n", slot);
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_connect => SW_HOST_NO_DRIVER\n");
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
/* Only if the access method provides a connect function we use it.
|
|
|
|
|
If not, we expect that the card has been implicitly connected by
|
|
|
|
|
apdu_open_reader. */
|
|
|
|
|
if (reader_table[slot].connect_card)
|
|
|
|
|
{
|
|
|
|
|
sw = lock_slot (slot);
|
|
|
|
|
if (!sw)
|
|
|
|
|
{
|
|
|
|
|
sw = reader_table[slot].connect_card (slot);
|
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
/* We need to call apdu_get_status_internal, so that the last-status
|
|
|
|
|
machinery gets setup properly even if a card is inserted while
|
|
|
|
|
scdaemon is fired up and apdu_get_status has not yet been called.
|
|
|
|
|
Without that we would force a reset of the card with the next
|
|
|
|
|
call to apdu_get_status. */
|
2015-09-28 13:41:59 +09:00
|
|
|
|
if (!sw)
|
|
|
|
|
sw = apdu_get_status_internal (slot, 1, 1, &status, NULL);
|
|
|
|
|
|
2011-12-12 20:34:12 +01:00
|
|
|
|
if (sw)
|
|
|
|
|
;
|
|
|
|
|
else if (!(status & APDU_CARD_PRESENT))
|
|
|
|
|
sw = SW_HOST_NO_CARD;
|
2011-12-19 18:26:47 +01:00
|
|
|
|
else if ((status & APDU_CARD_PRESENT) && !(status & APDU_CARD_ACTIVE))
|
2011-12-12 20:34:12 +01:00
|
|
|
|
sw = SW_HOST_CARD_INACTIVE;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_connect => sw=0x%x\n", sw);
|
2009-02-25 10:58:56 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
int
|
|
|
|
|
apdu_disconnect (int slot)
|
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_disconnect: slot=%d\n", slot);
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_disconnect => SW_HOST_NO_DRIVER\n");
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
|
|
|
|
if (reader_table[slot].disconnect_card)
|
|
|
|
|
{
|
|
|
|
|
sw = lock_slot (slot);
|
|
|
|
|
if (!sw)
|
|
|
|
|
{
|
|
|
|
|
sw = reader_table[slot].disconnect_card (slot);
|
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sw = 0;
|
2011-12-14 10:21:15 +01:00
|
|
|
|
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_disconnect => sw=0x%x\n", sw);
|
2008-10-14 18:18:21 +00:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-07-13 09:59:22 +00:00
|
|
|
|
/* Set the progress callback of SLOT to CB and its args to CB_ARG. If
|
|
|
|
|
CB is NULL the progress callback is removed. */
|
|
|
|
|
int
|
|
|
|
|
apdu_set_progress_cb (int slot, gcry_handler_progress_t cb, void *cb_arg)
|
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
|
|
|
|
if (reader_table[slot].set_progress_cb)
|
|
|
|
|
{
|
|
|
|
|
sw = lock_slot (slot);
|
|
|
|
|
if (!sw)
|
|
|
|
|
{
|
|
|
|
|
sw = reader_table[slot].set_progress_cb (slot, cb, cb_arg);
|
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sw = 0;
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Do a reset for the card in reader at SLOT. */
|
|
|
|
|
int
|
|
|
|
|
apdu_reset (int slot)
|
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_reset: slot=%d\n", slot);
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_reset => SW_HOST_NO_DRIVER\n");
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
}
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if ((sw = lock_slot (slot)))
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_reset => sw=0x%x (lock_slot)\n", sw);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
reader_table[slot].last_status = 0;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (reader_table[slot].reset_reader)
|
|
|
|
|
sw = reader_table[slot].reset_reader (slot);
|
|
|
|
|
|
2004-10-20 08:54:45 +00:00
|
|
|
|
if (!sw)
|
|
|
|
|
{
|
|
|
|
|
/* If we got to here we know that a card is present
|
|
|
|
|
and usable. Thus remember this. */
|
2008-10-14 18:18:21 +00:00
|
|
|
|
reader_table[slot].last_status = (APDU_CARD_USABLE
|
|
|
|
|
| APDU_CARD_PRESENT
|
2008-12-18 16:34:28 +00:00
|
|
|
|
| APDU_CARD_ACTIVE);
|
2004-10-20 08:54:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
unlock_slot (slot);
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_reset => sw=0x%x\n", sw);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
/* Return the ATR or NULL if none is available. On success the length
|
|
|
|
|
of the ATR is stored at ATRLEN. The caller must free the returned
|
|
|
|
|
value. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
unsigned char *
|
|
|
|
|
apdu_get_atr (int slot, size_t *atrlen)
|
|
|
|
|
{
|
2005-06-16 08:12:03 +00:00
|
|
|
|
unsigned char *buf;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_get_atr: slot=%d\n", slot);
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_get_atr => NULL (bad slot)\n");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2008-10-14 18:18:21 +00:00
|
|
|
|
if (!reader_table[slot].atrlen)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_get_atr => NULL (no ATR)\n");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
buf = xtrymalloc (reader_table[slot].atrlen);
|
|
|
|
|
if (!buf)
|
2011-12-14 10:21:15 +01:00
|
|
|
|
{
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_get_atr => NULL (out of core)\n");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
memcpy (buf, reader_table[slot].atr, reader_table[slot].atrlen);
|
|
|
|
|
*atrlen = reader_table[slot].atrlen;
|
2011-12-14 10:21:15 +01:00
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("leave: apdu_get_atr => atrlen=%zu\n", *atrlen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return buf;
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* Retrieve the status for SLOT. The function does only wait for the
|
2004-04-20 14:17:10 +00:00
|
|
|
|
card to become available if HANG is set to true. On success the
|
|
|
|
|
bits in STATUS will be set to
|
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
APDU_CARD_USABLE (bit 0) = card present and usable
|
|
|
|
|
APDU_CARD_PRESENT (bit 1) = card present
|
|
|
|
|
APDU_CARD_ACTIVE (bit 2) = card active
|
|
|
|
|
(bit 3) = card access locked [not yet implemented]
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2008-10-14 18:18:21 +00:00
|
|
|
|
For must applications, testing bit 0 is sufficient.
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
CHANGED will receive the value of the counter tracking the number
|
|
|
|
|
of card insertions. This value may be used to detect a card
|
|
|
|
|
change.
|
|
|
|
|
*/
|
2009-02-25 10:58:56 +00:00
|
|
|
|
static int
|
|
|
|
|
apdu_get_status_internal (int slot, int hang, int no_atr_reset,
|
|
|
|
|
unsigned int *status, unsigned int *changed)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
unsigned int s;
|
|
|
|
|
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
|
|
|
|
if ((sw = hang? lock_slot (slot) : trylock_slot (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (reader_table[slot].get_status_reader)
|
|
|
|
|
sw = reader_table[slot].get_status_reader (slot, &s);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
|
|
|
|
|
if (sw)
|
2004-10-20 08:54:45 +00:00
|
|
|
|
{
|
|
|
|
|
reader_table[slot].last_status = 0;
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-18 16:34:28 +00:00
|
|
|
|
/* Keep track of changes. */
|
|
|
|
|
if (s != reader_table[slot].last_status
|
|
|
|
|
|| !reader_table[slot].any_status )
|
2004-10-20 08:54:45 +00:00
|
|
|
|
{
|
|
|
|
|
reader_table[slot].change_counter++;
|
2009-01-05 19:56:52 +00:00
|
|
|
|
/* Make sure that the ATR is invalid so that a reset will be
|
2009-02-25 10:58:56 +00:00
|
|
|
|
triggered by apdu_activate. */
|
|
|
|
|
if (!no_atr_reset)
|
|
|
|
|
reader_table[slot].atrlen = 0;
|
2004-10-20 08:54:45 +00:00
|
|
|
|
}
|
2008-12-18 16:34:28 +00:00
|
|
|
|
reader_table[slot].any_status = 1;
|
2009-01-05 19:56:52 +00:00
|
|
|
|
reader_table[slot].last_status = s;
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
if (status)
|
|
|
|
|
*status = s;
|
|
|
|
|
if (changed)
|
|
|
|
|
*changed = reader_table[slot].change_counter;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-02-25 10:58:56 +00:00
|
|
|
|
/* See above for a description. */
|
|
|
|
|
int
|
|
|
|
|
apdu_get_status (int slot, int hang,
|
|
|
|
|
unsigned int *status, unsigned int *changed)
|
|
|
|
|
{
|
2011-12-14 10:21:15 +01:00
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
log_debug ("enter: apdu_get_status: slot=%d hang=%d\n", slot, hang);
|
|
|
|
|
sw = apdu_get_status_internal (slot, hang, 0, status, changed);
|
|
|
|
|
if (DBG_READER)
|
|
|
|
|
{
|
|
|
|
|
if (status && changed)
|
|
|
|
|
log_debug ("leave: apdu_get_status => sw=0x%x status=%u changecnt=%u\n",
|
|
|
|
|
sw, *status, *changed);
|
|
|
|
|
else if (status)
|
|
|
|
|
log_debug ("leave: apdu_get_status => sw=0x%x status=%u\n",
|
|
|
|
|
sw, *status);
|
|
|
|
|
else if (changed)
|
|
|
|
|
log_debug ("leave: apdu_get_status => sw=0x%x changed=%u\n",
|
|
|
|
|
sw, *changed);
|
|
|
|
|
else
|
|
|
|
|
log_debug ("leave: apdu_get_status => sw=0x%x\n", sw);
|
|
|
|
|
}
|
|
|
|
|
return sw;
|
2009-02-25 10:58:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
/* Check whether the reader supports the ISO command code COMMAND on
|
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
|
|
|
|
the pinpad. Return 0 on success. For a description of the pin
|
2005-11-28 11:52:25 +00:00
|
|
|
|
parameters, see ccid-driver.c */
|
|
|
|
|
int
|
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
|
|
|
|
apdu_check_pinpad (int slot, int command, pininfo_t *pininfo)
|
2005-11-28 11:52:25 +00:00
|
|
|
|
{
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
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
|
|
|
|
if (opt.enable_pinpad_varlen)
|
2013-01-09 16:23:55 +09:00
|
|
|
|
pininfo->fixedlen = 0;
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
|
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
|
|
|
|
if (reader_table[slot].check_pinpad)
|
2013-01-11 11:18:39 +09:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
if ((sw = lock_slot (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
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
|
|
|
|
sw = reader_table[slot].check_pinpad (slot, command, pininfo);
|
2013-01-11 11:18:39 +09:00
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2005-11-28 11:52:25 +00:00
|
|
|
|
else
|
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-11-28 16:16:38 +09:00
|
|
|
|
int
|
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
|
|
|
|
apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2011-11-28 16:16:38 +09:00
|
|
|
|
{
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
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
|
|
|
|
if (reader_table[slot].pinpad_verify)
|
2013-01-11 11:18:39 +09:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
if ((sw = lock_slot (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
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
|
|
|
|
sw = reader_table[slot].pinpad_verify (slot, class, ins, p0, p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo);
|
2013-01-11 11:18:39 +09:00
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2011-11-28 16:16:38 +09:00
|
|
|
|
else
|
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-11-29 11:59:32 +09:00
|
|
|
|
int
|
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
|
|
|
|
apdu_pinpad_modify (int slot, int class, int ins, int p0, int p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo)
|
2011-11-29 11:59:32 +09:00
|
|
|
|
{
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
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
|
|
|
|
if (reader_table[slot].pinpad_modify)
|
2013-01-11 11:18:39 +09:00
|
|
|
|
{
|
|
|
|
|
int sw;
|
|
|
|
|
|
|
|
|
|
if ((sw = lock_slot (slot)))
|
|
|
|
|
return sw;
|
|
|
|
|
|
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
|
|
|
|
sw = reader_table[slot].pinpad_modify (slot, class, ins, p0, p1,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo);
|
2013-01-11 11:18:39 +09:00
|
|
|
|
unlock_slot (slot);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2011-11-29 11:59:32 +09:00
|
|
|
|
else
|
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
/* Dispatcher for the actual send_apdu function. Note, that this
|
|
|
|
|
function should be called in locked state. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
static int
|
|
|
|
|
send_apdu (int slot, unsigned char *apdu, size_t apdulen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
unsigned char *buffer, size_t *buflen, pininfo_t *pininfo)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
|
|
|
|
if (reader_table[slot].send_apdu_reader)
|
|
|
|
|
return reader_table[slot].send_apdu_reader (slot,
|
|
|
|
|
apdu, apdulen,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
buffer, buflen,
|
2008-09-23 09:57:45 +00:00
|
|
|
|
pininfo);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
else
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
/* Core APDU tranceiver function. Parameters are described at
|
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
|
|
|
|
apdu_send_le with the exception of PININFO which indicates pinpad
|
2009-03-30 12:46:06 +00:00
|
|
|
|
related operations if not NULL. If EXTENDED_MODE is not 0
|
2008-09-23 09:57:45 +00:00
|
|
|
|
command chaining or extended length will be used according to these
|
|
|
|
|
values:
|
2009-01-08 19:56:30 +00:00
|
|
|
|
n < 0 := Use command chaining with the data part limited to -n
|
2008-09-23 09:57:45 +00:00
|
|
|
|
in each chunk. If -1 is used a default value is used.
|
2009-03-30 12:46:06 +00:00
|
|
|
|
n == 0 := No extended mode or command chaining.
|
2009-01-08 19:56:30 +00:00
|
|
|
|
n == 1 := Use extended length for input and output without a
|
2008-09-23 09:57:45 +00:00
|
|
|
|
length limit.
|
|
|
|
|
n > 1 := Use extended length with up to N bytes.
|
2009-03-30 12:46:06 +00:00
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
*/
|
2005-11-28 11:52:25 +00:00
|
|
|
|
static int
|
|
|
|
|
send_le (int slot, int class, int ins, int p0, int p1,
|
|
|
|
|
int lc, const char *data, int le,
|
|
|
|
|
unsigned char **retbuf, size_t *retbuflen,
|
SCD: API cleanup for keypad handling.
* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
Change meaning of MODE.
(pininfo_t): Rename from iso7816_pininfo_t.
* scd/sc-copykeys.c: Include "iso7816.h".
* scd/scdaemon.c, scd/command.c: Likewise.
* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
(ccid_transceive_secure): Follow the change of PININFO_T.
* scd/app.c: Include "apdu.h" after "iso7816.h".
* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
(iso7816_change_reference_data_kp): Follow the change of API.
* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
(check_pcsc_keypad, check_ccid_keypad): Likewise.
(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
(pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
(send_le): Follow the change of API.
* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
(apdu_keypad_modify): Change the API.
* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
change.
2013-01-09 14:10:08 +09:00
|
|
|
|
pininfo_t *pininfo, int extended_mode)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2009-05-08 15:07:45 +00:00
|
|
|
|
#define SHORT_RESULT_BUFFER_SIZE 258
|
|
|
|
|
/* We allocate 8 extra bytes as a safety margin towards a driver bug. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10];
|
2009-05-08 15:07:45 +00:00
|
|
|
|
unsigned char *result_buffer = NULL;
|
|
|
|
|
size_t result_buffer_size;
|
|
|
|
|
unsigned char *result;
|
2004-04-20 16:42:55 +00:00
|
|
|
|
size_t resultlen;
|
2009-03-30 12:46:06 +00:00
|
|
|
|
unsigned char short_apdu_buffer[5+256+1];
|
|
|
|
|
unsigned char *apdu_buffer = NULL;
|
|
|
|
|
size_t apdu_buffer_size;
|
|
|
|
|
unsigned char *apdu;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
size_t apdulen;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int sw;
|
2007-08-01 18:25:32 +00:00
|
|
|
|
long rc; /* We need a long here due to PC/SC. */
|
|
|
|
|
int did_exact_length_hack = 0;
|
2008-09-23 09:57:45 +00:00
|
|
|
|
int use_chaining = 0;
|
2009-03-30 12:46:06 +00:00
|
|
|
|
int use_extended_length = 0;
|
2008-09-23 09:57:45 +00:00
|
|
|
|
int lc_chunk;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
2009-05-20 16:12:25 +00:00
|
|
|
|
log_debug ("send apdu: c=%02X i=%02X p1=%02X p2=%02X lc=%d le=%d em=%d\n",
|
2008-09-23 09:57:45 +00:00
|
|
|
|
class, ins, p0, p1, lc, le, extended_mode);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
|
|
|
|
|
if (lc != -1 && (lc > 255 || lc < 0))
|
2008-09-23 09:57:45 +00:00
|
|
|
|
{
|
2009-03-26 19:27:04 +00:00
|
|
|
|
/* Data does not fit into an APDU. What we do now depends on
|
2008-09-23 09:57:45 +00:00
|
|
|
|
the EXTENDED_MODE parameter. */
|
|
|
|
|
if (!extended_mode)
|
2009-03-26 19:27:04 +00:00
|
|
|
|
return SW_WRONG_LENGTH; /* No way to send such an APDU. */
|
2008-09-23 09:57:45 +00:00
|
|
|
|
else if (extended_mode > 0)
|
2009-03-30 12:46:06 +00:00
|
|
|
|
use_extended_length = 1;
|
2008-09-23 09:57:45 +00:00
|
|
|
|
else if (extended_mode < 0)
|
|
|
|
|
{
|
|
|
|
|
/* Send APDU using chaining mode. */
|
|
|
|
|
if (lc > 16384)
|
|
|
|
|
return SW_WRONG_LENGTH; /* Sanity check. */
|
|
|
|
|
if ((class&0xf0) != 0)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return SW_HOST_INV_VALUE; /* Upper 4 bits need to be 0. */
|
|
|
|
|
use_chaining = extended_mode == -1? 255 : -extended_mode;
|
2008-09-23 09:57:45 +00:00
|
|
|
|
use_chaining &= 0xff;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
else
|
2008-09-23 09:57:45 +00:00
|
|
|
|
return SW_HOST_INV_VALUE;
|
|
|
|
|
}
|
2009-03-30 12:46:06 +00:00
|
|
|
|
else if (lc == -1 && extended_mode > 0)
|
|
|
|
|
use_extended_length = 1;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-05-08 15:07:45 +00:00
|
|
|
|
if (le != -1 && (le > (extended_mode > 0? 255:256) || le < 0))
|
|
|
|
|
{
|
|
|
|
|
/* Expected Data does not fit into an APDU. What we do now
|
|
|
|
|
depends on the EXTENDED_MODE parameter. Note that a check
|
|
|
|
|
for command chaining does not make sense because we are
|
|
|
|
|
looking at Le. */
|
|
|
|
|
if (!extended_mode)
|
|
|
|
|
return SW_WRONG_LENGTH; /* No way to send such an APDU. */
|
|
|
|
|
else if (use_extended_length)
|
|
|
|
|
; /* We are already using extended length. */
|
|
|
|
|
else if (extended_mode > 0)
|
|
|
|
|
use_extended_length = 1;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
else
|
2009-05-08 15:07:45 +00:00
|
|
|
|
return SW_HOST_INV_VALUE;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if ((!data && lc != -1) || (data && lc == -1))
|
|
|
|
|
return SW_HOST_INV_VALUE;
|
|
|
|
|
|
2009-03-30 12:46:06 +00:00
|
|
|
|
if (use_extended_length)
|
|
|
|
|
{
|
|
|
|
|
if (reader_table[slot].is_t0)
|
|
|
|
|
return SW_HOST_NOT_SUPPORTED;
|
|
|
|
|
|
|
|
|
|
/* Space for: cls/ins/p1/p2+Z+2_byte_Lc+Lc+2_byte_Le. */
|
|
|
|
|
apdu_buffer_size = 4 + 1 + (lc >= 0? (2+lc):0) + 2;
|
2009-05-08 15:07:45 +00:00
|
|
|
|
apdu_buffer = xtrymalloc (apdu_buffer_size + 10);
|
2009-03-30 12:46:06 +00:00
|
|
|
|
if (!apdu_buffer)
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
apdu = apdu_buffer;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
apdu_buffer_size = sizeof short_apdu_buffer;
|
|
|
|
|
apdu = short_apdu_buffer;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-08 15:07:45 +00:00
|
|
|
|
if (use_extended_length && (le > 256 || le < 0))
|
|
|
|
|
{
|
|
|
|
|
result_buffer_size = le < 0? 4096 : le;
|
|
|
|
|
result_buffer = xtrymalloc (result_buffer_size + 10);
|
|
|
|
|
if (!result_buffer)
|
|
|
|
|
{
|
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
|
|
|
|
result = result_buffer;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
result_buffer_size = SHORT_RESULT_BUFFER_SIZE;
|
|
|
|
|
result = short_result_buffer;
|
|
|
|
|
}
|
|
|
|
|
#undef SHORT_RESULT_BUFFER_SIZE
|
|
|
|
|
|
2004-04-20 14:17:10 +00:00
|
|
|
|
if ((sw = lock_slot (slot)))
|
2009-05-13 17:12:00 +00:00
|
|
|
|
{
|
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
xfree (result_buffer);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
do
|
|
|
|
|
{
|
2009-03-30 12:46:06 +00:00
|
|
|
|
if (use_extended_length)
|
2008-09-23 09:57:45 +00:00
|
|
|
|
{
|
|
|
|
|
use_chaining = 0;
|
2009-03-30 12:46:06 +00:00
|
|
|
|
apdulen = 0;
|
|
|
|
|
apdu[apdulen++] = class;
|
|
|
|
|
apdu[apdulen++] = ins;
|
|
|
|
|
apdu[apdulen++] = p0;
|
|
|
|
|
apdu[apdulen++] = p1;
|
2015-04-14 14:17:03 +09:00
|
|
|
|
if (lc > 0)
|
2009-03-30 12:46:06 +00:00
|
|
|
|
{
|
2015-04-14 14:17:03 +09:00
|
|
|
|
apdu[apdulen++] = 0; /* Z byte: Extended length marker. */
|
2009-03-30 12:46:06 +00:00
|
|
|
|
apdu[apdulen++] = ((lc >> 8) & 0xff);
|
|
|
|
|
apdu[apdulen++] = (lc & 0xff);
|
|
|
|
|
memcpy (apdu+apdulen, data, lc);
|
|
|
|
|
data += lc;
|
|
|
|
|
apdulen += lc;
|
|
|
|
|
}
|
|
|
|
|
if (le != -1)
|
|
|
|
|
{
|
2015-04-14 14:17:03 +09:00
|
|
|
|
if (lc <= 0)
|
|
|
|
|
apdu[apdulen++] = 0; /* Z byte: Extended length marker. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
apdu[apdulen++] = ((le >> 8) & 0xff);
|
|
|
|
|
apdu[apdulen++] = (le & 0xff);
|
2009-03-30 12:46:06 +00:00
|
|
|
|
}
|
2008-09-23 09:57:45 +00:00
|
|
|
|
}
|
2009-03-30 12:46:06 +00:00
|
|
|
|
else
|
2008-09-23 09:57:45 +00:00
|
|
|
|
{
|
2009-03-30 12:46:06 +00:00
|
|
|
|
apdulen = 0;
|
|
|
|
|
apdu[apdulen] = class;
|
|
|
|
|
if (use_chaining && lc > 255)
|
|
|
|
|
{
|
|
|
|
|
apdu[apdulen] |= 0x10;
|
|
|
|
|
assert (use_chaining < 256);
|
|
|
|
|
lc_chunk = use_chaining;
|
|
|
|
|
lc -= use_chaining;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
use_chaining = 0;
|
|
|
|
|
lc_chunk = lc;
|
|
|
|
|
}
|
|
|
|
|
apdulen++;
|
|
|
|
|
apdu[apdulen++] = ins;
|
|
|
|
|
apdu[apdulen++] = p0;
|
|
|
|
|
apdu[apdulen++] = p1;
|
|
|
|
|
if (lc_chunk != -1)
|
|
|
|
|
{
|
|
|
|
|
apdu[apdulen++] = lc_chunk;
|
|
|
|
|
memcpy (apdu+apdulen, data, lc_chunk);
|
|
|
|
|
data += lc_chunk;
|
|
|
|
|
apdulen += lc_chunk;
|
|
|
|
|
/* T=0 does not allow the use of Lc together with Le;
|
|
|
|
|
thus disable Le in this case. */
|
|
|
|
|
if (reader_table[slot].is_t0)
|
|
|
|
|
le = -1;
|
|
|
|
|
}
|
|
|
|
|
if (le != -1 && !use_chaining)
|
|
|
|
|
apdu[apdulen++] = le; /* Truncation is okay (0 means 256). */
|
2008-09-23 09:57:45 +00:00
|
|
|
|
}
|
2009-03-30 12:46:06 +00:00
|
|
|
|
|
2008-09-23 09:57:45 +00:00
|
|
|
|
exact_length_hack:
|
2009-03-30 12:46:06 +00:00
|
|
|
|
/* As a safeguard don't pass any garbage to the driver. */
|
|
|
|
|
assert (apdulen <= apdu_buffer_size);
|
|
|
|
|
memset (apdu+apdulen, 0, apdu_buffer_size - apdulen);
|
2009-05-08 15:07:45 +00:00
|
|
|
|
resultlen = result_buffer_size;
|
2008-09-23 09:57:45 +00:00
|
|
|
|
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo);
|
|
|
|
|
if (rc || resultlen < 2)
|
|
|
|
|
{
|
2009-05-13 11:42:34 +00:00
|
|
|
|
log_info ("apdu_send_simple(%d) failed: %s\n",
|
|
|
|
|
slot, apdu_strerror (rc));
|
2008-09-23 09:57:45 +00:00
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
xfree (result_buffer);
|
2008-09-23 09:57:45 +00:00
|
|
|
|
return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
}
|
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (!use_extended_length
|
2009-03-30 12:46:06 +00:00
|
|
|
|
&& !did_exact_length_hack && SW_EXACT_LENGTH_P (sw))
|
2008-09-23 09:57:45 +00:00
|
|
|
|
{
|
|
|
|
|
apdu[apdulen-1] = (sw & 0x00ff);
|
|
|
|
|
did_exact_length_hack = 1;
|
|
|
|
|
goto exact_length_hack;
|
|
|
|
|
}
|
2007-08-01 18:25:32 +00:00
|
|
|
|
}
|
2008-09-23 09:57:45 +00:00
|
|
|
|
while (use_chaining && sw == SW_SUCCESS);
|
2007-08-01 18:25:32 +00:00
|
|
|
|
|
2009-03-30 12:46:06 +00:00
|
|
|
|
if (apdu_buffer)
|
|
|
|
|
{
|
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
apdu_buffer = NULL;
|
|
|
|
|
apdu_buffer_size = 0;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-08-01 18:25:32 +00:00
|
|
|
|
/* Store away the returned data but strip the statusword. */
|
2003-08-05 17:11:04 +00:00
|
|
|
|
resultlen -= 2;
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
{
|
2005-02-03 13:20:57 +00:00
|
|
|
|
log_debug (" response: sw=%04X datalen=%d\n",
|
|
|
|
|
sw, (unsigned int)resultlen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
|
2009-05-20 16:12:25 +00:00
|
|
|
|
log_printhex (" dump: ", result, resultlen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-27 16:40:42 +00:00
|
|
|
|
if (sw == SW_SUCCESS || sw == SW_EOF_REACHED)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuf = xtrymalloc (resultlen? resultlen : 1);
|
|
|
|
|
if (!*retbuf)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
*retbuflen = resultlen;
|
|
|
|
|
memcpy (*retbuf, result, resultlen);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ((sw & 0xff00) == SW_MORE_DATA)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *p = NULL, *tmp;
|
|
|
|
|
size_t bufsize = 4096;
|
|
|
|
|
|
|
|
|
|
/* It is likely that we need to return much more data, so we
|
|
|
|
|
start off with a large buffer. */
|
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuf = p = xtrymalloc (bufsize);
|
|
|
|
|
if (!*retbuf)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
assert (resultlen < bufsize);
|
|
|
|
|
memcpy (p, result, resultlen);
|
|
|
|
|
p += resultlen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int len = (sw & 0x00ff);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-04-20 16:42:55 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("apdu_send_simple(%d): %d more bytes available\n",
|
|
|
|
|
slot, len);
|
2009-03-30 12:46:06 +00:00
|
|
|
|
apdu_buffer_size = sizeof short_apdu_buffer;
|
|
|
|
|
apdu = short_apdu_buffer;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
apdulen = 0;
|
|
|
|
|
apdu[apdulen++] = class;
|
|
|
|
|
apdu[apdulen++] = 0xC0;
|
|
|
|
|
apdu[apdulen++] = 0;
|
|
|
|
|
apdu[apdulen++] = 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
apdu[apdulen++] = len;
|
2009-03-30 12:46:06 +00:00
|
|
|
|
assert (apdulen <= apdu_buffer_size);
|
|
|
|
|
memset (apdu+apdulen, 0, apdu_buffer_size - apdulen);
|
2009-05-08 15:07:45 +00:00
|
|
|
|
resultlen = result_buffer_size;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (rc || resultlen < 2)
|
|
|
|
|
{
|
|
|
|
|
log_error ("apdu_send_simple(%d) for get response failed: %s\n",
|
2004-07-16 15:45:25 +00:00
|
|
|
|
slot, apdu_strerror (rc));
|
2004-04-20 14:17:10 +00:00
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
|
|
|
|
resultlen -= 2;
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
{
|
2005-02-03 13:20:57 +00:00
|
|
|
|
log_debug (" more: sw=%04X datalen=%d\n",
|
|
|
|
|
sw, (unsigned int)resultlen);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
|
|
|
|
|
log_printhex (" dump: ", result, resultlen);
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-20 16:42:55 +00:00
|
|
|
|
if ((sw & 0xff00) == SW_MORE_DATA
|
|
|
|
|
|| sw == SW_SUCCESS
|
|
|
|
|
|| sw == SW_EOF_REACHED )
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
2004-04-20 16:42:55 +00:00
|
|
|
|
if (retbuf && resultlen)
|
2003-08-05 17:11:04 +00:00
|
|
|
|
{
|
|
|
|
|
if (p - *retbuf + resultlen > bufsize)
|
|
|
|
|
{
|
|
|
|
|
bufsize += resultlen > 4096? resultlen: 4096;
|
|
|
|
|
tmp = xtryrealloc (*retbuf, bufsize);
|
|
|
|
|
if (!tmp)
|
2004-04-20 14:17:10 +00:00
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
2003-08-05 17:11:04 +00:00
|
|
|
|
p = tmp + (p - *retbuf);
|
|
|
|
|
*retbuf = tmp;
|
|
|
|
|
}
|
|
|
|
|
memcpy (p, result, resultlen);
|
|
|
|
|
p += resultlen;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
log_info ("apdu_send_simple(%d) "
|
|
|
|
|
"got unexpected status %04X from get response\n",
|
|
|
|
|
slot, sw);
|
|
|
|
|
}
|
|
|
|
|
while ((sw & 0xff00) == SW_MORE_DATA);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuflen = p - *retbuf;
|
|
|
|
|
tmp = xtryrealloc (*retbuf, *retbuflen);
|
|
|
|
|
if (tmp)
|
|
|
|
|
*retbuf = tmp;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-04-20 14:17:10 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS)
|
|
|
|
|
log_printhex (" dump: ", *retbuf, *retbuflen);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
2005-11-28 11:52:25 +00:00
|
|
|
|
/* Send an APDU to the card in SLOT. The APDU is created from all
|
|
|
|
|
given parameters: CLASS, INS, P0, P1, LC, DATA, LE. A value of -1
|
|
|
|
|
for LC won't sent this field and the data field; in this case DATA
|
2009-03-30 12:46:06 +00:00
|
|
|
|
must also be passed as NULL. If EXTENDED_MODE is not 0 command
|
|
|
|
|
chaining or extended length will be used; see send_le for details.
|
|
|
|
|
The return value is the status word or -1 for an invalid SLOT or
|
|
|
|
|
other non card related error. If RETBUF is not NULL, it will
|
|
|
|
|
receive an allocated buffer with the returned data. The length of
|
2015-11-16 12:41:46 +01:00
|
|
|
|
that data will be put into *RETBUFLEN. The caller is responsible
|
2009-03-30 12:46:06 +00:00
|
|
|
|
for releasing the buffer even in case of errors. */
|
2005-11-28 11:52:25 +00:00
|
|
|
|
int
|
2011-02-04 12:57:53 +01:00
|
|
|
|
apdu_send_le(int slot, int extended_mode,
|
2009-03-30 12:46:06 +00:00
|
|
|
|
int class, int ins, int p0, int p1,
|
2005-11-28 11:52:25 +00:00
|
|
|
|
int lc, const char *data, int le,
|
|
|
|
|
unsigned char **retbuf, size_t *retbuflen)
|
|
|
|
|
{
|
|
|
|
|
return send_le (slot, class, ins, p0, p1,
|
|
|
|
|
lc, data, le,
|
|
|
|
|
retbuf, retbuflen,
|
2009-03-30 12:46:06 +00:00
|
|
|
|
NULL, extended_mode);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 17:11:04 +00:00
|
|
|
|
/* Send an APDU to the card in SLOT. The APDU is created from all
|
|
|
|
|
given parameters: CLASS, INS, P0, P1, LC, DATA. A value of -1 for
|
|
|
|
|
LC won't sent this field and the data field; in this case DATA must
|
2009-03-30 12:46:06 +00:00
|
|
|
|
also be passed as NULL. If EXTENDED_MODE is not 0 command chaining
|
|
|
|
|
or extended length will be used; see send_le for details. The
|
|
|
|
|
return value is the status word or -1 for an invalid SLOT or other
|
|
|
|
|
non card related error. If RETBUF is not NULL, it will receive an
|
|
|
|
|
allocated buffer with the returned data. The length of that data
|
2015-11-16 12:41:46 +01:00
|
|
|
|
will be put into *RETBUFLEN. The caller is responsible for
|
2009-03-30 12:46:06 +00:00
|
|
|
|
releasing the buffer even in case of errors. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
int
|
2009-03-30 12:46:06 +00:00
|
|
|
|
apdu_send (int slot, int extended_mode,
|
|
|
|
|
int class, int ins, int p0, int p1,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int lc, const char *data, unsigned char **retbuf, size_t *retbuflen)
|
|
|
|
|
{
|
2005-11-28 11:52:25 +00:00
|
|
|
|
return send_le (slot, class, ins, p0, p1, lc, data, 256,
|
2009-03-30 12:46:06 +00:00
|
|
|
|
retbuf, retbuflen, NULL, extended_mode);
|
2003-08-05 17:11:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Send an APDU to the card in SLOT. The APDU is created from all
|
|
|
|
|
given parameters: CLASS, INS, P0, P1, LC, DATA. A value of -1 for
|
|
|
|
|
LC won't sent this field and the data field; in this case DATA must
|
2009-03-30 12:46:06 +00:00
|
|
|
|
also be passed as NULL. If EXTENDED_MODE is not 0 command chaining
|
|
|
|
|
or extended length will be used; see send_le for details. The
|
|
|
|
|
return value is the status word or -1 for an invalid SLOT or other
|
|
|
|
|
non card related error. No data will be returned. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
int
|
2008-09-23 09:57:45 +00:00
|
|
|
|
apdu_send_simple (int slot, int extended_mode,
|
|
|
|
|
int class, int ins, int p0, int p1,
|
2003-08-05 17:11:04 +00:00
|
|
|
|
int lc, const char *data)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return send_le (slot, class, ins, p0, p1, lc, data, -1, NULL, NULL, NULL,
|
2008-09-23 09:57:45 +00:00
|
|
|
|
extended_mode);
|
2005-11-28 11:52:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
/* This is a more generic version of the apdu sending routine. It
|
|
|
|
|
takes an already formatted APDU in APDUDATA or length APDUDATALEN
|
2009-01-08 19:56:30 +00:00
|
|
|
|
and returns with an APDU including the status word. With
|
2004-07-16 15:45:25 +00:00
|
|
|
|
HANDLE_MORE set to true this function will handle the MORE DATA
|
|
|
|
|
status and return all APDUs concatenated with one status word at
|
2009-05-13 17:12:00 +00:00
|
|
|
|
the end. If EXTENDED_LENGTH is != 0 extended lengths are allowed
|
|
|
|
|
with a max. result data length of EXTENDED_LENGTH bytes. The
|
|
|
|
|
function does not return a regular status word but 0 on success.
|
|
|
|
|
If the slot is locked, the function returns immediately with an
|
|
|
|
|
error. */
|
2005-02-24 17:36:11 +00:00
|
|
|
|
int
|
2009-05-13 17:12:00 +00:00
|
|
|
|
apdu_send_direct (int slot, size_t extended_length,
|
2009-03-30 12:46:06 +00:00
|
|
|
|
const unsigned char *apdudata, size_t apdudatalen,
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int handle_more,
|
|
|
|
|
unsigned char **retbuf, size_t *retbuflen)
|
|
|
|
|
{
|
2009-05-13 17:12:00 +00:00
|
|
|
|
#define SHORT_RESULT_BUFFER_SIZE 258
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10];
|
2009-05-13 17:12:00 +00:00
|
|
|
|
unsigned char *result_buffer = NULL;
|
|
|
|
|
size_t result_buffer_size;
|
|
|
|
|
unsigned char *result;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
size_t resultlen;
|
2009-05-13 17:12:00 +00:00
|
|
|
|
unsigned char short_apdu_buffer[5+256+10];
|
|
|
|
|
unsigned char *apdu_buffer = NULL;
|
|
|
|
|
unsigned char *apdu;
|
|
|
|
|
size_t apdulen;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
int sw;
|
|
|
|
|
long rc; /* we need a long here due to PC/SC. */
|
|
|
|
|
int class;
|
|
|
|
|
|
|
|
|
|
if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
|
|
|
|
|
return SW_HOST_NO_DRIVER;
|
|
|
|
|
|
2009-05-13 17:12:00 +00:00
|
|
|
|
if (apdudatalen > 65535)
|
|
|
|
|
return SW_HOST_INV_VALUE;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2009-05-13 17:12:00 +00:00
|
|
|
|
if (apdudatalen > sizeof short_apdu_buffer - 5)
|
|
|
|
|
{
|
|
|
|
|
apdu_buffer = xtrymalloc (apdudatalen + 5);
|
|
|
|
|
if (!apdu_buffer)
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
apdu = apdu_buffer;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
apdu = short_apdu_buffer;
|
|
|
|
|
}
|
2004-07-16 15:45:25 +00:00
|
|
|
|
apdulen = apdudatalen;
|
|
|
|
|
memcpy (apdu, apdudata, apdudatalen);
|
|
|
|
|
class = apdulen? *apdu : 0;
|
|
|
|
|
|
2009-05-13 17:12:00 +00:00
|
|
|
|
if (extended_length >= 256 && extended_length <= 65536)
|
|
|
|
|
{
|
|
|
|
|
result_buffer_size = extended_length;
|
|
|
|
|
result_buffer = xtrymalloc (result_buffer_size + 10);
|
|
|
|
|
if (!result_buffer)
|
|
|
|
|
{
|
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
|
|
|
|
result = result_buffer;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
result_buffer_size = SHORT_RESULT_BUFFER_SIZE;
|
|
|
|
|
result = short_result_buffer;
|
|
|
|
|
}
|
|
|
|
|
#undef SHORT_RESULT_BUFFER_SIZE
|
|
|
|
|
|
|
|
|
|
if ((sw = trylock_slot (slot)))
|
|
|
|
|
{
|
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
xfree (result_buffer);
|
|
|
|
|
return sw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resultlen = result_buffer_size;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (apdu_buffer);
|
|
|
|
|
apdu_buffer = NULL;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (rc || resultlen < 2)
|
|
|
|
|
{
|
|
|
|
|
log_error ("apdu_send_direct(%d) failed: %s\n",
|
|
|
|
|
slot, apdu_strerror (rc));
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
}
|
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
|
|
|
|
/* Store away the returned data but strip the statusword. */
|
|
|
|
|
resultlen -= 2;
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
{
|
2005-02-03 13:20:57 +00:00
|
|
|
|
log_debug (" response: sw=%04X datalen=%d\n",
|
|
|
|
|
sw, (unsigned int)resultlen);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
|
|
|
|
|
log_printhex (" dump: ", result, resultlen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (handle_more && (sw & 0xff00) == SW_MORE_DATA)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *p = NULL, *tmp;
|
|
|
|
|
size_t bufsize = 4096;
|
|
|
|
|
|
|
|
|
|
/* It is likely that we need to return much more data, so we
|
|
|
|
|
start off with a large buffer. */
|
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuf = p = xtrymalloc (bufsize + 2);
|
|
|
|
|
if (!*retbuf)
|
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
|
|
|
|
assert (resultlen < bufsize);
|
|
|
|
|
memcpy (p, result, resultlen);
|
|
|
|
|
p += resultlen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int len = (sw & 0x00ff);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
log_debug ("apdu_send_direct(%d): %d more bytes available\n",
|
|
|
|
|
slot, len);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
apdu = short_apdu_buffer;
|
2004-07-16 15:45:25 +00:00
|
|
|
|
apdulen = 0;
|
|
|
|
|
apdu[apdulen++] = class;
|
|
|
|
|
apdu[apdulen++] = 0xC0;
|
|
|
|
|
apdu[apdulen++] = 0;
|
|
|
|
|
apdu[apdulen++] = 0;
|
2005-02-24 17:36:11 +00:00
|
|
|
|
apdu[apdulen++] = len;
|
2009-05-13 17:12:00 +00:00
|
|
|
|
memset (apdu+apdulen, 0, sizeof (short_apdu_buffer) - apdulen);
|
|
|
|
|
resultlen = result_buffer_size;
|
2005-11-28 11:52:25 +00:00
|
|
|
|
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (rc || resultlen < 2)
|
|
|
|
|
{
|
|
|
|
|
log_error ("apdu_send_direct(%d) for get response failed: %s\n",
|
|
|
|
|
slot, apdu_strerror (rc));
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return rc ? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
|
|
|
|
|
}
|
|
|
|
|
sw = (result[resultlen-2] << 8) | result[resultlen-1];
|
|
|
|
|
resultlen -= 2;
|
|
|
|
|
if (DBG_CARD_IO)
|
|
|
|
|
{
|
2005-02-03 13:20:57 +00:00
|
|
|
|
log_debug (" more: sw=%04X datalen=%d\n",
|
|
|
|
|
sw, (unsigned int)resultlen);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
|
|
|
|
|
log_printhex (" dump: ", result, resultlen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((sw & 0xff00) == SW_MORE_DATA
|
|
|
|
|
|| sw == SW_SUCCESS
|
|
|
|
|
|| sw == SW_EOF_REACHED )
|
|
|
|
|
{
|
|
|
|
|
if (retbuf && resultlen)
|
|
|
|
|
{
|
|
|
|
|
if (p - *retbuf + resultlen > bufsize)
|
|
|
|
|
{
|
|
|
|
|
bufsize += resultlen > 4096? resultlen: 4096;
|
|
|
|
|
tmp = xtryrealloc (*retbuf, bufsize + 2);
|
|
|
|
|
if (!tmp)
|
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
|
|
|
|
p = tmp + (p - *retbuf);
|
|
|
|
|
*retbuf = tmp;
|
|
|
|
|
}
|
|
|
|
|
memcpy (p, result, resultlen);
|
|
|
|
|
p += resultlen;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2009-01-08 19:56:30 +00:00
|
|
|
|
log_info ("apdu_send_direct(%d) "
|
2004-07-16 15:45:25 +00:00
|
|
|
|
"got unexpected status %04X from get response\n",
|
|
|
|
|
slot, sw);
|
|
|
|
|
}
|
|
|
|
|
while ((sw & 0xff00) == SW_MORE_DATA);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuflen = p - *retbuf;
|
|
|
|
|
tmp = xtryrealloc (*retbuf, *retbuflen + 2);
|
|
|
|
|
if (tmp)
|
|
|
|
|
*retbuf = tmp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
*retbuf = xtrymalloc ((resultlen? resultlen : 1)+2);
|
|
|
|
|
if (!*retbuf)
|
|
|
|
|
{
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return SW_HOST_OUT_OF_CORE;
|
|
|
|
|
}
|
|
|
|
|
*retbuflen = resultlen;
|
|
|
|
|
memcpy (*retbuf, result, resultlen);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unlock_slot (slot);
|
2009-05-13 17:12:00 +00:00
|
|
|
|
xfree (result_buffer);
|
2004-07-16 15:45:25 +00:00
|
|
|
|
|
2009-01-08 19:56:30 +00:00
|
|
|
|
/* Append the status word. Note that we reserved the two extra
|
|
|
|
|
bytes while allocating the buffer. */
|
2004-07-16 15:45:25 +00:00
|
|
|
|
if (retbuf)
|
|
|
|
|
{
|
|
|
|
|
(*retbuf)[(*retbuflen)++] = (sw >> 8);
|
|
|
|
|
(*retbuf)[(*retbuflen)++] = sw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (DBG_CARD_IO && retbuf)
|
|
|
|
|
log_printhex (" dump: ", *retbuf, *retbuflen);
|
2005-02-24 17:36:11 +00:00
|
|
|
|
|
2004-07-16 15:45:25 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2015-11-09 16:15:44 +09:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
apdu_get_reader_name (int slot)
|
|
|
|
|
{
|
|
|
|
|
return reader_table[slot].rdrname;
|
|
|
|
|
}
|