From: Alon Levy <alevy@redhat.com>
To: qemu-devel@nongnu.org
Cc: mlureau@redhat.com
Subject: [Qemu-devel] [PATCH v3 24/28] dev-smartcard-reader: copy atr protocol to ccid parameters
Date: Mon, 22 Apr 2013 18:04:54 +0300 [thread overview]
Message-ID: <1366643098-2566-25-git-send-email-alevy@redhat.com> (raw)
In-Reply-To: <1366643098-2566-1-git-send-email-alevy@redhat.com>
Adds todos.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
hw/usb/dev-smartcard-reader.c | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 8022f9f..78ef504 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -833,14 +833,59 @@ 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);
+ switch (atr_protocol_num) {
+ case 0:
+ /* TODO: unimplemented ATR T0 parameters */
+ t0->bmFindexDindex = 0;
+ t0->bmTCCKST0 = 0;
+ t0->bGuardTimeT0 = 0;
+ t0->bWaitingIntegerT0 = 0;
+ t0->bClockStop = 0;
+ break;
+ case 1:
+ /* TODO: unimplemented ATR T1 parameters */
+ t1->bmFindexDindex = 0;
+ t1->bmTCCKST1 = 0;
+ t1->bGuardTimeT1 = 0;
+ t1->bWaitingIntegerT1 = 0;
+ t1->bClockStop = 0;
+ t1->bIFSC = 0;
+ t1->bNadValue = 0;
+ break;
+ default:
+ DPRINTF(s, D_WARN, "%s: error: unsupported ATR protocol %d\n",
+ __func__, atr_protocol_num);
+ }
ccid_write_data_block(s, recv->bSlot, recv->bSeq, atr, len);
}
--
1.8.2
next prev parent reply other threads:[~2013-04-22 15:05 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 15:04 [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 01/28] libcacard: correct T0 historical bytes size Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 02/28] ccid-card-emul: do not crash if backend is not provided Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 03/28] ccid: make backend_enum_table "static const" and adjust users Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 04/28] ccid: declare DEFAULT_ATR table to be "static const" Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for nss db on win32 Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 06/28] util: move socket_init() to osdep.c Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 07/28] build-sys: must link with -fstack-protector Alon Levy
2013-05-13 15:20 ` Laurent Desnogues
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 09/28] libcacard: split vscclient main() from socket reading Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 10/28] libcacard: vscclient to use QemuThread for portability Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 11/28] libcacard: teach vscclient to use GMainLoop " Alon Levy
2013-05-13 14:51 ` Laurent Desnogues
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 12/28] libcacard: remove sql: prefix Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 13/28] libcacard: remove default libcoolkey loading Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 14/28] dev-smartcard-reader: white space fixes Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 15/28] dev-smartcard-reader: nicer debug messages Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 16/28] dev-smartcard-reader: remove aborts (never triggered, but just in case) Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 17/28] dev-smartcard-reader: support windows guest Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 18/28] dev-smartcard-reader: reuse usb.h definitions Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 19/28] libcacard: change default ATR Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 20/28] ccid-card-passthru: add atr check Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 21/28] ccid-card-passthru, dev-smartcard-reader: add debug environment variables Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 22/28] dev-smartcard-reader: define structs for CCID_Parameter internals Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 23/28] dev-smartcard-reader: change default protocol to T=0 Alon Levy
2013-04-22 15:04 ` Alon Levy [this message]
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 25/28] libcacard/vreader: add debugging messages for apdu Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 26/28] libcacard: move atr setting from macro to function Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 27/28] dev-smartcard-reader: empty implementation for Mechanical (fail correctly) Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 28/28] libcacard/cac: change big switch functions to single return point Alon Levy
2013-04-22 20:52 ` [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366643098-2566-25-git-send-email-alevy@redhat.com \
--to=alevy@redhat.com \
--cc=mlureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).