GNUPG-1-9-BRANCH gnupg/scd (card-p15.c card.c)

[cvs user werner]

    Date: Monday, August 18, 2003 @ 19:34:51
  Author: werner
    Path: /cvs/gnupg/gnupg/scd
     Tag: GNUPG-1-9-BRANCH

Modified: card-p15.c card.c

* scdaemon.c, scdaemon.h: New option --disable-opensc.
* card.c (card_open): Implement it.
* apdu.c (open_osc_reader, osc_send_apdu): New.
(apdu_open_reader) [HAVE_OPENSC]: Use the opensc driver if not
disabled.
(error_string) [HAVE_OPENSC]: Use sc_strerror.
(send_apdu) [HAVE_OPENSC]: Call osc_apdu_send.

* card-p15.c (p15_enum_keypairs, p15_prepare_key): Adjusted for
libgpg-error.


------------+
 card-p15.c |    6 +++---
 card.c     |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)