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

fixed memory leaks

Browse Source
This commit is contained in:
Frank Morgner
2012-10-05 13:52:15 +02:00
parent e99979fab1
commit 1edbc97845
3 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
npa/src/npa-tool.c
View File

@@ -517,6 +517,7 @@ main (int argc, char **argv)
} }
err: err:
cmdline_parser_free(&cmdline);
sm_ctx_clear_free(&sctx); sm_ctx_clear_free(&sctx);
sm_ctx_clear_free(&tmpctx); sm_ctx_clear_free(&tmpctx);
if (pace_output.ef_cardaccess) if (pace_output.ef_cardaccess)
@@ -531,6 +532,15 @@ err:
free(pace_output.id_pcd); free(pace_output.id_pcd);
if (input) if (input)
fclose(input); fclose(input);
if (certs) {
i = 0;
while (certs[i]) {
free((unsigned char *) certs[i]);
i++;
}
free(certs);
}
free(certs_lens);
sc_reset(card, 1); sc_reset(card, 1);
sc_disconnect_card(card); sc_disconnect_card(card);

70
npa/src/npa.c
View File

@@ -1175,13 +1175,14 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
goto err; goto err;
} }
if (!bio_stdout)
bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
if (!bio_stdout) { if (!bio_stdout) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create output buffer."); bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
ssl_error(card->ctx); if (!bio_stdout) {
r = SC_ERROR_INTERNAL; sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create output buffer.");
goto err; ssl_error(card->ctx);
r = SC_ERROR_INTERNAL;
goto err;
}
} }
printf("Certificate Description\n"); printf("Certificate Description\n");
@@ -1220,13 +1221,14 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
* This behaviour differs from TR-03119 v1.1 p. 44. */ * This behaviour differs from TR-03119 v1.1 p. 44. */
if (pace_input.chat_length && pace_input.chat) { if (pace_input.chat_length && pace_input.chat) {
if (!bio_stdout)
bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
if (!bio_stdout) { if (!bio_stdout) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create output buffer."); bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
ssl_error(card->ctx); if (!bio_stdout) {
r = SC_ERROR_INTERNAL; sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not create output buffer.");
goto err; ssl_error(card->ctx);
r = SC_ERROR_INTERNAL;
goto err;
}
} }
pp = pace_input.chat; pp = pace_input.chat;
@@ -1476,16 +1478,16 @@ err:
BUF_MEM_free(comp_pub_opp); BUF_MEM_free(comp_pub_opp);
if (comp_pub) if (comp_pub)
BUF_MEM_free(comp_pub); BUF_MEM_free(comp_pub);
if (sec) PACE_SEC_clear_free(sec);
PACE_SEC_clear_free(sec);
if (bio_stdout) if (bio_stdout)
BIO_free_all(bio_stdout); BIO_free_all(bio_stdout);
if (desc) if (desc)
CVC_CERTIFICATE_DESCRIPTION_free(desc); CVC_CERTIFICATE_DESCRIPTION_free(desc);
if (chat)
CVC_CHAT_free(chat);
if (r < 0) { if (r < 0) {
if (eac_ctx) EAC_CTX_clear_free(eac_ctx);
EAC_CTX_clear_free(eac_ctx);
if (sctx->priv_data) if (sctx->priv_data)
npa_sm_clear_free(sctx->priv_data); npa_sm_clear_free(sctx->priv_data);
} }
@@ -1732,10 +1734,8 @@ int perform_terminal_authentication(struct sm_ctx *ctx, sc_card_t *card,
err: err:
if (cvc_cert) if (cvc_cert)
CVC_CERT_free(cvc_cert); CVC_CERT_free(cvc_cert);
if (nonce) BUF_MEM_clear_free(nonce);
BUF_MEM_free(nonce); BUF_MEM_clear_free(signature);
if (signature)
BUF_MEM_free(signature);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r); SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
} }
@@ -1847,7 +1847,8 @@ int get_ef_card_security(struct sm_ctx *npactx, sc_card_t *card,
int perform_chip_authentication(struct sm_ctx *ctx, sc_card_t *card) int perform_chip_authentication(struct sm_ctx *ctx, sc_card_t *card)
{ {
int r; int r;
BUF_MEM *picc_pubkey = NULL, *nonce = NULL, *token = NULL, *eph_pub_key = NULL; BUF_MEM *picc_pubkey = NULL, *nonce = NULL, *token = NULL,
*eph_pub_key = NULL;
unsigned char *ef_cardsecurity = NULL; unsigned char *ef_cardsecurity = NULL;
size_t ef_cardsecurity_len; size_t ef_cardsecurity_len;
@@ -1920,15 +1921,14 @@ int perform_chip_authentication(struct sm_ctx *ctx, sc_card_t *card)
} }
err: err:
free(ef_cardsecurity); if (ef_cardsecurity) {
if (picc_pubkey) OPENSSL_cleanse(ef_cardsecurity, ef_cardsecurity_len);
BUF_MEM_free(picc_pubkey); free(ef_cardsecurity);
if (nonce) }
BUF_MEM_free(nonce); BUF_MEM_clear_free(picc_pubkey);
if (token) BUF_MEM_clear_free(nonce);
BUF_MEM_free(token); BUF_MEM_clear_free(token);
if (eph_pub_key) BUF_MEM_clear_free(eph_pub_key);
BUF_MEM_free(eph_pub_key);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r); SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
} }
@@ -2020,10 +2020,7 @@ npa_sm_encrypt(sc_card_t *card, const struct sm_ctx *ctx,
r = encbuf->length; r = encbuf->length;
err: err:
if (databuf) { BUF_MEM_clear_free(databuf);
OPENSSL_cleanse(databuf->data, databuf->max);
BUF_MEM_free(databuf);
}
if (encbuf) if (encbuf)
BUF_MEM_free(encbuf); BUF_MEM_free(encbuf);
@@ -2064,10 +2061,7 @@ npa_sm_decrypt(sc_card_t *card, const struct sm_ctx *ctx,
r = databuf->length; r = databuf->length;
err: err:
if (databuf) { BUF_MEM_clear_free(databuf);
OPENSSL_cleanse(databuf->data, databuf->max);
BUF_MEM_free(databuf);
}
if (encbuf) if (encbuf)
BUF_MEM_free(encbuf); BUF_MEM_free(encbuf);

10
npa/src/sm.c
View File

@@ -567,11 +567,11 @@ static int sm_decrypt(const struct sm_ctx *ctx, sc_card_t *card,
r = SC_SUCCESS; r = SC_SUCCESS;
err: err:
if (asn1) { free(asn1);
free(asn1); free(mac_data);
} if (data) {
if (mac_data) { sc_mem_clear(data, buf_len);
free(mac_data); free(data);
} }
return r; return r;