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

- fixed CA OID

Browse Source 
- applied pypace interface for ca


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@711 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-02-08 15:51:14 +00:00
parent f11a7a8d33
commit 40881a9eef
1 changed files with 6 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

@@ -198,7 +198,7 @@ class nPA_SE(Security_Environment):
ef_card_access = self.mf.select('fid', 0x011c)
ef_card_access_data = ef_card_access.getenc('data')
pace.EAC_CTX_init_ef_cardaccess(ef_card_access_data, self.eac_ctx)
pace.EAC_CTX_init_ca(self.eac_ctx, pace.id_CA_DH_AES_CBC_CMAC_128, 13, None, None)
pace.EAC_CTX_init_ca(self.eac_ctx, pace.id_CA_ECDH_AES_CBC_CMAC_128, 13, None, None)
nonce = pace.buf2string(pace.PACE_STEP1_enc_nonce(self.eac_ctx, self.sec))
resp = nPA_SE.__pack_general_authenticate([[0x80, len(nonce), nonce]])
@@ -292,11 +292,12 @@ class nPA_SE(Security_Environment):
else:
raise SwError(SW["ERR_INCORRECTPARAMETERS"])
pace.CA_STEP4_compute_shared_secret(self.eac_ctx,
pace.get_buf(pubkey))
if pace.CA_STEP4_compute_shared_secret(self.eac_ctx,
pace.get_buf(pubkey)) != 1:
pace.print_ossl_err()
raise SwError(SW["ERR_NOINFO69"])
nonce, token = pace.CA_STEP5_derive_keys(self.eac_ctx,
pace.get_buf(pubkey))
nonce, token = pace.CA_STEP5_derive_keys(self.eac_ctx, pubkey)
# TODO activate SM