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

coolkey: Improve return values logging in init_ex() function

This commit is contained in:
Jakub Jelen 2016-11-22 09:36:43 +01:00 committed by Frank Morgner
parent 365e29caae
commit f432caf72c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libopensc/pkcs15-coolkey.c
View File

@ -680,17 +680,20 @@ int
sc_pkcs15emu_coolkey_init_ex(sc_pkcs15_card_t *p15card,
struct sc_aid *aid, sc_pkcs15emu_opt_t *opts)
{
sc_card_t *card = p15card->card;
sc_card_t *card = p15card->card;
sc_context_t *ctx = card->ctx;
int rv;
LOG_FUNC_CALLED(ctx);
if (opts && opts->flags & SC_PKCS15EMU_FLAGS_NO_CHECK)
return sc_pkcs15emu_coolkey_init(p15card);
rv = sc_pkcs15emu_coolkey_init(p15card);
else {
int r = coolkey_detect_card(p15card);
if (r)
return SC_ERROR_WRONG_CARD;
return sc_pkcs15emu_coolkey_init(p15card);
rv = coolkey_detect_card(p15card);
if (rv)
LOG_FUNC_RETURN(ctx, SC_ERROR_WRONG_CARD);
rv = sc_pkcs15emu_coolkey_init(p15card);
}
LOG_FUNC_RETURN(ctx, rv);
}