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

adapted to openpace

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@705 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-02-01 20:31:42 +00:00
parent 4de6741bbc
commit da253c888f
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
npa/src/npa.c
View File

@@ -171,8 +171,6 @@ struct npa_sm_ctx {
BUF_MEM *eph_pub_key; BUF_MEM *eph_pub_key;
/** Auxiliary Data */ /** Auxiliary Data */
BUF_MEM *auxiliary_data; BUF_MEM *auxiliary_data;
/** Nonce generated in TA */
BUF_MEM *nonce;
/** CAR of the card's most recent imported certificate */ /** CAR of the card's most recent imported certificate */
BUF_MEM *cur_car; BUF_MEM *cur_car;
/** CHR of the certificate to be imported */ /** CHR of the certificate to be imported */
@@ -236,7 +234,6 @@ npa_sm_ctx_create(EAC_CTX *ctx, const unsigned char *certificate_description,
} else } else
out->cur_car = NULL; out->cur_car = NULL;
out->nonce = NULL;
out->next_car = NULL; out->next_car = NULL;
out->eph_pub_key = NULL; out->eph_pub_key = NULL;
out->auxiliary_data = NULL; out->auxiliary_data = NULL;
@@ -1856,13 +1853,14 @@ npa_sm_finish(sc_card_t *card, const struct sm_ctx *ctx,
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Saving MRTD's nonce to later verify Terminal's signature"); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Saving MRTD's nonce to later verify Terminal's signature");
if (eacsmctx->nonce) BUF_MEM *nonce = BUF_MEM_create_init(apdu->resp, apdu->resplen);
BUF_MEM_free(eacsmctx->nonce); int r = TA_STEP4_set_nonce(eacsmctx->ctx, nonce);
BUF_MEM_free(nonce);
eacsmctx->nonce = BUF_MEM_create_init(apdu->resp, apdu->resplen); if (!r) {
if (!eacsmctx->nonce) ssl_error(card->ctx);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, SC_ERROR_INTERNAL);
SC_ERROR_OUT_OF_MEMORY); }
} }
} }
@@ -1879,8 +1877,6 @@ npa_sm_clear_free(const struct sm_ctx *ctx)
BN_clear_free(eacsmctx->ssc); BN_clear_free(eacsmctx->ssc);
if (eacsmctx->certificate_description) if (eacsmctx->certificate_description)
BUF_MEM_free(eacsmctx->certificate_description); BUF_MEM_free(eacsmctx->certificate_description);
if (eacsmctx->nonce)
BUF_MEM_free(eacsmctx->nonce);
if (eacsmctx->id_icc) if (eacsmctx->id_icc)
BUF_MEM_free(eacsmctx->id_icc); BUF_MEM_free(eacsmctx->id_icc);
if (eacsmctx->eph_pub_key) if (eacsmctx->eph_pub_key)