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

fixed extracting reference flags for select

Browse Source
This commit is contained in:
Frank Morgner
2013-07-09 07:34:05 +02:00
parent 8e5d044ab5
commit d6bf6a0b93
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
virtualsmartcard/src/vpicc/virtualsmartcard/ConstantDefinitions.py
View File

@@ -223,6 +223,7 @@ REF = {
"NUMBER_TO_LAST" : 0x05, "NUMBER_TO_LAST" : 0x05,
"NUMBER_FROM_LAST" : 0x06, "NUMBER_FROM_LAST" : 0x06,
"NUMBER_CONTROL" : 0x07, "NUMBER_CONTROL" : 0x07,
"REFERENCE_CONTROL" : 0x07, "REFERENCE_CONTROL_RECORD" : 0x07,
"REFERENCE_CONTROL_SELECT" : 0x03,
} }

6
virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardFilesystem.py
View File

@@ -656,7 +656,7 @@ class MF(DF):
else: else:
index_current = self.content.index(df) index_current = self.content.index(df)
selected = self.select('dfname', data, p2 & selected = self.select('dfname', data, p2 &
REF["REFERENCE_CONTROL"], index_current) REF["REFERENCE_CONTROL_SELECT"], index_current)
else: else:
logging.debug("unknown selection method: p1 =%s" % p1) logging.debug("unknown selection method: p1 =%s" % p1)
selected = None selected = None
@@ -934,7 +934,7 @@ class MF(DF):
self.current = ef self.current = ef
ef.resetRecordPointer() ef.resetRecordPointer()
return ef, num_id, p2 & REF["REFERENCE_CONTROL"] return ef, num_id, p2 & REF["REFERENCE_CONTROL_RECORD"]
def readRecordPlain(self, p1, p2, data): def readRecordPlain(self, p1, p2, data):
""" """
@@ -1049,7 +1049,7 @@ class MF(DF):
:returns: the status bytes as two byte long integer and the response :returns: the status bytes as two byte long integer and the response
data as binary string. data as binary string.
""" """
if p1 != 0 or (p2 & REF["REFERENCE_CONTROL"]) != 0: if p1 != 0 or (p2 & REF["REFERENCE_CONTROL_RECORD"]) != 0:
raise SwError(SW["ERR_INCORRECTP1P2"]) raise SwError(SW["ERR_INCORRECTP1P2"])
ef, num_id, reference = self.recordHandlingDecode(p1, p2) ef, num_id, reference = self.recordHandlingDecode(p1, p2)
sw = ef.appendrecord(data) sw = ef.appendrecord(data)