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

return remaining tries of PIN verification in MSE:Set AT

Browse Source
This commit is contained in:
Frank Morgner
2014-02-27 01:13:15 +01:00
parent 93947962e4
commit 6ad3f6070c
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py
View File

@@ -77,18 +77,6 @@ class nPA_AT_CRT(ControlReferenceTemplate):
else: else:
raise SwError(SW["ERR_REFNOTUSABLE"]) raise SwError(SW["ERR_REFNOTUSABLE"])
structure = unpack(config)
pin_ref_str = '%c'% self.PACE_PIN
for tlv in structure:
if [0x83, len(pin_ref_str), pin_ref_str] == tlv:
if self.sam.counter <= 0:
r = 0x63c0
elif self.sam.counter == 1:
r = 0x63c1
elif self.sam.counter == 2:
r = 0x63c2
return r, "" return r, ""
class nPA_SE(Security_Environment): class nPA_SE(Security_Environment):
@@ -113,6 +101,13 @@ class nPA_SE(Security_Environment):
sw, resp = Security_Environment._set_SE(self, p2, data) sw, resp = Security_Environment._set_SE(self, p2, data)
if self.at.algorithm == "PACE": if self.at.algorithm == "PACE":
if self.at.keyref_is_pin():
if self.sam.counter <= 0:
print "Must use PUK to unblock"
raise SwError(SW["WARN_NOINFO63"])
if self.sam.counter == 1 and not self.sam.active:
print "Must use CAN to activate"
return 0x63c1, ""
self.eac_step = 0 self.eac_step = 0
elif self.at.algorithm == "TA": elif self.at.algorithm == "TA":
if self.eac_step != 4: if self.eac_step != 4: