diff options
| author | Werner Koch <[email protected]> | 2002-04-12 18:55:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-04-12 18:55:05 +0000 |
| commit | 7db161552c9b8c34f48c37b71867c8343c95adbd (patch) | |
| tree | 9c57bcaee00842d09a358c22a4246e9d444d0c3a /scd/card.c | |
| parent | * certlist.c (cert_usable_p): New. (diff) | |
| download | gnupg-7db161552c9b8c34f48c37b71867c8343c95adbd.tar.gz gnupg-7db161552c9b8c34f48c37b71867c8343c95adbd.zip | |
* scdaemon.c: New option --debug-sc N.
* card.c (card_open): set it here.
* card-p15.c (p15_prepare_key): Factored out common code from ...
(p15_sign, p15_decipher): here and made the decryption work the
regular way.
Diffstat (limited to '')
| -rw-r--r-- | scd/card.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scd/card.c b/scd/card.c index 629e2936b..d17ae1947 100644 --- a/scd/card.c +++ b/scd/card.c @@ -141,10 +141,9 @@ card_open (CARD *rcard) goto leave; } card->ctx->error_file = log_get_stream (); - if (opt.debug) - { - card->ctx->debug_file = log_get_stream (); - } + card->ctx->debug = opt.debug_sc; + card->ctx->debug_file = log_get_stream (); + if (sc_detect_card_presence (card->ctx->reader[card->reader], 0) != 1) { rc = GNUPG_Card_Not_Present; @@ -258,7 +257,9 @@ card_get_serial_and_stamp (CARD card, char **serial, time_t *stamp) /* We should lookup the iso 7812-1 and 8583-3 - argh ISO practice is suppressing innovation - IETF rules! So we - always get the serialnumber from the 2F00 GDO file. */ + always get the serialnumber from the 2F02 GDO file. */ + /* FIXME: in case we can't parse the 2F02 EF and we have a P15 card, + we should get the serial number from the respective P15 file */ sc_format_path ("3F002F02", &path); rc = sc_select_file (card->scard, &path, &file); if (rc) |