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

pkcs15-tool: don't unconditionally lock the card

This commit is contained in:
Frank Morgner 2016-09-19 23:55:41 +02:00
parent 905d78093c
commit c6db68fdee
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkcs15init/pkcs15-init.h
View File

@ -382,12 +382,6 @@ extern int sc_pkcs15init_erase_card_recursively(struct sc_pkcs15_card *,
extern int sc_pkcs15init_rmdir(struct sc_pkcs15_card *, struct sc_profile *,
struct sc_file *);
/* Helper function for CardOS */
extern int sc_pkcs15init_requires_restrictive_usage(
struct sc_pkcs15_card *,
struct sc_pkcs15init_prkeyargs *,
unsigned int);
extern int sc_pkcs15_create_pin_domain(struct sc_profile *, struct sc_pkcs15_card *,
const struct sc_pkcs15_id *, struct sc_file **);

13
src/tools/pkcs15-tool.c
View File

@ -1555,7 +1555,9 @@ static int test_update(sc_card_t *in_card)
static u8 fci_bad[] = { 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static u8 fci_good[] = { 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 };
r = sc_lock(card);
if (r < 0)
return r;
if (strcmp("cardos",in_card->driver->short_name) != 0) {
printf("not using the cardos driver, card is fine.\n");
@ -1633,10 +1635,12 @@ static int test_update(sc_card_t *in_card)
goto bad_fci;
}
end:
sc_unlock(card);
/* 0 = card ok, 1 = card vulnerable, 2 = problem! */
return rc;
bad_fci:
sc_unlock(card);
util_hex_dump(stdout,rbuf,apdu.resplen," ");
printf("\n");
return 2;
@ -1657,6 +1661,10 @@ static int update(sc_card_t *in_card)
apdu.datalen = sizeof(cmd1);
apdu.data = cmd1;
r = sc_lock(card);
if (r < 0)
return r;
r = sc_transmit_apdu(card, &apdu);
if (r < 0) {
printf("selecting folder failed: %s\n", sc_strerror(r));
@ -1748,6 +1756,7 @@ skip_change_lifecycle:
printf("security update applied successfully.\n");
end:
sc_unlock(card);
return 0;
}
@ -1930,7 +1939,7 @@ int main(int argc, char * const argv[])
sc_ctx_log_to_file(ctx, "stderr");
}
err = util_connect_card(ctx, &card, opt_reader, opt_wait, verbose);
err = util_connect_card_ex(ctx, &card, opt_reader, opt_wait, 0, verbose);
if (err)
goto end;