deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: Fix timer extension handling.

Browse Source
This commit is contained in:
NIIBE Yutaka
2019-04-03 17:03:35 +09:00
parent f68ff0bddc
commit 2dd5a76002
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/card_reader.py
View File

@@ -25,6 +25,7 @@ from struct import pack
from usb.util import find_descriptor, claim_interface, get_string, \ from usb.util import find_descriptor, claim_interface, get_string, \
endpoint_type, endpoint_direction, \ endpoint_type, endpoint_direction, \
ENDPOINT_TYPE_BULK, ENDPOINT_OUT, ENDPOINT_IN ENDPOINT_TYPE_BULK, ENDPOINT_OUT, ENDPOINT_IN
from binascii import hexlify
# USB class, subclass, protocol # USB class, subclass, protocol
CCID_CLASS = 0x0B CCID_CLASS = 0x0B
@@ -240,8 +241,11 @@ class CardReader(object):
if info: if info:
data = compose_i_block(self.ns, info, more) data = compose_i_block(self.ns, info, more)
elif response_time_ext: elif response_time_ext:
# compose S-block # compose S-block response
data = b"\x00\xE3\x00\xE3" pcb = 0xe3
bwi_byte = pack('>B', response_time_ext)
edc = compute_edc(pcb, bwi_byte)
data = bytes([0, pcb, 1]) + bwi_byte + bytes([edc])
elif edc_error: elif edc_error:
data = compose_r_block(self.nr, edc_error=1) data = compose_r_block(self.nr, edc_error=1)
elif no_error: elif no_error:
@@ -277,7 +281,7 @@ class CardReader(object):
res = b"" res = b""
while True: while True:
if is_s_block_time_ext(blk): if is_s_block_time_ext(blk):
self.send_tpdu(response_time_ext=1) self.send_tpdu(response_time_ext=blk[3])
elif is_i_block_last(blk): elif is_i_block_last(blk):
self.nr = self.nr ^ 1 self.nr = self.nr ^ 1
if is_edc_error(blk): if is_edc_error(blk):