giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #556 from philipWendland/dead-code 

IsoApplet: fix dead code + pincache
This commit is contained in:
Frank Morgner 2015-09-18 17:54:12 +02:00
parent ba02d69f2b 09fb1e71a9
commit bc9e42ddd7
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libopensc/card-isoApplet.c
View File

@ -1067,7 +1067,7 @@ isoApplet_set_security_env(sc_card_t *card,
sc_apdu_t apdu;
u8 sbuf[SC_MAX_APDU_BUFFER_SIZE];
u8 *p;
int r, locked = 0;
int r;
struct isoApplet_drv_data *drvdata = DRVDATA(card);
LOG_FUNC_CALLED(card->ctx);
@ -1155,41 +1155,14 @@ isoApplet_set_security_env(sc_card_t *card,
apdu.datalen = r;
apdu.data = sbuf;
if (se_num > 0)
{
r = sc_lock(card);
LOG_TEST_RET(card->ctx, r, "sc_lock() failed");
locked = 1;
}
if (apdu.datalen != 0)
{
r = sc_transmit_apdu(card, &apdu);
if (r)
{
sc_log(card->ctx, "%s: APDU transmit failed", sc_strerror(r));
goto err;
}
LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
r = sc_check_sw(card, apdu.sw1, apdu.sw2);
if (r)
{
sc_log(card->ctx, "%s: Card returned error", sc_strerror(r));
goto err;
}
LOG_TEST_RET(card->ctx, r, "Card returned error");
}
if (se_num <= 0)
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0x22, 0xF2, se_num);
r = sc_transmit_apdu(card, &apdu);
sc_unlock(card);
LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
r = sc_check_sw(card, apdu.sw1, apdu.sw2);
LOG_FUNC_RETURN(card->ctx, r);
err:
if (locked)
sc_unlock(card);
LOG_FUNC_RETURN(card->ctx, r);
}

4
src/pkcs15init/pkcs15-isoApplet.c
View File

@ -295,8 +295,10 @@ isoApplet_create_pin(sc_profile_t *profile, sc_pkcs15_card_t *p15card, sc_file_t
pin_attrs->reference,
NULL, 0,
pin, pin_len, NULL);
LOG_TEST_RET(card->ctx, r, "Failed to set PIN");
LOG_FUNC_RETURN(card->ctx, r);
sc_pkcs15_pincache_add(p15card, pin_obj, pin, pin_len);
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
}
/*