Fix-up changes caused by Coverity scan
piv-tool.c add /* fall through */ to avoif false warning card-piv.c - clean up if sc_lock fails.
This commit is contained in:
parent
3c1d8ad695
commit
981a0fbbaf
|
@ -1557,7 +1557,8 @@ static int piv_general_mutual_authenticate(sc_card_t *card,
|
||||||
|
|
||||||
r = sc_lock(card);
|
r = sc_lock(card);
|
||||||
if (r != SC_SUCCESS)
|
if (r != SC_SUCCESS)
|
||||||
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
|
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "sc_lock failed\n");
|
||||||
|
goto err; /* cleanup */
|
||||||
locked = 1;
|
locked = 1;
|
||||||
|
|
||||||
p = sbuf;
|
p = sbuf;
|
||||||
|
@ -1827,7 +1828,8 @@ static int piv_general_external_authenticate(sc_card_t *card,
|
||||||
|
|
||||||
r = sc_lock(card);
|
r = sc_lock(card);
|
||||||
if (r != SC_SUCCESS)
|
if (r != SC_SUCCESS)
|
||||||
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r);
|
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "sc_lock failed\n");
|
||||||
|
goto err; /* cleanup */
|
||||||
locked = 1;
|
locked = 1;
|
||||||
|
|
||||||
p = sbuf;
|
p = sbuf;
|
||||||
|
|
|
@ -494,10 +494,7 @@ int main(int argc, char * const argv[])
|
||||||
action_count++;
|
action_count++;
|
||||||
break;
|
break;
|
||||||
case 'Z':
|
case 'Z':
|
||||||
/*
|
/* fall through */
|
||||||
-Z is the same as -C but -Z says the cert is compressed.
|
|
||||||
https://github.com/OpenSC/OpenSC/commit/3a92bf7af5aaa85fdbc0434d0a55393e68e0f98d#commitcomment-9636487
|
|
||||||
*/
|
|
||||||
compress_cert = 1;
|
compress_cert = 1;
|
||||||
case 'C':
|
case 'C':
|
||||||
do_load_cert = 1;
|
do_load_cert = 1;
|
||||||
|
|
Loading…
Reference in New Issue