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

use python wrappers to EAC_CTX and PACE_SEC

Browse Source 
requires openpace 17891be5ee99d32e67bd954fbb26ff5eab6a0609
This commit is contained in:
Frank Morgner
2013-11-01 19:38:52 +01:00
parent 9970fbe742
commit 0e9b87cc7b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ from virtualsmartcard.TLVutils import unpack, bertlv_pack
from virtualsmartcard.SmartcardFilesystem import make_property from virtualsmartcard.SmartcardFilesystem import make_property
from virtualsmartcard.utils import inttostring from virtualsmartcard.utils import inttostring
import virtualsmartcard.CryptoUtils as vsCrypto import virtualsmartcard.CryptoUtils as vsCrypto
from chat import CHAT, CVC from chat import CHAT, CVC, PACE_SEC, EAC_CTX
import pace import pace
class nPA_AT_CRT(ControlReferenceTemplate): class nPA_AT_CRT(ControlReferenceTemplate):
@@ -92,7 +92,6 @@ class nPA_AT_CRT(ControlReferenceTemplate):
return r, "" return r, ""
class nPA_SE(Security_Environment): class nPA_SE(Security_Environment):
# TODO call __eac_abort whenever an error occurred
eac_step = make_property("eac_step", "next step to performed for EAC") eac_step = make_property("eac_step", "next step to performed for EAC")
@@ -144,13 +143,6 @@ class nPA_SE(Security_Environment):
raise SwError(SW["ERR_INCORRECTPARAMETERS"]) raise SwError(SW["ERR_INCORRECTPARAMETERS"])
def __eac_abort(self):
pace.EAC_CTX_clear_free(self.eac_ctx)
self.eac_ctx = None
pace.PACE_SEC_clear_free(self.sec)
self.sec = None
pace.EAC_cleanup()
@staticmethod @staticmethod
def __unpack_general_authenticate(data): def __unpack_general_authenticate(data):
data_structure = [] data_structure = []
@@ -174,9 +166,9 @@ class nPA_SE(Security_Environment):
raise SwError(SW["WARN_NOINFO63"]) raise SwError(SW["WARN_NOINFO63"])
if self.at.keyref_is_mrz(): if self.at.keyref_is_mrz():
self.sec = pace.PACE_SEC_new(self.sam.mrz, pace.PACE_MRZ) self.PACE_SEC = PACE_SEC(self.sam.mrz, pace.PACE_MRZ)
elif self.at.keyref_is_can(): elif self.at.keyref_is_can():
self.sec = pace.PACE_SEC_new(self.sam.can, pace.PACE_CAN) self.PACE_SEC = PACE_SEC(self.sam.can, pace.PACE_CAN)
elif self.at.keyref_is_pin(): elif self.at.keyref_is_pin():
if self.sam.counter <= 0: if self.sam.counter <= 0:
print "Must use PUK to unblock" print "Must use PUK to unblock"
@@ -184,22 +176,24 @@ class nPA_SE(Security_Environment):
if self.sam.counter == 1 and not self.sam.active: if self.sam.counter == 1 and not self.sam.active:
print "Must use CAN to activate" print "Must use CAN to activate"
return 0x63c1, "" return 0x63c1, ""
self.sec = pace.PACE_SEC_new(self.sam.PIN, pace.PACE_PIN) self.PACE_SEC = PACE_SEC(self.sam.PIN, pace.PACE_PIN)
self.sam.counter -= 1 self.sam.counter -= 1
if self.sam.counter <= 1: if self.sam.counter <= 1:
self.sam.active = False self.sam.active = False
elif self.at.keyref_is_puk(): elif self.at.keyref_is_puk():
if self.sam.counter_puk <= 0: if self.sam.counter_puk <= 0:
raise SwError(SW["WARN_NOINFO63"]) raise SwError(SW["WARN_NOINFO63"])
self.sec = pace.PACE_SEC_new(self.sam.puk, pace.PACE_PUK) self.PACE_SEC = PACE_SEC(self.sam.puk, pace.PACE_PUK)
self.sam.counter_puk -= 1 self.sam.counter_puk -= 1
else: else:
raise SwError(SW["ERR_INCORRECTPARAMETERS"]) raise SwError(SW["ERR_INCORRECTPARAMETERS"])
self.sec = self.PACE_SEC.sec
if not self.eac_ctx: if not self.eac_ctx:
pace.EAC_init() pace.EAC_init()
self.eac_ctx = pace.EAC_CTX_new() self.EAC_CTX = EAC_CTX()
self.eac_ctx = self.EAC_CTX.ctx
pace.CA_disable_passive_authentication(self.eac_ctx) pace.CA_disable_passive_authentication(self.eac_ctx)
ef_card_security = self.mf.select('fid', 0x011d) ef_card_security = self.mf.select('fid', 0x011d)