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

fixed handling of SW1=0x61 in handler_test

Browse Source
This commit is contained in:
Frank Morgner
2013-07-18 14:09:38 +02:00
parent cdf68d62b3
commit a766a6e01a
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
virtualsmartcard/src/vpicc/virtualsmartcard/VirtualSmartcard.py
View File

@@ -568,38 +568,37 @@ class HandlerTestOS(SmartcardOS):
ok = '\x90\x00' ok = '\x90\x00'
error = '\x6d\x00' error = '\x6d\x00'
if msg == '\x00\xA4\x04\x00\x06\xA0\x00\x00\x00\x18\x50' or msg == '\x00\xA4\x04\x00\x06\xA0\x00\x00\x00\x18\xFF': if msg == '\x00\xA4\x04\x00\x06\xA0\x00\x00\x00\x18\x50' or msg == '\x00\xA4\x04\x00\x06\xA0\x00\x00\x00\x18\xFF':
print 'Select applet' logging.info('Select applet')
return ok return ok
elif msg.startswith('\x80\x38\x00'): elif msg.startswith('\x80\x38\x00'):
print 'Time Request' logging.info('Time Request')
return ok return ok
elif msg == '\x80\x30\x00\x00': elif msg == '\x80\x30\x00\x00':
print 'Case 1, APDU' logging.info('Case 1, APDU')
return ok return ok
elif msg == '\x80\x30\x00\x00\x00': elif msg == '\x80\x30\x00\x00\x00':
print 'Case 1, TPDU' logging.info('Case 1, TPDU')
return ok return ok
elif msg.startswith('\x80\x32\x00\x00'): elif msg.startswith('\x80\x32\x00\x00'):
print 'Case 3' logging.info('Case 3')
return ok return ok
elif msg.startswith('\x80\x34'): elif msg.startswith('\x80\x34'):
print 'Case 2' logging.info('Case 2')
return self.__output_from_le(msg) + ok return self.__output_from_le(msg) + ok
elif msg.startswith('\x80\x36'): elif msg.startswith('\x80\x36'):
if len(msg) == 5+ord(msg[4]): if len(msg) == 5+ord(msg[4]):
print 'Case 4, TPDU' logging.info('Case 4, TPDU')
self.lastCommandOffcut = self.__output_from_le(msg) self.lastCommandOffcut = self.__output_from_le(msg)
# XXX the return code is expected by handler_test.c. According if len(self.lastCommandOffcut) > 0xFF:
# to ISO 7816 this should be: return '\x61\x00'
# '\x61' + chr(max(0xff, len(self.lastCommandOffcut))) return '' + chr(len(self.lastCommandOffcut)&0xFF)
return '\x61' + chr(len(self.lastCommandOffcut)&0xFF)
elif len(msg) == 6+ord(msg[4]): elif len(msg) == 6+ord(msg[4]):
print 'Case 4, APDU' logging.info('Case 4, APDU')
return self.__output_from_le(msg) + ok return self.__output_from_le(msg) + ok
else: else:
return error return error
elif msg.startswith('\x80\xC0\x00\x00'): elif msg.startswith('\x80\xC0\x00\x00'):
print 'Get response' logging.info('Get response')
out = self.lastCommandOffcut[:ord(msg[4])] out = self.lastCommandOffcut[:ord(msg[4])]
self.lastCommandOffcut = self.lastCommandOffcut[ord(msg[4]):] self.lastCommandOffcut = self.lastCommandOffcut[ord(msg[4]):]
return out + ok return out + ok