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

Preliminary extended length APDU support

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@429 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-07-25 11:48:25 +00:00
parent d248e5ae40
commit 6e6dd7cfa7
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
virtualsmartcard/src/vpicc/virtualsmartcard/utils.py
View File

@@ -290,21 +290,34 @@ class C_APDU(APDU):
apdu = apdu + [0] * max(4-len(apdu), 0)
self.CLA, self.INS, self.P1, self.P2 = apdu[:4] # case 1, 2, 3, 4
if len(apdu) == 5: # case 2
self.Le = apdu[-1]
if len(apdu) == 4: # case 1
self.data = ""
elif len(apdu) > 5: # case 3, 4
self.Lc = apdu[4]
if len(apdu) == 5 + self.Lc: # case 3
self.data = apdu[5:]
elif len(apdu) == 5 + self.Lc + 1: # case 4
self.data = apdu[5:-1]
elif (len(apdu) >= 7) and (apdu[5] == 0): # extended length apdu
self.Lc = (apdu[5]<<8) + apdu[6]
if len(apdu) == 7: # case 2 extended length
self.data = ""
elif len(apdu) == 7 + self.Lc: # case 3 extended length
self.data = apdu[7:]
elif len(apdu) == 7 + self.Lc + 3: # case 4 extended length
self.data = apdu[7:-3]
self.Le = (apdu[-2]<<8) + apdu[-1]
else:
raise ValueError, "Invalid Lc value. Is %s, should be %s or %s" % (self.Lc,
7 + self.Lc, 7 + self.Lc + 3)
else: # short apdu
if len(apdu) == 5: # case 2 short apdu
self.Le = apdu[-1]
self.data = ""
elif len(apdu) > 5: # case 3, 4 short apdu
self.Lc = apdu[4]
if len(apdu) == 5 + self.Lc: # case 3
self.data = apdu[5:]
elif len(apdu) == 5 + self.Lc + 1: # case 4
self.data = apdu[5:-1]
self.Le = apdu[-1]
else:
raise ValueError, "Invalid Lc value. Is %s, should be %s or %s" % (self.Lc,
5 + self.Lc, 5 + self.Lc + 1)
else: # case 1
self.data = ""
CLA = _make_byte_property("CLA"); cla = CLA
INS = _make_byte_property("INS"); ins = INS