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

Allow tools to enable card lock (#875) 

Closes #868
This commit is contained in:
CardContact Systems GmbH 2016-09-19 17:49:34 +02:00 committed by Frank Morgner
parent 678f2bb1a6
commit 905d78093c
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/sc-hsm-tool.c
View File

@ -1646,7 +1646,7 @@ int main(int argc, char * const argv[])
sc_ctx_log_to_file(ctx, "stderr"); sc_ctx_log_to_file(ctx, "stderr");
} }
r = util_connect_card(ctx, &card, opt_reader, opt_wait, verbose); r = util_connect_card_ex(ctx, &card, opt_reader, opt_wait, 0, verbose);
if (r != SC_SUCCESS) { if (r != SC_SUCCESS) {
if (r < 0) { if (r < 0) {
fprintf(stderr, "Failed to connect to card: %s\n", sc_strerror(err)); fprintf(stderr, "Failed to connect to card: %s\n", sc_strerror(err));
@ -1687,7 +1687,6 @@ fail:
err = 1; err = 1;
end: end:
if (card) { if (card) {
sc_unlock(card);
sc_disconnect_card(card); sc_disconnect_card(card);
} }
if (ctx) if (ctx)

23
src/tools/util.c
View File

@ -47,8 +47,8 @@ is_string_valid_atr(const char *atr_str)
} }
int int
util_connect_card(sc_context_t *ctx, sc_card_t **cardp, util_connect_card_ex(sc_context_t *ctx, sc_card_t **cardp,
const char *reader_id, int do_wait, int verbose) const char *reader_id, int do_wait, int do_lock, int verbose)
{ {
struct sc_reader *reader = NULL, *found = NULL; struct sc_reader *reader = NULL, *found = NULL;
struct sc_card *card = NULL; struct sc_card *card = NULL;
@ -156,17 +156,26 @@ autofound:
if (verbose) if (verbose)
printf("Using card driver %s.\n", card->driver->name); printf("Using card driver %s.\n", card->driver->name);
r = sc_lock(card); if (do_lock) {
if (r < 0) { r = sc_lock(card);
fprintf(stderr, "Failed to lock card: %s\n", sc_strerror(r)); if (r < 0) {
sc_disconnect_card(card); fprintf(stderr, "Failed to lock card: %s\n", sc_strerror(r));
return 1; sc_disconnect_card(card);
return 1;
}
} }
*cardp = card; *cardp = card;
return 0; return 0;
} }
int
util_connect_card(sc_context_t *ctx, sc_card_t **cardp,
const char *reader_id, int do_wait, int verbose)
{
return util_connect_card_ex(ctx, cardp, reader_id, do_wait, 1, verbose);
}
void util_print_binary(FILE *f, const u8 *buf, int count) void util_print_binary(FILE *f, const u8 *buf, int count)
{ {
int i; int i;

3
src/tools/util.h
View File

@ -33,7 +33,8 @@ void util_warn(const char *fmt, ...);
void util_error(const char *fmt, ...); void util_error(const char *fmt, ...);
void util_fatal(const char *fmt, ...); void util_fatal(const char *fmt, ...);
/* All singing all dancing card connect routine */ /* All singing all dancing card connect routine */
int util_connect_card(struct sc_context *, struct sc_card **, const char *reader_id, int wait, int verbose); int util_connect_card_ex(struct sc_context *, struct sc_card **, const char *reader_id, int do_wait, int do_lock, int verbose);
int util_connect_card(struct sc_context *, struct sc_card **, const char *reader_id, int do_wait, int verbose);
int util_getpass (char **lineptr, size_t *n, FILE *stream); int util_getpass (char **lineptr, size_t *n, FILE *stream);