From 48ca031930dbfa1b6e946aa924cd9eb5b57942fa Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Mon, 7 Nov 2011 15:24:02 +0000 Subject: [PATCH] omitting initialize for ta for unauthenticated terminals git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@629 96b47cad-a561-4643-ad3b-153ac7d7599c --- npa/src/npa.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/npa/src/npa.c b/npa/src/npa.c index 6a4db44..0219e0d 100644 --- a/npa/src/npa.c +++ b/npa/src/npa.c @@ -1252,8 +1252,9 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card, bin_log(card->ctx, SC_LOG_DEBUG_NORMAL, "ID PCD", pace_output->id_pcd, pace_output->id_pcd_length); - if(!EAC_CTX_init_ta(eac_ctx, NULL, 0, NULL, 0, pace_output->recent_car, - pace_output->recent_car_length)) { + if(pace_output->recent_car && pace_output->recent_car_length + && !EAC_CTX_init_ta(eac_ctx, NULL, 0, NULL, 0, + pace_output->recent_car, pace_output->recent_car_length)) { sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not initialize TA.\n"); ssl_error(card->ctx); r = SC_ERROR_INTERNAL; @@ -1317,7 +1318,7 @@ err: npa_sm_clear_free(sctx->priv_data); } - return r; + SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r); } static const char *MRZ_name = "MRZ";