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

avoid looping forever in GET CHALLENGE

Browse Source 
fixes https://github.com/OpenSC/OpenSC/issues/1440
This commit is contained in:
Frank Morgner 2018-08-20 14:37:20 +02:00
parent fcf00e66cd
commit ff8ec86f26
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libopensc/card.c
View File

@ -818,6 +818,7 @@ int sc_put_data(sc_card_t *card, unsigned int tag, const u8 *buf, size_t len)
int sc_get_challenge(sc_card_t *card, u8 *rnd, size_t len)
{
int r;
size_t retry = 10;
if (len == 0)
return SC_SUCCESS;
@ -835,15 +836,19 @@ int sc_get_challenge(sc_card_t *card, u8 *rnd, size_t len)
if (r != SC_SUCCESS)
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
while (len > 0) {
while (len > 0 && retry > 0) {
r = card->ops->get_challenge(card, rnd, len);
if (r < 0) {
sc_unlock(card);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
}
rnd += (size_t) r;
len -= (size_t) r;
if (r > 0) {
rnd += (size_t) r;
len -= (size_t) r;
} else {
retry--;
}
}
sc_unlock(card);