VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

- extended length fully functional. fixed last problems with lengths and ccid descriptor.

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@268 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-09-18 12:42:52 +00:00
parent 593c0ce77a
commit eee134d9c0
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ccid/src/ccid.c
View File

@@ -58,16 +58,17 @@ ccid_desc = {
.bDescriptorType = 0x21, .bDescriptorType = 0x21,
.bcdCCID = __constant_cpu_to_le16(0x0110), .bcdCCID = __constant_cpu_to_le16(0x0110),
.bMaxSlotIndex = SC_MAX_SLOTS, .bMaxSlotIndex = SC_MAX_SLOTS,
.bVoltageSupport = 0x01, .bVoltageSupport = 0x01, // 5.0V
.dwProtocols = __constant_cpu_to_le32(0x01| // T=0 .dwProtocols = __constant_cpu_to_le32(
0x02), // T=1 0x01| // T=0
0x02), // T=1
.dwDefaultClock = __constant_cpu_to_le32(0xDFC), .dwDefaultClock = __constant_cpu_to_le32(0xDFC),
.dwMaximumClock = __constant_cpu_to_le32(0xDFC), .dwMaximumClock = __constant_cpu_to_le32(0xDFC),
.bNumClockSupport = 1, .bNumClockSupport = 1,
.dwDataRate = __constant_cpu_to_le32(0x2580), .dwDataRate = __constant_cpu_to_le32(0x2580),
.dwMaxDataRate = __constant_cpu_to_le32(0x2580), .dwMaxDataRate = __constant_cpu_to_le32(0x2580),
.bNumDataRatesSupported = 1, .bNumDataRatesSupported = 1,
.dwMaxIFSD = __constant_cpu_to_le32(0xFF), // FIXME .dwMaxIFSD = __constant_cpu_to_le32(0xFF), // IFSD is handled by the real reader driver
.dwSynchProtocols = __constant_cpu_to_le32(0), .dwSynchProtocols = __constant_cpu_to_le32(0),
.dwMechanical = __constant_cpu_to_le32(0), .dwMechanical = __constant_cpu_to_le32(0),
.dwFeatures = __constant_cpu_to_le32( .dwFeatures = __constant_cpu_to_le32(
@@ -78,10 +79,10 @@ ccid_desc = {
0x00000020| // Automatic baud rate change 0x00000020| // Automatic baud rate change
0x00000040| // Automatic parameters negotiation 0x00000040| // Automatic parameters negotiation
0x00000080| // Automatic PPS 0x00000080| // Automatic PPS
0x00020000| // Short APDU level exchange 0x00000400| // Automatic IFSD exchange as first exchange
/*0x00040000| // Extended APDU level exchange*/ 0x00040000| // Short and Extended APDU level exchange with CCID
0x00100000), // USB Wake up signaling supported 0x00100000), // USB Wake up signaling supported
.dwMaxCCIDMessageLength = __constant_cpu_to_le32(261+10), .dwMaxCCIDMessageLength = __constant_cpu_to_le32(CCID_EXT_APDU_MAX),
.bClassGetResponse = 0xFF, .bClassGetResponse = 0xFF,
.bclassEnvelope = 0xFF, .bclassEnvelope = 0xFF,
.wLcdLayout = __constant_cpu_to_le16( .wLcdLayout = __constant_cpu_to_le16(
@@ -310,9 +311,9 @@ get_RDR_to_PC_SlotStatus(__u8 bSlot, __u8 bSeq, int sc_result, __u8 **outbuf, si
{ {
if (!outbuf) if (!outbuf)
return SC_ERROR_INVALID_ARGUMENTS; return SC_ERROR_INVALID_ARGUMENTS;
if (abProtocolDataStructureLen > 0xffffffff) { if (abProtocolDataStructureLen > 0xffff) {
sc_error(ctx, "abProtocolDataStructure %u bytes too long", sc_error(ctx, "abProtocolDataStructure %u bytes too long",
abProtocolDataStructureLen-0xffffffff); abProtocolDataStructureLen-0xffff);
return SC_ERROR_INVALID_DATA; return SC_ERROR_INVALID_DATA;
} }
@@ -341,9 +342,9 @@ get_RDR_to_PC_DataBlock(__u8 bSlot, __u8 bSeq, int sc_result, __u8 **outbuf,
{ {
if (!outbuf) if (!outbuf)
return SC_ERROR_INVALID_ARGUMENTS; return SC_ERROR_INVALID_ARGUMENTS;
if (abDataLen > 0xffffffff) { if (abDataLen > 0xffff) {
sc_error(ctx, "abProtocolDataStructure %u bytes too long", sc_error(ctx, "abProtocolDataStructure %u bytes too long",
abDataLen-0xffffffff); abDataLen-0xffff);
return SC_ERROR_INVALID_DATA; return SC_ERROR_INVALID_DATA;
} }
@@ -411,22 +412,26 @@ perform_PC_to_RDR_IccPowerOn(const __u8 *in, size_t inlen, __u8 **out, size_t *o
if (request->bSlot < sizeof *card_in_slot) { if (request->bSlot < sizeof *card_in_slot) {
if (card_in_slot[request->bSlot] if (card_in_slot[request->bSlot]
&& sc_card_valid(card_in_slot[request->bSlot])) { && sc_card_valid(card_in_slot[request->bSlot])) {
sc_reset(card_in_slot[request->bSlot]); sc_debug(ctx, "Card is already powered on.");
sc_disconnect_card(card_in_slot[request->bSlot], 0); /*sc_reset(card_in_slot[request->bSlot]);*/
/*sc_disconnect_card(card_in_slot[request->bSlot], 0);*/
} else {
sc_result = sc_connect_card(reader, request->bSlot,
&card_in_slot[request->bSlot]);
#ifdef BUERGERCLIENT_WORKAROUND
if (sc_result >= 0) {
if (get_ef_card_access(card_in_slot[request->bSlot],
(u8 **) &ef_cardaccess, &ef_cardaccess_length) < 0) {
sc_error(ctx, "Could not get EF.CardAccess.");
}
}
#endif
} }
sc_result = sc_connect_card(reader, request->bSlot,
&card_in_slot[request->bSlot]);
} else { } else {
sc_result = SC_ERROR_INVALID_DATA; sc_result = SC_ERROR_INVALID_DATA;
} }
if (sc_result >= 0) { if (sc_result >= 0) {
#ifdef BUERGERCLIENT_WORKAROUND
if (get_ef_card_access(card_in_slot[request->bSlot],
(u8 **) &ef_cardaccess, &ef_cardaccess_length) < 0) {
sc_error(ctx, "Could not get EF.CardAccess.");
}
#endif
return get_RDR_to_PC_SlotStatus(request->bSlot, request->bSeq, return get_RDR_to_PC_SlotStatus(request->bSlot, request->bSeq,
sc_result, out, outlen, card_in_slot[request->bSlot]->atr, sc_result, out, outlen, card_in_slot[request->bSlot]->atr,
card_in_slot[request->bSlot]->atr_len); card_in_slot[request->bSlot]->atr_len);

3
ccid/src/ccid.h
View File

@@ -86,6 +86,9 @@ extern "C" {
#define CCID_SLOT4_CARD_PRESENT 0x40 #define CCID_SLOT4_CARD_PRESENT 0x40
#define CCID_SLOT4_CHANGED 0x80 #define CCID_SLOT4_CHANGED 0x80
#define CCID_EXT_APDU_MAX (4 + 3 + 0xffff + 3)
#define CCID_SHORT_APDU_MAX (4 + 1 + 0xff + 1)
struct ccid_class_descriptor { struct ccid_class_descriptor {
__u8 bLength; __u8 bLength;
__u8 bDescriptorType; __u8 bDescriptorType;

12
ccid/src/usb.c
View File

@@ -154,11 +154,13 @@ config = {
static struct usb_interface_descriptor static struct usb_interface_descriptor
source_sink_intf = { source_sink_intf = {
.bLength = sizeof source_sink_intf, .bLength = sizeof source_sink_intf,
.bDescriptorType = USB_DT_INTERFACE, .bDescriptorType = USB_DT_INTERFACE,
.bInterfaceClass = USB_CLASS_CSCID, .bInterfaceClass = USB_CLASS_CSCID,
.iInterface = STRINGID_INTERFACE, .bInterfaceSubClass = 0,
.bInterfaceProtocol = 0,
.iInterface = STRINGID_INTERFACE,
}; };
static struct hid_class_descriptor static struct hid_class_descriptor
hid_desc = { hid_desc = {
@@ -989,7 +991,7 @@ static void *ccid (void *param)
char *source_name = names[0]; char *source_name = names[0];
char *sink_name = names[1]; char *sink_name = names[1];
int result; int result;
size_t bufsize = sizeof(PC_to_RDR_XfrBlock_t) + 0xffff; size_t bufsize = sizeof(PC_to_RDR_XfrBlock_t) + CCID_EXT_APDU_MAX;
__u8 inbuf[bufsize]; __u8 inbuf[bufsize];
source_fd = source_open (source_name); source_fd = source_open (source_name);