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

changed response data for general authenticate step 4 to work with ausweisapp 1.8

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@776 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-04-24 08:59:57 +00:00
parent c45a602903
commit c27f02690e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ class nPA_AT_CRT(ControlReferenceTemplate):
def __init__(self): def __init__(self):
ControlReferenceTemplate.__init__(self, CRT_TEMPLATE["AT"]) ControlReferenceTemplate.__init__(self, CRT_TEMPLATE["AT"])
self.chat = None
def keyref_is_mrz(self): def keyref_is_mrz(self):
if self.keyref == '%c'% self.PACE_MRZ: if self.keyref == '%c'% self.PACE_MRZ:
@@ -66,8 +67,8 @@ class nPA_AT_CRT(ControlReferenceTemplate):
for tlv in structure: for tlv in structure:
tag, length, value = tlv tag, length, value = tlv
if tag == 0x7f4c: if tag == 0x7f4c:
chat = CHAT(bertlv_pack([[tag, length, value]])) self.chat = CHAT(bertlv_pack([[tag, length, value]]))
print(chat) print(self.chat)
elif tag == 0x67: elif tag == 0x67:
self.auxiliary_data = bertlv_pack([[tag, length, value]]) self.auxiliary_data = bertlv_pack([[tag, length, value]])
elif tag == 0x80 or tag == 0x84 or tag == 0x83: elif tag == 0x80 or tag == 0x84 or tag == 0x83:
@@ -297,10 +298,12 @@ class nPA_SE(Security_Environment):
self.ssc = 0 self.ssc = 0
pace.EAC_CTX_set_encryption_ctx(self.eac_ctx, pace.EAC_ID_PACE) pace.EAC_CTX_set_encryption_ctx(self.eac_ctx, pace.EAC_ID_PACE)
result = [[0x86, len(my_token), my_token]]
if self.at.chat:
pace.EAC_CTX_init_ta(self.eac_ctx, None, None, self.ca) pace.EAC_CTX_init_ta(self.eac_ctx, None, None, self.ca)
result.append([0x87, len(self.ca), self.ca])
return 0x9000, nPA_SE.__pack_general_authenticate([[0x86, len(my_token), my_token], return 0x9000, nPA_SE.__pack_general_authenticate(result)
[0x87, len(self.ca), self.ca]])
def __eac_ca(self, data): def __eac_ca(self, data):
tlv_data = nPA_SE.__unpack_general_authenticate(data) tlv_data = nPA_SE.__unpack_general_authenticate(data)