Add support for standard USB Smartcard Readers (#765)

* add PCSC interface (pcsc.c and pcsc.h)
* new command 'sc select' to choose an USB Smartcard Reader
* updated CI/.travis.yml accordingly
* remove TCK CRC check in i2c.c It is done in PrintATR() anyway
* Fix TCK CRC check in PrintATR()
* Add PCSC reader support to 'sc info'
This commit is contained in:
pwpiwi 2019-01-28 21:54:34 +01:00 committed by GitHub
commit a9104f7e31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 382 additions and 93 deletions

View file

@ -10,6 +10,8 @@
#ifndef __SMARTCARD_H
#define __SMARTCARD_H
#include <stdint.h>
//-----------------------------------------------------------------------------
// ISO 7618 Smart Card
//-----------------------------------------------------------------------------

View file

@ -33,6 +33,7 @@ typedef struct {
uint32_t asDwords[USB_CMD_DATA_SIZE/4];
} d;
} PACKED UsbCommand;
// A struct used to send sample-configs over USB
typedef struct{
uint8_t decimation;
@ -63,6 +64,9 @@ typedef struct{
#define CMD_STATUS 0x0108
#define CMD_PING 0x0109
// controlling the ADC input multiplexer
#define CMD_SET_ADC_MUX 0x020F
// RDV40, Smart card operations
#define CMD_SMART_RAW 0x0140
#define CMD_SMART_UPGRADE 0x0141
@ -86,7 +90,6 @@ typedef struct{
#define CMD_HID_SIM_TAG 0x020C
#define CMD_SET_LF_DIVISOR 0x020D
#define CMD_LF_SIMULATE_BIDIR 0x020E
#define CMD_SET_ADC_MUX 0x020F
#define CMD_HID_CLONE_TAG 0x0210
#define CMD_EM410X_WRITE_TAG 0x0211
#define CMD_INDALA_CLONE_TAG 0x0212
@ -112,12 +115,8 @@ typedef struct{
#define CMD_VIKING_CLONE_TAG 0x0223
#define CMD_T55XX_WAKEUP 0x0224
#define CMD_COTAG 0x0225
// misc extra
#define CMD_PARADOX_CLONE_TAG 0x0226
/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
// For the 13.56 MHz tags
#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 0x0300
#define CMD_READ_SRI512_TAG 0x0303
@ -136,7 +135,6 @@ typedef struct{
#define CMD_SNOOP_HITAG 0x0370
#define CMD_SIMULATE_HITAG 0x0371
#define CMD_READER_HITAG 0x0372
#define CMD_SIMULATE_HITAG_S 0x0368
#define CMD_TEST_HITAGS_TRACES 0x0367
#define CMD_READ_HITAG_S 0x0373
@ -144,7 +142,6 @@ typedef struct{
#define CMD_WR_HITAG_S 0x0375
#define CMD_EMU_HITAG_S 0x0376
#define CMD_SIMULATE_TAG_ISO_14443B 0x0381
#define CMD_SNOOP_ISO_14443B 0x0382
#define CMD_SNOOP_ISO_14443a 0x0383
@ -251,6 +248,10 @@ typedef struct{
#define FLAG_TUNE_HF 2
#define FLAG_TUNE_ALL 3
// Hardware capabilities
#define HAS_EXTRA_FLASH_MEM (1 << 0)
#define HAS_SMARTCARD_SLOT (1 << 1)
// CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
/* Whether a bootloader that understands the common_area is present */