laforge
/
cyberflex-shell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore errors during decrypt/auth 

git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@156 f711b948-2313-0410-aaa9-d29f33439f0b
This commit is contained in:
hploetz 2006-11-29 20:26:00 +00:00
parent 050301e0a3
commit ec3cb54a7f
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cards/tcos_card.py
View File

@ -1,4 +1,4 @@
import utils, TLV_utils, crypto_utils
import utils, TLV_utils, crypto_utils, traceback
from iso_7816_4_card import *
import building_blocks
@ -118,17 +118,21 @@ class TCOS_Security_Environment(object):
if must_authenticate or must_decrypt:
tlv_data = TLV_utils.unpack(rapdu.data, include_filler=True)
if must_authenticate:
tlv_data = self.authenticate_response(tlv_data)
if must_decrypt:
tlv_data = self.decrypt_response(tlv_data)
#data = TLV_utils.pack(tlv_data, recalculate_length = True)
data = self.deformat_response(tlv_data)
new_apdu = R_APDU(rapdu, data = data)
result = new_apdu
try:
if must_authenticate:
tlv_data = self.authenticate_response(tlv_data)
if must_decrypt:
tlv_data = self.decrypt_response(tlv_data)
#data = TLV_utils.pack(tlv_data, recalculate_length = True)
data = self.deformat_response(tlv_data)
new_apdu = R_APDU(rapdu, data = data)
result = new_apdu
except ValueError:
print "Warning: Can't authenticate/decrypt response due to exception being raised"
traceback.print_exc(limit=2)
return result