From 40881a9eef6a2ec7d8f737837fdaad10220f331c Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Wed, 8 Feb 2012 15:51:14 +0000 Subject: [PATCH] - fixed CA OID - applied pypace interface for ca git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@711 96b47cad-a561-4643-ad3b-153ac7d7599c --- .../src/vpicc/virtualsmartcard/cards/nPA.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py b/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py index 1d3679e..0cb725a 100644 --- a/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py +++ b/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py @@ -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