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

-Bugfix: Selection from current DF

Browse Source 
-Replaced print by logging


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@495 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-08-17 14:18:55 +00:00
parent 9558f4ffb7
commit ee7aff5293
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,7 +655,7 @@ class MF(DF): # {{{
else: else:
selected = walk(self.currentDF(), data) selected = walk(self.currentDF(), data)
elif p1 == P1_CHILD_DF or p1 == P1_CHILD_EF: elif p1 == P1_CHILD_DF or p1 == P1_CHILD_EF:
selected = self.select('fid', stringtoint(data)) selected = self.currentDF().select('fid', stringtoint(data))
if ((p1 == P1_CHILD_DF and not isinstance(selected, DF)) or if ((p1 == P1_CHILD_DF and not isinstance(selected, DF)) or
(p1 == P1_CHILD_EF and not isinstance(selected, EF))): (p1 == P1_CHILD_EF and not isinstance(selected, EF))):
# Command incompatible with file structure # Command incompatible with file structure
@@ -1670,7 +1670,7 @@ class CryptoflexMF(MF): # {{{
raise SwError(SW["ERR_INCORRECTPARAMETERS"]) raise SwError(SW["ERR_INCORRECTPARAMETERS"])
file = DF(**args) file = DF(**args)
else: else:
print "unknown type: 0x%x" % ord(data[6]) logging.error("unknown type: 0x%x" % ord(data[6]))
raise SwError(SW["ERR_INCORRECTPARAMETERS"]) raise SwError(SW["ERR_INCORRECTPARAMETERS"])