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

fixed CA, which is now successfully tested

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@712 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-02-09 10:00:48 +00:00
parent 40881a9eef
commit 06d96e6fae
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,6 +200,11 @@ class nPA_SE(Security_Environment):
pace.EAC_CTX_init_ef_cardaccess(ef_card_access_data, self.eac_ctx)
pace.EAC_CTX_init_ca(self.eac_ctx, pace.id_CA_ECDH_AES_CBC_CMAC_128, 13, None, None)
# we don't have a good CA key, so we simply generate an ephemeral one
if not pace.TA_STEP3_generate_ephemeral_key(self.eac_ctx):
pace.print_ossl_err()
raise SwError(SW["WARN_NOINFO63"])
nonce = pace.buf2string(pace.PACE_STEP1_enc_nonce(self.eac_ctx, self.sec))
resp = nPA_SE.__pack_general_authenticate([[0x80, len(nonce), nonce]])
@@ -292,13 +297,14 @@ class nPA_SE(Security_Environment):
else:
raise SwError(SW["ERR_INCORRECTPARAMETERS"])
if pace.CA_STEP4_compute_shared_secret(self.eac_ctx,
pace.get_buf(pubkey)) != 1:
if pace.CA_STEP4_compute_shared_secret(self.eac_ctx, pubkey) != 1:
pace.print_ossl_err()
raise SwError(SW["ERR_NOINFO69"])
nonce, token = pace.CA_STEP5_derive_keys(self.eac_ctx, pubkey)
print "Generated Nonce and Authentication Token for CA"
# TODO activate SM
return 0x9000, nPA_SE.__pack_general_authenticate([[0x81,