utils/opensc/patches/0008-OpenPGP-Read-some-empty-DOs-from-Gnuk.patch

   1 From d1b8d3588336abac4876c1d537d8e8e5e578bc02 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: Mon, 25 Mar 2013 11:58:38 +0700
   5 Subject: [PATCH 08/18] OpenPGP: Read some empty DOs from Gnuk.
   6
   7 In Gnuk, some empty DOs are returned as not exist, instead of existing with empty value.
   8 So, we will consider them exist in driver.
   9 ---
  10  src/libopensc/card-openpgp.c | 25 +++++++++++++++++++++++++
  11  1 file changed, 25 insertions(+)
  12
  13 diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
  14 index 47c1938..9b08bbb 100644
  15 --- a/src/libopensc/card-openpgp.c
  16 +++ b/src/libopensc/card-openpgp.c
  17 @@ -813,6 +813,23 @@ pgp_get_blob(sc_card_t *card, struct blob *blob, unsigned int id,
  18                 }
  19         }
  20
  21 +       /* This part is for "NOT FOUND" cases */
  22 +
  23 +       /* Special case:
  24 +        * Gnuk does not have default value for children of DO 65 (DOs 5B, 5F2D, 5F35)
  25 +        * So, if these blob was not found, we create it. */
  26 +       if (blob->id == 0x65 && (id == 0x5B || id == 0x5F2D || id == 0x5F35)) {
  27 +               sc_log(card->ctx, "Create blob %X under %X", id, blob->id);
  28 +               child = pgp_new_blob(card, blob, id, sc_file_new());
  29 +               if (child) {
  30 +                       pgp_set_blob(child, NULL, 0);
  31 +                       *ret = child;
  32 +                       return SC_SUCCESS;
  33 +               }
  34 +               else
  35 +                       sc_log(card->ctx, "Not enough memory to create blob for DO %X");
  36 +       }
  37 +
  38         return SC_ERROR_FILE_NOT_FOUND;
  39  }
  40
  41 @@ -1147,6 +1164,14 @@ pgp_get_data(sc_card_t *card, unsigned int tag, u8 *buf, size_t buf_len)
  42         LOG_TEST_RET(card->ctx, r, "APDU transmit failed");
  43
  44         r = sc_check_sw(card, apdu.sw1, apdu.sw2);
  45 +
  46 +       /* For Gnuk card, if there is no certificate, it returns error instead of empty data.
  47 +        * So, for this case, we ignore error and consider success */
  48 +       if (r == SC_ERROR_DATA_OBJECT_NOT_FOUND && card->type == SC_CARD_TYPE_OPENPGP_GNUK
  49 +        && (tag == DO_CERT || tag == 0x0101 || tag == 0x0102 || tag == 0x0103 || tag == 0x0104)) {
  50 +               r = SC_SUCCESS;
  51 +               apdu.resplen = 0;
  52 +       }
  53         LOG_TEST_RET(card->ctx, r, "Card returned error");
  54
  55         LOG_FUNC_RETURN(card->ctx, apdu.resplen);
  56 --
  57 1.9.3
  58