car and certificate description are now optional for npa_ctx_create

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@630 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-11-07 15:51:43 +00:00
parent 48ca031930
commit 5d1071f68f

View File

@@ -216,18 +216,25 @@ npa_sm_ctx_create(EAC_CTX *ctx, const unsigned char *certificate_description,
out->ctx = ctx; out->ctx = ctx;
out->certificate_description = BUF_MEM_create_init(certificate_description, if (certificate_description && certificate_description_length) {
certificate_description_length); out->certificate_description =
if (!out->certificate_description) BUF_MEM_create_init(certificate_description,
goto err; certificate_description_length);
if (!out->certificate_description)
goto err;
} else
out->certificate_description = NULL;
out->id_icc = BUF_MEM_create_init(id_icc, id_icc_length); out->id_icc = BUF_MEM_create_init(id_icc, id_icc_length);
if (!out->id_icc) if (!out->id_icc)
goto err; goto err;
out->cur_car = BUF_MEM_create_init(car, car_length); if (car && car_length) {
if (!out->cur_car) out->cur_car = BUF_MEM_create_init(car, car_length);
goto err; if (!out->cur_car)
goto err;
} else
out->cur_car = NULL;
out->nonce = NULL; out->nonce = NULL;
out->next_car = NULL; out->next_car = NULL;