utils/opensc/patches/0020-OpenPGP-Don-t-use-sc_log-in-openpgp-tool.patch

   1 From 9acf5c1ad7d8a32b472203d3bd8860ea2cbde0e7 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
   3  <ng.hong.quan@gmail.com>
   4 Date: Sun, 3 Nov 2013 02:53:35 +0800
   5 Subject: [PATCH 20/26] OpenPGP: Don't use sc_log in openpgp-tool.
   6
   7 ---
   8  src/tools/openpgp-tool.c | 21 +++++++++++----------
   9  1 file changed, 11 insertions(+), 10 deletions(-)
  10
  11 diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
  12 index a0334ca..505abd9 100644
  13 --- a/src/tools/openpgp-tool.c
  14 +++ b/src/tools/openpgp-tool.c
  15 @@ -414,8 +414,6 @@ int do_genkey(sc_card_t *card, u8 key_id, unsigned int key_len)
  16         sc_path_t path;
  17         sc_file_t *file;
  18
  19 -       LOG_FUNC_CALLED(card->ctx);
  20 -
  21         if (key_id < 1 || key_id > 3) {
  22                 printf("Unknown key ID %d.\n", key_id);
  23                 return 1;
  24 @@ -479,14 +477,14 @@ int delete_key_gnuk(sc_card_t *card, u8 key_id)
  25         u8 *data = NULL;
  26
  27         /* Delete fingerprint */
  28 -       sc_log(ctx, "Delete fingerprints");
  29 +       fprintf(stdout, "Delete fingerprints");
  30         r |= sc_put_data(card, 0xC6 + key_id, NULL, 0);
  31         /* Delete creation time */
  32 -       sc_log(ctx, "Delete creation time");
  33 +       fprintf(stdout, "Delete creation time");
  34         r |= sc_put_data(card, 0xCD + key_id, NULL, 0);
  35
  36         /* Rewrite Extended Header List */
  37 -       sc_log(ctx, "Rewrite Extended Header List");
  38 +       fprintf(stdout, "Rewrite Extended Header List");
  39
  40         if (key_id == 1)
  41                 data = "\x4D\x02\xB6";
  42 @@ -534,15 +532,18 @@ int delete_key_openpgp(sc_card_t *card, u8 key_id)
  43                 /* Build APDU from binary array */
  44                 r = sc_bytes2apdu(card->ctx, buf, len0, &apdu);
  45                 if (r) {
  46 -                       sc_log(ctx, "Failed to build APDU");
  47 -                       LOG_FUNC_RETURN(ctx, SC_ERROR_INTERNAL);
  48 +                       fprintf(stderr, "Failed to build APDU: %s\n", sc_strerror(r));
  49 +                       return r;
  50                 }
  51                 apdu.resp = rbuf;
  52                 apdu.resplen = sizeof(rbuf);
  53
  54                 /* Send APDU to card */
  55                 r = sc_transmit_apdu(card, &apdu);
  56 -               LOG_TEST_RET(ctx, r, "Transmiting APDU failed");
  57 +               if (r) {
  58 +                       fprintf(stderr, "Transmiting APDU failed: %s\n", sc_strerror(r));
  59 +                       return r;
  60 +               }
  61         }
  62         /* TODO: Rewrite Extended Header List.
  63          * Not support by OpenGPG v2 yet */
  64 @@ -557,7 +558,7 @@ int delete_key(sc_card_t *card, u8 key_id)
  65         LOG_FUNC_CALLED(ctx);
  66         /* Check key ID */
  67         if (key_id < 1 || key_id > 3) {
  68 -               sc_log(ctx, "Invalid key ID %d", key_id);
  69 +               fprintf(stderr, "Invalid key ID %d", key_id);
  70                 LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
  71         }
  72
  73 @@ -649,7 +650,7 @@ int main(int argc, char **argv)
  74             (card->type != SC_CARD_TYPE_OPENPGP_V2) &&
  75             (card->type != SC_CARD_TYPE_OPENPGP_GNUK)) {
  76                 util_error("not an OpenPGP card");
  77 -               sc_log(card->ctx, "Card type %X", card->type);
  78 +               fprintf(stderr, "Card type %X\n", card->type);
  79                 exit_status = EXIT_FAILURE;
  80                 goto out;
  81         }
  82 --
  83 2.1.3
  84