[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/26] hw/usb/dev-smartcard-reader.c: copy atr's pro
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH 18/26] hw/usb/dev-smartcard-reader.c: copy atr's protocol to ccid's parameters (adds todo's) |
Date: |
Mon, 18 Mar 2013 15:11:04 +0200 |
From: Alon Levy <address@hidden>
Signed-off-by: Alon Levy <address@hidden>
---
hw/usb/dev-smartcard-reader.c | 46 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 6894f36..522fefa 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -839,14 +839,60 @@ static void ccid_write_data_block_answer(USBCCIDState *s,
ccid_write_data_block(s, slot, seq, data, len);
}
+static uint8_t atr_get_protocol_num(const uint8_t *atr, uint32_t len)
+{
+ int i;
+
+ if (len < 2 || !(atr[1] & 0x80)) {
+ /* too short or TD1 not included */
+ return 0; /* T=0, default */
+ }
+ i = 1 + !!(atr[1] & 0x10) + !!(atr[1] & 0x20) + !!(atr[1] & 0x40);
+ i += !!(atr[1] & 0x80);
+ return atr[i] & 0x0f;
+}
+
static void ccid_write_data_block_atr(USBCCIDState *s, CCID_Header *recv)
{
const uint8_t *atr = NULL;
uint32_t len = 0;
+ uint8_t atr_protocol_num;
+ CCID_T0ProtocolDataStructure *t0 = &s->abProtocolDataStructure.t0;
+ CCID_T1ProtocolDataStructure *t1 = &s->abProtocolDataStructure.t1;
if (s->card) {
atr = ccid_card_get_atr(s->card, &len);
}
+ atr_protocol_num = atr_get_protocol_num(atr, len);
+ DPRINTF(s, D_VERBOSE, "%s: atr contains protocol=%d\n", __func__,
+ atr_protocol_num);
+ /* set parameters from ATR - see spec page 109 */
+ s->bProtocolNum = (atr_protocol_num <= 1 ? atr_protocol_num
+ : s->bProtocolNum);
+ if (atr_protocol_num == 0) {
+ DPRINTF(s, D_WARN, "%s: error: unimplemented ATR T0 parameters"
+ " setting\n", __func__);
+ t0->bmFindexDindex = 0;
+ t0->bmTCCKST0 = 0;
+ t0->bGuardTimeT0 = 0;
+ t0->bWaitingIntegerT0 = 0;
+ t0->bClockStop = 0;
+ } else {
+ if (atr_protocol_num != 1) {
+ DPRINTF(s, D_WARN, "%s: error: unsupported ATR protocol %d\n",
+ __func__, atr_protocol_num);
+ } else {
+ DPRINTF(s, D_WARN, "%s: error: unimplemented ATR T1 parameters"
+ " setting\n", __func__);
+ t1->bmFindexDindex = 0;
+ t1->bmTCCKST1 = 0;
+ t1->bGuardTimeT1 = 0;
+ t1->bWaitingIntegerT1 = 0;
+ t1->bClockStop = 0;
+ t1->bIFSC = 0;
+ t1->bNadValue = 0;
+ }
+ }
ccid_write_data_block(s, recv->bSlot, recv->bSeq, atr, len);
}
--
1.8.1.4
- Re: [Qemu-devel] [PATCH 20/26] hw/usb/dev-smartcard-reader: support windows guest, (continued)
- [Qemu-devel] [PATCH 23/26] libcacard: change default ATR, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 19/26] hw/usb/dev-smartcard-reader.c: dwFeadvertise support for T=0 only, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 25/26] dev-smartcard-reader: empty implementation for Mechanical (fail correctly), Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 24/26] libcacard: move atr setting from macro to function, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 18/26] hw/usb/dev-smartcard-reader.c: copy atr's protocol to ccid's parameters (adds todo's),
Alon Levy <=
- [Qemu-devel] [PATCH 21/26] dev-smartcard-reader: reuse usb.h definitions, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 26/26] libcacard/cac.c: questionable change to single return of big switch functions, Alon Levy, 2013/03/18
- Re: [Qemu-devel] [PATCH 00/26] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/03/18