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

wrap errors in sm if decryption was successfull

Browse Source
This commit is contained in:
Frank Morgner
2013-07-09 07:09:28 +02:00
parent 470c364f78
commit a082227347
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,22 +328,21 @@ class Iso7816OS(SmartcardOS):
command_chaining &= 0x01 command_chaining &= 0x01
#}}} #}}}
sm = False
try: try:
if SM_STATUS == "Standard SM" or SM_STATUS == "Proprietary SM": if SM_STATUS == "Standard SM" or SM_STATUS == "Proprietary SM":
c = self.SAM.parse_SM_CAPDU(c, header_authentication) c = self.SAM.parse_SM_CAPDU(c, header_authentication)
logging.info("Decrypted APDU:\n%s", str(c)) logging.info("Decrypted APDU:\n%s", str(c))
sm = True
sw, result = self.ins2handler.get(c.ins, notImplemented)(c.p1, c.p2, c.data) sw, result = self.ins2handler.get(c.ins, notImplemented)(c.p1, c.p2, c.data)
if SM_STATUS == "Standard SM" or SM_STATUS == "Proprietary SM": answer = self.formatResult(Iso7816OS.seekable(c.ins), c.effective_Le, result, sw, sm)
answer = self.formatResult(Iso7816OS.seekable(c.ins), c.effective_Le, result, sw, True)
else:
answer = self.formatResult(Iso7816OS.seekable(c.ins), c.effective_Le, result, sw, False)
except SwError as e: except SwError as e:
logging.info(e.message) logging.info(e.message)
import traceback import traceback
traceback.print_exception(*sys.exc_info()) traceback.print_exception(*sys.exc_info())
sw = e.sw sw = e.sw
result = "" result = ""
answer = self.formatResult(False, 0, result, sw, False) answer = self.formatResult(False, 0, result, sw, sm)
return answer return answer