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

implemented get_data for iso7816 

mostly copied over from CardOS implementation
This commit is contained in:
Frank Morgner 2015-07-30 08:18:07 +02:00
parent 7eb62a0898
commit f71ef838e9
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libopensc/card-cardos.c
View File

@ -1217,35 +1217,6 @@ cardos_logout(sc_card_t *card)
return SC_ERROR_NOT_SUPPORTED;
}
static int cardos_get_data(struct sc_card *card, unsigned int tag, u8 *buf, size_t len)
{
int r;
struct sc_apdu apdu;
SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xCA,
(tag >> 8) & 0xff, tag & 0xff);
apdu.lc = 0;
apdu.datalen = 0;
apdu.le = len;
apdu.resp = buf;
apdu.resplen = len;
r = sc_transmit_apdu(card, &apdu);
SC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, "APDU transmit failed");
r = sc_check_sw(card, apdu.sw1, apdu.sw2);
SC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, "GET_DATA returned error");
if (apdu.resplen > len)
r = SC_ERROR_WRONG_LENGTH;
else
r = apdu.resplen;
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
}
/* eToken R2 supports WRITE_BINARY, PRO Tokens support UPDATE_BINARY */
static struct sc_card_driver * sc_get_driver(void)
@ -1266,7 +1237,6 @@ static struct sc_card_driver * sc_get_driver(void)
cardos_ops.card_ctl = cardos_card_ctl;
cardos_ops.pin_cmd = cardos_pin_cmd;
cardos_ops.logout = cardos_logout;
cardos_ops.get_data = cardos_get_data;
return &cardos_drv;
}

34
src/libopensc/iso7816.c
View File

@ -1128,6 +1128,38 @@ iso7816_pin_cmd(struct sc_card *card, struct sc_pin_cmd_data *data, int *tries_l
}
static int iso7816_get_data(struct sc_card *card, unsigned int tag, u8 *buf, size_t len)
{
int r, cse;
struct sc_apdu apdu;
SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
if (buf && len)
cse = SC_APDU_CASE_2;
else
cse = SC_APDU_CASE_1;
sc_format_apdu(card, &apdu, cse, 0xCA, (tag >> 8) & 0xff, tag & 0xff);
apdu.le = len;
apdu.resp = buf;
apdu.resplen = len;
r = sc_transmit_apdu(card, &apdu);
SC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, "APDU transmit failed");
r = sc_check_sw(card, apdu.sw1, apdu.sw2);
SC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, "GET_DATA returned error");
if (apdu.resplen > len)
r = SC_ERROR_WRONG_LENGTH;
else
r = apdu.resplen;
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
}
static int
iso7816_init(struct sc_card *card)
{
@ -1175,7 +1207,7 @@ static struct sc_card_operations iso_ops = {
iso7816_process_fci,
iso7816_construct_fci,
iso7816_pin_cmd,
NULL, /* get_data */
iso7816_get_data,
NULL, /* put_data */
NULL, /* delete_record */
NULL /* read_public_key */