diff --git a/scd/app-nks.c b/scd/app-nks.c
index f4c00d9a9..b18f73cdc 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -1,2540 +1,2539 @@
 /* app-nks.c - The Telesec NKS card application.
  * Copyright (C) 2004, 2007-2009 Free Software Foundation, Inc.
  * Copyright (C) 2004, 2007-2009, 2013-2015, 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /* Notes:
  *
  * - We are now targeting TCOS 3 cards and it may happen that there is
  *   a regression towards TCOS 2 cards.  Please report.
  *
  * - The NKS3 AUT key is not used.  It seems that it is only useful for
  *   the internal authentication command and not accessible by other
  *   applications.  The key itself is in the encryption class but the
  *   corresponding certificate has only the digitalSignature
  *   capability.
  *   Update: This changed for the Signature Card V2 (nks version 15)
  *
  * - If required, we automagically switch between the NKS application
  *   and the SigG or eSign application.  This avoids to use the DINSIG
  *   application which is somewhat limited, has no support for Secure
  *   Messaging as required by TCOS 3 and has no way to change the PIN
  *   or even set the NullPIN.  With the Signature Card v2 (nks version
  *   15) the Esign application is used instead of the SigG.
  *
  * - We use the prefix NKS-DF01 for TCOS 2 cards and NKS-NKS3 for newer
  *   cards.  This is because the NKS application has moved to DF02 with
  *   TCOS 3 and thus we better use a DF independent tag.
  *
  * - We use only the global PINs for the NKS application.
  *
  *
  *
  * Here is a table with PIN stati collected from 3 cards.
  *
  *  | app | pwid | NKS3      | SIG_B     | SIG_N     |
  *  |-----+------+-----------+-----------+-----------|
  *  | NKS | 0x00 | null -    | -    -    | -    -    |
  *  |     | 0x01 | 0    3    | -    -    | -    -    |
  *  |     | 0x02 | 3    null | 15   3    | 15   null |
  *  |     | 0x03 | -    3    | null -    | 3    -    |
  *  |     | 0x04 |           | null 0    | 3    3    |
  *  | SIG | 0x00 | null -    | -    -    | -    -    |
  *  |     | 0x01 | 0    null | -    null | -    null |
  *  |     | 0x02 | 3    null | 15   0    | 15   0    |
  *  |     | 0x03 | -    0    | null null | null null |
  *  - SIG is either SIGG or ESIGN.
  *  - "-" indicates reference not found (SW 6A88).
  *  - "null" indicates a NULLPIN (SW 6985).
  *  - The first value in each cell is the global PIN;
  *    the second is the local PIN (high bit of pwid set).
  *  - The NKS3 card is some older test card.
  *  - The SIG_B is a Signature Card V2.0 with Brainpool curves.
  *    Here the PIN 0x82 has been changed from the NULLPIN.
  *  - The SIG_N is a Signature Card V2.0 with NIST curves.
  *    The PIN was enabled using the TCOS Windows tool.
  */
 
 #include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "scdaemon.h"
 #include "../common/i18n.h"
 #include "iso7816.h"
 #include "../common/tlv.h"
 #include "apdu.h"
 #include "../common/host2net.h"
 
 static char const aid_nks[]  = { 0xD2, 0x76, 0x00, 0x00, 0x03, 0x01, 0x02 };
 static char const aid_sigg[] = { 0xD2, 0x76, 0x00, 0x00, 0x66, 0x01 };
 static char const aid_esign[] =
   { 0xA0, 0x00, 0x00, 0x01, 0x67, 0x45, 0x53, 0x49, 0x47, 0x4E };
 static char const aid_idlm[] = { 0xD2, 0x76, 0x00, 0x00, 0x03, 0x0c, 0x01 };
 
 
 /* The ids of the different apps on our TCOS cards.  */
 #define NKS_APP_NKS   0
 #define NKS_APP_SIGG  1
 #define NKS_APP_ESIGN 2
 #define NKS_APP_IDLM  3
 
 
 static struct
 {
   int nks_app_id;/* One of the NKS_APP_ constants.  */
   int fid;       /* File ID. */
   int nks_ver;   /* 0 for NKS version 2, 3 for version 3, etc.  */
   int certtype;  /* Type of certificate or 0 if it is not a certificate. */
   int iskeypair; /* If true has the FID of the corresponding certificate.
                   * If no certificate is known a value of -1 is used. */
   int isauthkey; /* True if file is a key usable for authentication. */
   int issignkey; /* True if file is a key usable for signing. */
   int isencrkey; /* True if file is a key usable for decryption. */
   unsigned char kid;  /* Corresponding key references.  */
 } filelist[] = {
   { 0, 0x4531, 0, 0,  0xC000, 1,1,0, 0x80}, /* EF_PK.NKS.SIG */
   /* */                              /* nks15: EF.PK.NKS.ADS */
   { 0, 0xC000, 0, 101 },                    /* EF_C.NKS.SIG  */
   /* */                              /* nks15: EF.C.ICC.ADS  (sign key)  */
 
   { 0, 0x4331, 0, 100 },                    /* Unnamed.                  */
   /* */                              /* nks15: EF.C.ICC.RFU1             */
   /* */                              /* (second cert for sign key)       */
 
   { 0, 0x4332, 0, 100 },
   { 0, 0xB000, 0, 110 },                    /* EF_PK.RCA.NKS             */
 
   { 0, 0x45B1, 0, 0,  0xC200, 0,0,1, 0x81}, /* EF_PK.NKS.ENC             */
   /* */                              /* nks15: EF.PK.ICC.ENC1            */
   { 0, 0xC200, 0, 101 },                    /* EF_C.NKS.ENC              */
                                      /* nks15: EF.C.ICC.ENC1 (Cert-encr) */
 
   { 0, 0x43B1, 0, 100 },                    /* Unnamed */
   /* */                              /* nks15: EF.C.ICC.RFU2             */
   /* */                              /* (second cert for enc1 key)       */
 
   { 0, 0x43B2, 0, 100 },
   { 0, 0x4371,15, 100 },                    /* EF.C.ICC.RFU3             */
   /* */                              /* (second cert for auth key)       */
 
   { 0, 0x45B2, 3, 0,  0xC201, 0,0,1, 0x83}, /* EF_PK.NKS.ENC1024         */
   /* */                              /* nks15: EF.PK.ICC.ENC2            */
   { 0, 0xC201, 3, 101 },                    /* EF_C.NKS.ENC1024  */
 
   { 0, 0xC20E,15, 111 },                    /* EF.C.CSP.RCA1 (RootCA 1) */
   { 0, 0xC208,15, 101 },                    /* EF.C.CSP.SCA1 (SubCA 1) */
   { 0, 0xC10E,15, 111 },                    /* EF.C.CSP.RCA2 (RootCA 2) */
   { 0, 0xC108,15, 101 },                    /* EF.C.CSP.SCA2 (SubCA 2) */
 
   { 0, 0x4571,15, 0,  0xC500, 1,0,0, 0x82}, /* EF.PK.ICC.AUT */
   { 0, 0xC500,15, 101 },                    /* EF.C.ICC.AUT  (Cert-auth) */
 
   { 0, 0xC201,15, 101 },                    /* EF.C.ICC.ENC2 (Cert-encr) */
                                             /* (empty on delivery) */
 
   { 1, 0x4531, 3, 0,  0xC000, 0,1,1, 0x84}, /* EF_PK.CH.SIG  */
   { 1, 0xC000, 0, 101 },                    /* EF_C.CH.SIG  */
 
   { 1, 0xC008, 3, 101 },                    /* EF_C.CA.SIG  */
   { 1, 0xC00E, 3, 111 },                    /* EF_C.RCA.SIG  */
 
   { 2, 0x4531, 15, 0, 0xC001, 0,1,1, 0x84}, /* EF_PK.CH.SIG  */
   { 2, 0xC000, 15,101 },                    /* EF.C.SCA.QES (SubCA) */
   { 2, 0xC001, 15,100 },                    /* EF.C.ICC.QES (Cert)  */
   { 2, 0xC00E, 15,111 },                    /* EF.C.RCA.QES (RootCA */
 
   { 3, 0x4E03,  3, 0, -1 },                 /* EK_PK_03 */
   { 3, 0x4E04,  3, 0, -1 },                 /* EK_PK_04 */
   { 3, 0x4E05,  3, 0, -1 },                 /* EK_PK_05 */
   { 3, 0x4E06,  3, 0, -1 },                 /* EK_PK_06 */
   { 3, 0x4E07,  3, 0, -1 },                 /* EK_PK_07 */
   { 3, 0x4E08,  3, 0, -1 },                 /* EK_PK_08 */
 
   { 0, 0 }
 };
 
 
 /* Object to cache information gathered from FIDs. */
 struct fid_cache_s {
   struct fid_cache_s *next;
   int nks_app_id;
   int fid;                          /* Zero for an unused slot.  */
   unsigned int  got_keygrip:1;      /* The keygrip and algo are valid.  */
   int algo;
   char *algostr;                    /* malloced.  */
   char keygripstr[2*KEYGRIP_LEN+1];
 };
 
 
 /* Object with application (i.e. NKS) specific data.  */
 struct app_local_s {
   int active_nks_app;   /* One of the NKS_APP_ constants.  */
 
   int only_idlm;        /* The application is fixed to IDLM (IDKey card).  */
   int qes_app_id;       /* Either NKS_APP_SIGG or NKS_APP_ESIGN.  */
 
   int sigg_msig_checked;/* True if we checked for a mass signature card.  */
   int sigg_is_msig;     /* True if this is a mass signature card.  */
 
   int need_app_select;  /* Need to re-select the application.  */
 
   struct fid_cache_s *fid_cache; /* Linked list with cached infos.  */
 };
 
 
 
 static gpg_error_t readcert_from_ef (app_t app, int fid,
                                      unsigned char **cert, size_t *certlen);
 static gpg_error_t switch_application (app_t app, int nks_app_id);
 static const char *parse_pwidstr (app_t app, const char *pwidstr, int new_mode,
                                   int *r_nks_app_id, int *r_pwid);
 static gpg_error_t verify_pin (app_t app, int pwid, const char *desc,
                                gpg_error_t (*pincb)(void*, const char *,
                                                     char **),
                                void *pincb_arg);
 
 
 
 static void
 flush_fid_cache (app_t app)
 {
   while (app->app_local->fid_cache)
     {
       struct fid_cache_s *next = app->app_local->fid_cache->next;
       if (app->app_local->fid_cache)
         xfree (app->app_local->fid_cache->algostr);
       xfree (app->app_local->fid_cache);
       app->app_local->fid_cache = next;
     }
 }
 
 /* Release local data. */
 static void
 do_deinit (app_t app)
 {
   if (app && app->app_local)
     {
       flush_fid_cache (app);
       xfree (app->app_local);
       app->app_local = NULL;
     }
 }
 
 
 static int
 all_zero_p (void *buffer, size_t length)
 {
   char *p;
 
   for (p=buffer; length; length--, p++)
     if (*p)
       return 0;
   return 1;
 }
 
 
 /* Return an allocated string with the serial number in a format to be
  * show to the user.  May return NULL on malloc problem.  */
 static char *
 get_dispserialno (app_t app)
 {
   char *result;
 
   /* We only need to strip the last zero which is not printed on the
    * card.  */
   result = app_get_serialno (app);
   if (result && *result && result[strlen(result)-1] == '0')
     result[strlen(result)-1] = 0;
   return result;
 }
 
 
 static gpg_error_t
 pubkey_from_pk_file (app_t app, int pkfid, int cfid,
                      unsigned char **r_pk, size_t *r_pklen)
 {
   gpg_error_t err;
   unsigned char *buffer[2];
   size_t buflen[2];
   int i;
   int offset[2] = { 0, 0 };
 
   *r_pk = NULL;
   *r_pklen = 0;
 
   if (app->appversion == 15)
     {
       /* Signature Card v2 - get keygrip from the certificate.  */
       unsigned char *cert;
       size_t certlen;
 
       if (cfid == -1)
         return gpg_error (GPG_ERR_NOT_SUPPORTED);
 
       /* Fall back to certificate reading.  */
       err = readcert_from_ef (app, cfid, &cert, &certlen);
       if (err)
         {
           log_error ("nks: error reading certificate %04X: %s\n",
                      cfid, gpg_strerror (err));
           return err;
         }
 
       err = app_help_pubkey_from_cert (cert, certlen, r_pk, r_pklen);
       xfree (cert);
       if (err)
         log_error ("nks: error parsing certificate %04X: %s\n",
                    cfid, gpg_strerror (err));
 
       return err;
     }
 
   err = iso7816_select_file (app_get_slot (app), pkfid, 0);
   if (err)
     return err;
   err = iso7816_read_record (app_get_slot (app), 1, 1, 0,
                              &buffer[0], &buflen[0]);
   if (err)
     return err;
   err = iso7816_read_record (app_get_slot (app), 2, 1, 0,
                              &buffer[1], &buflen[1]);
   if (err)
     {
       xfree (buffer[0]);
       return err;
     }
 
   if (app->appversion < 3)
     {
       /* Old versions of NKS store the values in a TLV encoded format.
          We need to do some checks.  */
       for (i=0; i < 2; i++)
         {
           /* Check that the value appears like an integer encoded as
              Simple-TLV.  We don't check the tag because the tests cards I
              have use 1 for both, the modulus and the exponent - the
              example in the documentation gives 2 for the exponent. */
           if (buflen[i] < 3)
             err = gpg_error (GPG_ERR_TOO_SHORT);
           else if (buffer[i][1] != buflen[i]-2 )
             err = gpg_error (GPG_ERR_INV_OBJ);
           else
             offset[i] = 2;
           if (err)
             {
               xfree (buffer[0]);
               xfree (buffer[1]);
               return err;
             }
         }
     }
   else
     {
       /* Remove leading zeroes to get a correct keygrip.  Take care of
          negative numbers.  We should also fix it the same way in
          libgcrypt but we can't yet rely on it yet.  */
       for (i=0; i < 2; i++)
         {
           while (buflen[i]-offset[i] > 1
                  && !buffer[i][offset[i]]
                  && !(buffer[i][offset[i]+1] & 0x80))
             offset[i]++;
         }
     }
 
   /* Check whether negative values are not prefixed with a zero and
      fix that.  */
   for (i=0; i < 2; i++)
     {
       if ((buflen[i]-offset[i]) && (buffer[i][offset[i]] & 0x80))
         {
           unsigned char *newbuf;
           size_t newlen;
 
           newlen = 1 + buflen[i] - offset[i];
           newbuf = xtrymalloc (newlen);
           if (!newbuf)
             {
               err = gpg_error_from_syserror ();
               xfree (buffer[0]);
               xfree (buffer[1]);
               return err;
             }
           newbuf[0] = 0;
           memcpy (newbuf+1, buffer[i]+offset[i], buflen[i] - offset[i]);
           xfree (buffer[i]);
           buffer[i] = newbuf;
           buflen[i] = newlen;
           offset[i] = 0;
         }
     }
 
   *r_pk = make_canon_sexp_from_rsa_pk (buffer[0]+offset[0], buflen[0]-offset[0],
                                        buffer[1]+offset[1], buflen[1]-offset[1],
                                        r_pklen);
 
   xfree (buffer[0]);
   xfree (buffer[1]);
   return err;
 }
 
 /* Read the file with PKFID, assume it contains a public key and
  * return its keygrip in the caller provided 41 byte buffer R_GRIPSTR.
  * This works only for RSA card.  For the Signature Card v2 ECC is
  * used and Read Record needs to be replaced by read binary.  Given
  * all the ECC parameters required, we don't do that but rely that the
  * corresponding certificate at CFID is already available and get the
  * public key from there.  Note that a CFID of 1 is indicates that a
  * certificate is not known.  If R_ALGO is not NULL the public key
  * algorithm for the returned KEYGRIP is stored there.  If R_ALGOSTR
  * is not NULL the public key algo string (e.g. "rsa2048") is stored
  * there.  */
 static gpg_error_t
 keygripstr_from_pk_file (app_t app, int pkfid, int cfid, char *r_gripstr,
                          int *r_algo, char **r_algostr)
 {
   gpg_error_t err;
   int algo = 0;  /* Public key algo.  */
   char *algostr = NULL; /* Public key algo string.  */
   struct fid_cache_s *ci;
   unsigned char *pk;
   size_t pklen;
 
   for (ci = app->app_local->fid_cache; ci; ci = ci->next)
     if (ci->fid && ci->nks_app_id == app->app_local->active_nks_app
         && ci->fid == pkfid)
       {
         if (!ci->got_keygrip)
           return gpg_error (GPG_ERR_NOT_FOUND);
         if (r_algostr && !ci->algostr)
           break;  /* Not in the cache - try w/o cache.  */
         memcpy (r_gripstr, ci->keygripstr, 2*KEYGRIP_LEN+1);
         if (r_algo)
           *r_algo = ci->algo;
         if (r_algostr)
           {
             *r_algostr = xtrystrdup (ci->algostr);
             if (!*r_algostr)
               return gpg_error_from_syserror ();
           }
         return 0;  /* Found in cache.  */
       }
 
   err = pubkey_from_pk_file (app, pkfid, cfid, &pk, &pklen);
   if (!err)
     err = app_help_get_keygrip_string_pk (pk, pklen, r_gripstr, NULL,
                                           &algo, &algostr);
   xfree (pk);
 
   if (!err)
     {
       if (r_algostr)
         {
           *r_algostr = algostr;
           algostr = NULL;
         }
 
       /* FIXME: We need to implement not_found caching.  */
       for (ci = app->app_local->fid_cache; ci; ci = ci->next)
         if (ci->fid
             && ci->nks_app_id == app->app_local->active_nks_app
             && ci->fid == pkfid)
           {
             /* Update the keygrip.  */
             memcpy (ci->keygripstr, r_gripstr, 2*KEYGRIP_LEN+1);
             ci->algo = algo;
             xfree (ci->algostr);
             ci->algostr = algostr? xtrystrdup (algostr) : NULL;
             ci->got_keygrip = 1;
             break;
           }
       if (!ci)
         {
           for (ci = app->app_local->fid_cache; ci; ci = ci->next)
             if (!ci->fid)
               break;
           if (!ci)
             ci = xtrycalloc (1, sizeof *ci);
           if (!ci)
             ; /* Out of memory - it is a cache, so we ignore it.  */
           else
             {
               ci->nks_app_id = app->app_local->active_nks_app;
               ci->fid = pkfid;
               memcpy (ci->keygripstr, r_gripstr, 2*KEYGRIP_LEN+1);
               ci->algo = algo;
               ci->got_keygrip = 1;
               ci->next = app->app_local->fid_cache;
               app->app_local->fid_cache = ci;
             }
         }
     }
   xfree (algostr);
   return err;
 }
 
 
 /* Parse KEYREF and return the index into the FILELIST at R_IDX.
  * Returns 0 on success and switches to the requested application.
  * The public key algo is stored at R_ALGO unless it is NULL.  */
 static gpg_error_t
 find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
 {
   gpg_error_t err;
   int idx, fid, nks_app_id;
   char keygripstr[2*KEYGRIP_LEN+1];
 
   if (!keyref || !keyref[0])
     err = gpg_error (GPG_ERR_INV_ID);
   else if (keyref[0] != 'N' && strlen (keyref) == 40)  /* This is a keygrip.  */
     {
       struct fid_cache_s *ci;
 
       for (ci = app->app_local->fid_cache; ci; ci = ci->next)
         if (ci->fid && ci->got_keygrip && !strcmp (ci->keygripstr, keyref))
           break;
       if (ci) /* Cached */
         {
           for (idx=0; filelist[idx].fid; idx++)
             if (filelist[idx].fid == ci->fid)
               break;
           if (!filelist[idx].fid)
             {
               log_debug ("nks: Ooops: Unkown FID cached!\n");
               err = gpg_error (GPG_ERR_BUG);
               goto leave;
             }
           err = switch_application (app, filelist[idx].nks_app_id);
           if (err)
             goto leave;
           if (r_algo)
             *r_algo = ci->algo;
         }
       else  /* Not cached.  */
         {
           for (idx=0; filelist[idx].fid; idx++)
             {
               if (!filelist[idx].iskeypair)
                 continue;
 
               if (app->app_local->only_idlm)
                 {
                   if (filelist[idx].nks_app_id != NKS_APP_IDLM)
                     continue;
                 }
               else
                 {
                   if (filelist[idx].nks_app_id != NKS_APP_NKS
                       && filelist[idx].nks_app_id != app->app_local->qes_app_id)
                     continue;
 
                   err = switch_application (app, filelist[idx].nks_app_id);
                   if (err)
                     goto leave;
                 }
 
               err = keygripstr_from_pk_file (app, filelist[idx].fid,
                                              filelist[idx].iskeypair,
                                              keygripstr, r_algo, NULL);
               if (err)
                 {
                   log_info ("nks: no keygrip for FID 0x%04X: %s - ignored\n",
                             filelist[idx].fid, gpg_strerror (err));
                   continue;
                 }
               if (!strcmp (keygripstr, keyref))
                 break; /* Found */
             }
           if (!filelist[idx].fid)
             {
               err = gpg_error (GPG_ERR_NOT_FOUND);
               goto leave;
             }
           /* (No need to switch the app as that has already been done
            * in the loop.)  */
         }
       *r_idx = idx;
       err = 0;
     }
   else /* This is a usual keyref.  */
     {
       if (!ascii_strncasecmp (keyref, "NKS-NKS3.", 9))
         nks_app_id = NKS_APP_NKS;
       else if (!ascii_strncasecmp (keyref, "NKS-ESIGN.", 10)
                && app->app_local->qes_app_id == NKS_APP_ESIGN)
         nks_app_id = NKS_APP_ESIGN;
       else if (!ascii_strncasecmp (keyref, "NKS-SIGG.", 9)
                && app->app_local->qes_app_id == NKS_APP_SIGG)
         nks_app_id = NKS_APP_SIGG;
       else if (!ascii_strncasecmp (keyref, "NKS-IDLM.", 9))
         nks_app_id = NKS_APP_IDLM;
       else if (!ascii_strncasecmp (keyref, "NKS-DF01.", 9))
         nks_app_id = NKS_APP_NKS;
       else
         {
           err = gpg_error (GPG_ERR_INV_ID);
           goto leave;
         }
       keyref += nks_app_id == NKS_APP_ESIGN? 10 : 9;
 
       if (!hexdigitp (keyref) || !hexdigitp (keyref+1)
           || !hexdigitp (keyref+2) || !hexdigitp (keyref+3)
           || keyref[4])
         {
           err = gpg_error (GPG_ERR_INV_ID);
           goto leave;
         }
       fid = xtoi_4 (keyref);
       for (idx=0; filelist[idx].fid; idx++)
         if (filelist[idx].iskeypair && filelist[idx].fid == fid
             && filelist[idx].nks_app_id == nks_app_id)
           break;
       if (!filelist[idx].fid)
         {
           err = gpg_error (GPG_ERR_NOT_FOUND);
           goto leave;
         }
       *r_idx = idx;
 
       err = switch_application (app, nks_app_id);
       if (err)
         goto leave;
       if (r_algo)
         {
           /* We need to get the public key algo.  */
           err = keygripstr_from_pk_file (app, filelist[idx].fid,
                                          filelist[idx].iskeypair,
                                          keygripstr, r_algo, NULL);
           if (err)
             log_error ("nks: no keygrip for FID 0x%04X: %s\n",
                        filelist[idx].fid, gpg_strerror (err));
         }
     }
 
  leave:
   return err;
 }
 
 
 /* TCOS responds to a verify with empty data (i.e. without the Lc
  * byte) with the status of the PIN.  PWID is the PIN ID. NKS_APP_ID
  * gives the application to first switch to.  Returns:
  * ISO7816_VERIFY_* codes or non-negative number of verification
  * attempts left.  */
 static int
 get_chv_status (app_t app, int nks_app_id, int pwid)
 {
   if (switch_application (app, nks_app_id))
     return (nks_app_id == NKS_APP_NKS
             ? ISO7816_VERIFY_ERROR
             : ISO7816_VERIFY_NO_PIN);
 
   return iso7816_verify_status (app_get_slot (app), pwid);
 }
 
 
 /* Implement the GETATTR command.  This is similar to the LEARN
    command but returns just one value via the status interface. */
 static gpg_error_t
 do_getattr (app_t app, ctrl_t ctrl, const char *name)
 {
   static struct {
     const char *name;
     int special;
   } table[] = {
     { "$AUTHKEYID",   1 },
     { "$ENCRKEYID",   2 },
     { "$SIGNKEYID",   3 },
     { "NKS-VERSION",  4 },  /* Legacy (printed decimal)  */
     { "CHV-STATUS",   5 },
     { "$DISPSERIALNO",6 },
     { "SERIALNO",     0 }
   };
   gpg_error_t err = 0;
   int idx;
   char *p, *p2;
   char buffer[100];
   int nksver = app->appversion;
 
   err = switch_application (app, NKS_APP_NKS);
   if (err)
     return err;
 
   for (idx=0; (idx < DIM(table)
                && ascii_strcasecmp (table[idx].name, name)); idx++)
     ;
   if (!(idx < DIM (table)))
     return gpg_error (GPG_ERR_INV_NAME);
 
   switch (table[idx].special)
     {
     case 0: /* SERIALNO */
       {
         p = app_get_serialno (app);
         if (p)
           {
             send_status_direct (ctrl, "SERIALNO", p);
             xfree (p);
           }
       }
       break;
 
     case 1: /* $AUTHKEYID */
       {
         /* NetKey 3.0 cards define an authentication key but according
            to the specs this key is only usable for encryption and not
            signing.  it might work anyway but it has not yet been
            tested - fixme.  Thus for now we use the NKS signature key
            for authentication for netkey 3.  For the Signature Card
            V2.0 the auth key is defined and thus we use it. */
         const char *tmp = nksver == 15? "NKS-NKS3.4571" : "NKS-NKS3.4531";
         send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
       }
       break;
 
     case 2: /* $ENCRKEYID */
       {
         char const tmp[] = "NKS-NKS3.45B1";
         send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
       }
       break;
 
     case 3: /* $SIGNKEYID */
       {
         char const tmp[] = "NKS-NKS3.4531";
         send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
       }
       break;
 
     case 4: /* NKS-VERSION */
       snprintf (buffer, sizeof buffer, "%d", app->appversion);
       send_status_info (ctrl, table[idx].name,
                         buffer, strlen (buffer), NULL, 0);
       break;
 
     case 5: /* CHV-STATUS */
       {
         /* Return the status for the the PINs as described in the
          * table below.  See the macros ISO7816_VERIFY_* for a list
          * for each slot.  The order is
          *
          * | idx | name       |
          * |-----+------------|
          * |   0 | PW1.CH     |
          * |   1 | PW2.CH     |
          * |   2 | PW1.CH.SIG |
          * |   3 | PW2.CH.SIG |
          *
          * See parse_pwidstr for details of the mapping.
          */
         int tmp[4];
 
         /* We use a helper array so that we can control that there is
          * no superfluous application switches.  */
         if (app->appversion == 15)
           {
             tmp[0] = get_chv_status (app, 0, 0x03);
             tmp[1] = get_chv_status (app, 0, 0x04);
           }
         else
           {
             tmp[0] = get_chv_status (app, 0, 0x00);
             tmp[1] = get_chv_status (app, 0, 0x01);
           }
         tmp[2] = get_chv_status (app, app->app_local->qes_app_id, 0x81);
         if (app->appversion == 15)
           tmp[3] = get_chv_status (app, app->app_local->qes_app_id, 0x82);
         else
           tmp[3] = get_chv_status (app, app->app_local->qes_app_id, 0x83);
         snprintf (buffer, sizeof buffer, "%d %d %d %d",
                   tmp[0], tmp[1], tmp[2], tmp[3]);
         send_status_info (ctrl, table[idx].name,
                           buffer, strlen (buffer), NULL, 0);
       }
       break;
 
     case 6: /* $DISPSERIALNO */
       {
         p = app_get_serialno (app);
         p2 = get_dispserialno (app);
         if (p && p2 && strcmp (p, p2))
           send_status_info (ctrl, table[idx].name, p2, strlen (p2),
                             NULL, (size_t)0);
         else /* No abbreviated S/N or identical to the full full S/N.  */
           err = gpg_error (GPG_ERR_INV_NAME);  /* No Abbreviated S/N.  */
         xfree (p);
         xfree (p2);
       }
       break;
 
     default:
       err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
       break;
     }
 
   return err;
 }
 
 
 const char *
 get_nks_tag (app_t app, int nks_app_id)
 {
   const char *tag;
 
   if (nks_app_id == NKS_APP_ESIGN)
     tag = "ESIGN";
   else if (nks_app_id == NKS_APP_SIGG)
     tag = "SIGG";
   else if (nks_app_id == NKS_APP_IDLM)
     tag = "IDLM";
   else if (app->appversion < 3)
     tag = "DF01";
   else
     tag = "NKS3";
 
   return tag;
 }
 
+static void
+set_usage_string (char usagebuf[5], int i)
+{
+  int usageidx = 0;
+  if (filelist[i].issignkey)
+    usagebuf[usageidx++] = 's';
+  if (filelist[i].isauthkey)
+    usagebuf[usageidx++] = 'a';
+  if (filelist[i].isencrkey)
+    usagebuf[usageidx++] = 'e';
+  if (!usageidx)
+    usagebuf[usageidx++] = '-';
+  usagebuf[usageidx] = 0;
+}
+
 static void
 do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags,
                       int nks_app_id)
 {
   gpg_error_t err;
   char ct_buf[100], id_buf[100];
   int i;
   const char *tag = get_nks_tag (app, nks_app_id);
 
   /* Output information about all useful objects in the NKS application. */
   for (i=0; filelist[i].fid; i++)
     {
       if (filelist[i].nks_ver > app->appversion)
         continue;
 
       if (filelist[i].nks_app_id != nks_app_id)
         continue;
 
       if (filelist[i].certtype && !(flags &1))
         {
           size_t len;
 
           len = app_help_read_length_of_cert (app->slot,
                                               filelist[i].fid, NULL);
           if (len)
             {
               /* FIXME: We should store the length in the application's
                  context so that a following readcert does only need to
                  read that many bytes. */
               snprintf (ct_buf, sizeof ct_buf, "%d", filelist[i].certtype);
               snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
                         tag, filelist[i].fid);
               send_status_info (ctrl, "CERTINFO",
                                 ct_buf, strlen (ct_buf),
                                 id_buf, strlen (id_buf),
                                 NULL, (size_t)0);
             }
         }
       else if (filelist[i].iskeypair)
         {
           char gripstr[40+1];
           char usagebuf[5];
-          int usageidx = 0;
           char *algostr = NULL;
 
           err = keygripstr_from_pk_file (app, filelist[i].fid,
                                          filelist[i].iskeypair, gripstr,
                                          NULL, &algostr);
           if (err)
             log_error ("can't get keygrip from FID 0x%04X: %s\n",
                        filelist[i].fid, gpg_strerror (err));
           else
             {
               snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
                         tag, filelist[i].fid);
-              if (filelist[i].issignkey)
-                usagebuf[usageidx++] = 's';
-              if (filelist[i].isauthkey)
-                usagebuf[usageidx++] = 'a';
-              if (filelist[i].isencrkey)
-                usagebuf[usageidx++] = 'e';
-              if (!usageidx)
-                usagebuf[usageidx++] = '-';
-              usagebuf[usageidx] = 0;
+              set_usage_string (usagebuf, i);
               send_status_info (ctrl, "KEYPAIRINFO",
                                 gripstr, 40,
                                 id_buf, strlen (id_buf),
                                 usagebuf, strlen (usagebuf),
                                 "-", (size_t)1,
                                 algostr, strlen (algostr),
                                 NULL, (size_t)0);
             }
           xfree (algostr);
         }
     }
 }
 
 
 static gpg_error_t
 do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
 {
   gpg_error_t err;
 
   do_getattr (app, ctrl, "CHV-STATUS");
 
   err = switch_application (app, NKS_APP_NKS);
   if (err)
     return err;
 
   do_learn_status_core (app, ctrl, flags, app->app_local->active_nks_app);
 
   if (app->app_local->only_idlm)
     return 0;  /* ready.  */
 
   err = switch_application (app, app->app_local->qes_app_id);
   if (err)
     return 0;  /* Silently ignore if we can't switch to SigG.  */
 
   do_learn_status_core (app, ctrl, flags, app->app_local->qes_app_id);
 
   return 0;
 }
 
 
 
 /* Helper to read a certificate from the file FID.  The function
  * assumes that the the application has already been selected.  */
 static gpg_error_t
 readcert_from_ef (app_t app, int fid, unsigned char **cert, size_t *certlen)
 {
   gpg_error_t err;
   unsigned char *buffer;
   const unsigned char *p;
   size_t buflen, n;
   int class, tag, constructed, ndef;
   size_t totobjlen, objlen, hdrlen;
   int rootca = 0;
 
   *cert = NULL;
   *certlen = 0;
 
   /* Read the entire file.  fixme: This could be optimized by first
      reading the header to figure out how long the certificate
      actually is. */
   err = iso7816_select_file (app->slot, fid, 0);
   if (err)
     {
       log_error ("nks: error selecting FID 0x%04X: %s\n",
                  fid, gpg_strerror (err));
       return err;
     }
 
   err = iso7816_read_binary (app->slot, 0, 0, &buffer, &buflen);
   if (err)
     {
       log_error ("nks: error reading certificate from FID 0x%04X: %s\n",
                  fid, gpg_strerror (err));
       return err;
     }
 
   if (!buflen || *buffer == 0xff)
     {
       log_info ("nks: no certificate contained in FID 0x%04X\n", fid);
       err = gpg_error (GPG_ERR_NOT_FOUND);
       goto leave;
     }
 
   /* Now figure something out about the object. */
   p = buffer;
   n = buflen;
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (err)
     goto leave;
   if ( class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && constructed )
     ;
   else if ( class == CLASS_UNIVERSAL && tag == TAG_SET && constructed )
     rootca = 1;
   else
     return gpg_error (GPG_ERR_INV_OBJ);
   totobjlen = objlen + hdrlen;
   log_assert (totobjlen <= buflen);
 
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (err)
     goto leave;
 
   if (rootca)
     ;
   else if (class == CLASS_UNIVERSAL && tag == TAG_OBJECT_ID && !constructed)
     {
       const unsigned char *save_p;
 
       /* The certificate seems to be contained in a userCertificate
          container.  Skip this and assume the following sequence is
          the certificate. */
       if (n < objlen)
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto leave;
         }
       p += objlen;
       n -= objlen;
       save_p = p;
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         goto leave;
       if ( !(class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && constructed) )
         return gpg_error (GPG_ERR_INV_OBJ);
       totobjlen = objlen + hdrlen;
       log_assert (save_p + totobjlen <= buffer + buflen);
       memmove (buffer, save_p, totobjlen);
     }
 
   *cert = buffer;
   buffer = NULL;
   *certlen = totobjlen;
 
  leave:
   xfree (buffer);
   return err;
 }
 
 
 /*
  * Iterate over FILELIST, supporting two use cases:
  *
  * (1) With WANT_KEYGRIPSTR=<GRIP>, finding matching entry.
  * (2) With WANT_KEYGRIPSTR=NULL, listing entries
  *     by CAPABILITY (possibly == 0, for all entries).
  *
  * Caller supplies an array KEYGRIPSTR.
  * Caller should start *IDX_P == -1, and keep the index value in IDX_P.
  *
  * Returns 0 on success, otherwise returns error value.
  *
  * When all entries are tried, returns GPG_ERR_NOT_FOUND for the use
  * case of (1).  Returns GPG_ERR_TRUE for the use case of (2).
  */
 static gpg_error_t
 iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
                        char keygripstr[2*KEYGRIP_LEN+1], int *idx_p)
 {
   gpg_error_t err;
   int idx = *idx_p;
 
   for (idx++; filelist[idx].fid; idx++)
     {
       if (filelist[idx].nks_ver > app->appversion)
         continue;
 
       if (!filelist[idx].iskeypair)
         continue;
 
       if (app->app_local->only_idlm)
         {
           if (filelist[idx].nks_app_id != NKS_APP_IDLM)
             continue;
         }
       else
         {
           if (filelist[idx].nks_app_id != NKS_APP_NKS
               && filelist[idx].nks_app_id != app->app_local->qes_app_id)
             continue;
           err = switch_application (app, filelist[idx].nks_app_id);
           if (err)
             {
               *idx_p = idx;
               return err;
             }
         }
 
       err = keygripstr_from_pk_file (app, filelist[idx].fid,
                                      filelist[idx].iskeypair, keygripstr,
                                      NULL, NULL);
       if (err)
         {
           log_error ("can't get keygrip from FID 0x%04X: %s\n",
                      filelist[idx].fid, gpg_strerror (err));
           continue;
         }
 
       if (want_keygripstr)
         {
           if (!strcmp (keygripstr, want_keygripstr))
             {
               /* Found */
               *idx_p = idx;
               return 0;
             }
         }
       else
         {
           if (capability == GCRY_PK_USAGE_SIGN)
             {
               if (!filelist[idx].issignkey)
                 continue;
             }
           if (capability == GCRY_PK_USAGE_ENCR)
             {
               if (!filelist[idx].isencrkey)
                 continue;
             }
           if (capability == GCRY_PK_USAGE_AUTH)
             {
               if (!filelist[idx].isauthkey)
                 continue;
             }
 
           /* Found */
           *idx_p = idx;
           return 0;
         }
     }
 
   if (!want_keygripstr)
     err = gpg_error (GPG_ERR_TRUE);
   else
     err = gpg_error (GPG_ERR_NOT_FOUND);
 
   return err;
 }
 
 /* Read the certificate with id CERTID (as returned by learn_status in
    the CERTINFO status lines) and return it in the freshly allocated
    buffer put into CERT and the length of the certificate put into
    CERTLEN. */
 static gpg_error_t
 do_readcert (app_t app, const char *certid,
              unsigned char **cert, size_t *certlen)
 {
   int i, fid;
   gpg_error_t err;
   int nks_app_id;
 
   *cert = NULL;
   *certlen = 0;
 
   /* Handle the case with KEYGRIP.  */
   if (strlen (certid) == 40)
     {
       char keygripstr[2*KEYGRIP_LEN+1];
 
       i = -1;
       err = iterate_over_filelist (app, certid, 0, keygripstr, &i);
       if (err)
         return err;
 
       if (filelist[i].iskeypair > 0)
         fid = filelist[i].iskeypair;
       else
         fid = filelist[i].fid;
 
       return readcert_from_ef (app, fid, cert, certlen);
     }
 
   if (!strncmp (certid, "NKS-NKS3.", 9))
     nks_app_id = NKS_APP_NKS;
   else if (!strncmp (certid, "NKS-ESIGN.", 10))
     nks_app_id = NKS_APP_ESIGN;
   else if (!strncmp (certid, "NKS-SIGG.", 9))
     nks_app_id = NKS_APP_SIGG;
   else if (!strncmp (certid, "NKS-DF01.", 9))
     nks_app_id = NKS_APP_NKS;
   else if (!strncmp (certid, "NKS-IDLM.", 9))
     nks_app_id = NKS_APP_IDLM;
   else
     return gpg_error (GPG_ERR_INV_ID);
   certid += nks_app_id == NKS_APP_ESIGN? 10 : 9;
 
   err = switch_application (app, nks_app_id);
   if (err)
     return err;
 
   if (!hexdigitp (certid) || !hexdigitp (certid+1)
       || !hexdigitp (certid+2) || !hexdigitp (certid+3)
       || certid[4])
     return gpg_error (GPG_ERR_INV_ID);
   fid = xtoi_4 (certid);
   for (i=0; filelist[i].fid; i++)
     if ((filelist[i].certtype || filelist[i].iskeypair > 0)
         && filelist[i].nks_app_id == nks_app_id
         && filelist[i].fid == fid)
       break;
   if (!filelist[i].fid)
     return gpg_error (GPG_ERR_NOT_FOUND);
 
   /* If the requested objects is a plain public key, redirect it to
      the corresponding certificate.  The whole system is a bit messy
      because we sometime use the key directly or let the caller
      retrieve the key from the certificate.  The rationale for
      that is to support not-yet stored certificates. */
   if (filelist[i].iskeypair > 0)
     fid = filelist[i].iskeypair;
 
   return readcert_from_ef (app, fid, cert, certlen);
 }
 
 
 /* Handle the READKEY command. On success a canonical encoded
    S-expression with the public key will get stored at PK and its
    length at PKLEN; the caller must release that buffer.  On error PK
    and PKLEN are not changed and an error code is returned.  As of now
    this function is only useful for the internal authentication key.
    Other keys are automagically retrieved by means of the
    certificate parsing code in commands.c:cmd_readkey.  For internal
    use PK and PKLEN may be NULL to just check for an existing key.  */
 static gpg_error_t
 do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
             unsigned char **pk, size_t *pklen)
 {
   gpg_error_t err;
   unsigned char *dummy_pk = NULL;
   size_t  dummy_pklen = 0;
 
   if (!pk)
     pk = &dummy_pk;
   if (!pklen)
     pklen = &dummy_pklen;
 
   (void)ctrl;
 
   if ((flags & APP_READKEY_FLAG_ADVANCED))
     return GPG_ERR_NOT_SUPPORTED;
 
   /* We use a generic name to retrieve PK.AUT.IFD-SPK.  */
   if (!strcmp (keyid, "$IFDAUTHKEY") && app->appversion >= 3)
     {
       unsigned short path[1] = { 0x4500 };
       unsigned char *buffer[2];
       size_t buflen[2];
 
       /* Access the KEYD file which is always in the master directory.  */
       err = iso7816_select_path (app_get_slot (app), path, DIM (path), 0);
       if (err)
         goto leave;
       /* Due to the above select we need to re-select our application.  */
       app->app_local->need_app_select = 1;
       /* Get the two records.  */
       err = iso7816_read_record (app_get_slot (app), 5, 1, 0,
                                  &buffer[0], &buflen[0]);
       if (err)
         goto leave;
       if (all_zero_p (buffer[0], buflen[0]))
         {
           xfree (buffer[0]);
           err = gpg_error (GPG_ERR_NOT_FOUND);
           goto leave;
         }
       err = iso7816_read_record (app_get_slot (app), 6, 1, 0,
                                  &buffer[1], &buflen[1]);
       if (err)
         {
           xfree (buffer[0]);
           goto leave;
         }
 
       if ((flags & APP_READKEY_FLAG_INFO))
         {
           /* FIXME */
         }
 
       if (pk && pklen && pk != &dummy_pk)
         {
           *pk = make_canon_sexp_from_rsa_pk (buffer[0], buflen[0],
                                              buffer[1], buflen[1],
                                              pklen);
           if (!*pk)
             err = gpg_error_from_syserror ();
         }
 
       xfree (buffer[0]);
       xfree (buffer[1]);
     }
   else if (strlen (keyid) == 40)
     {
       char keygripstr[2*KEYGRIP_LEN+1];
       int i = -1;
 
       err = iterate_over_filelist (app, keyid, 0, keygripstr, &i);
       if (err)
         goto leave;
 
       err = pubkey_from_pk_file (app, filelist[i].fid, filelist[i].iskeypair,
                                  pk, pklen);
       if (!err && (flags & APP_READKEY_FLAG_INFO))
         {
           char *algostr;
           char usagebuf[5];
-          int usageidx = 0;
           char id_buf[100];
 
           if (app_help_get_keygrip_string_pk (*pk, *pklen, NULL, NULL, NULL,
                                               &algostr))
             algostr = NULL;  /* Ooops.  */
 
           snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
                     get_nks_tag (app, filelist[i].nks_app_id),
                     filelist[i].fid);
-          if (filelist[i].issignkey)
-            usagebuf[usageidx++] = 's';
-          if (filelist[i].isauthkey)
-            usagebuf[usageidx++] = 'a';
-          if (filelist[i].isencrkey)
-            usagebuf[usageidx++] = 'e';
-          if (!usageidx)
-            usagebuf[usageidx++] = '-';
-          usagebuf[usageidx] = 0;
+          set_usage_string (usagebuf, i);
           send_status_info (ctrl, "KEYPAIRINFO",
                             keygripstr, strlen (keygripstr),
                             id_buf, strlen (id_buf),
                             usagebuf, strlen (usagebuf),
                             "-", (size_t)1,
                             algostr, strlen (algostr?algostr:""),
                             NULL, (size_t)0);
           xfree (algostr);
         }
     }
   else if (!strncmp (keyid, "NKS-IDLM.", 9))
     {
       keyid += 9;
       if (!hexdigitp (keyid) || !hexdigitp (keyid+1)
           || !hexdigitp (keyid+2) || !hexdigitp (keyid+3)
           || keyid[4])
         {
           err = gpg_error (GPG_ERR_INV_ID);
           goto leave;
         }
 
       err = pubkey_from_pk_file (app, xtoi_4 (keyid), -1, pk, pklen);
       /* FIXME: Implement KEYPAIRINFO.  */
     }
   else /* Return the error code expected by cmd_readkey.  */
     err = gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
  leave:
   xfree (dummy_pk);
   return err;
 }
 
 
 /* Write the certificate (CERT,CERTLEN) to the card at CERTREFSTR.
  * CERTREFSTR is of the form "NKS_<yyy>.<four_hexdigit_keyref>". */
 static gpg_error_t
 do_writecert (app_t app, ctrl_t ctrl,
               const char *certid,
               gpg_error_t (*pincb)(void*, const char *, char **),
               void *pincb_arg,
               const unsigned char *cert, size_t certlen)
 {
   gpg_error_t err;
   int i, fid, pwid;
   int nks_app_id, tmp_app_id;
   const char *desc;
 
   (void)ctrl;
 
   if (!strncmp (certid, "NKS-NKS3.", 9))
     nks_app_id = NKS_APP_NKS;
   else if (!strncmp (certid, "NKS-ESIGN.", 10))
     nks_app_id = NKS_APP_ESIGN;
   else if (!strncmp (certid, "NKS-SIGG.", 9))
     nks_app_id = NKS_APP_SIGG;
   else if (!strncmp (certid, "NKS-DF01.", 9))
     nks_app_id = NKS_APP_NKS;
   else if (!strncmp (certid, "NKS-IDLM.", 9))
     nks_app_id = NKS_APP_IDLM;
   else
     return gpg_error (GPG_ERR_INV_ID);
   certid += nks_app_id == NKS_APP_ESIGN? 10 : 9;
 
   err = switch_application (app, nks_app_id);
   if (err)
     return err;
 
   if (!hexdigitp (certid) || !hexdigitp (certid+1)
       || !hexdigitp (certid+2) || !hexdigitp (certid+3)
       || certid[4])
     return gpg_error (GPG_ERR_INV_ID);
   fid = xtoi_4 (certid);
   for (i=0; filelist[i].fid; i++)
     if ((filelist[i].certtype || filelist[i].iskeypair > 0)
         && filelist[i].nks_app_id == nks_app_id
         && filelist[i].fid == fid)
       break;
   if (!filelist[i].fid)
     return gpg_error (GPG_ERR_NOT_FOUND);
 
   /* If the requested objects is a plain public key, redirect it to
    * the corresponding certificate.  This makes it easier for the user
    * to figure out which CERTID to use.  For example gpg-card shows
    * the id of the key and not of the certificate.  */
   if (filelist[i].iskeypair > 0)
     fid = filelist[i].iskeypair;
 
   /* We have no selective flush mechanism and given the rare use of
    * writecert it won't harm to flush the entire cache.  */
   flush_fid_cache (app);
 
 
   /* The certificates we support all require PW1.CH.  Note that we
    * check that the nks_app_id matches which sorts out CERTID values
    * which are subkecy to a different nks_app_id.  */
   desc = parse_pwidstr (app, "PW1.CH", 0, &tmp_app_id, &pwid);
   if (!desc || tmp_app_id != nks_app_id)
     return gpg_error (GPG_ERR_INV_ID);
   err = verify_pin (app, pwid, desc, pincb, pincb_arg);
   if (err)
     return err;
 
     /* Select the file and write the certificate.  */
   err = iso7816_select_file (app_get_slot (app), fid, 0);
   if (err)
     {
       log_error ("nks: error selecting FID 0x%04X: %s\n",
                  fid, gpg_strerror (err));
       return err;
     }
 
   err = iso7816_update_binary (app_get_slot (app), 1, 0, cert, certlen);
   if (err)
     {
       log_error ("nks: error updating certificate at FID 0x%04X: %s\n",
                  fid, gpg_strerror (err));
       return err;
     }
 
   return 0;
 }
 
 
 /* Handle the WRITEKEY command for NKS.  This function expects a
    canonical encoded S-expression with the public key in KEYDATA and
    its length in KEYDATALEN.  The only supported KEYID is
    "$IFDAUTHKEY" to store the terminal key on the card.  Bit 0 of
    FLAGS indicates whether an existing key shall get overwritten.
    PINCB and PINCB_ARG are the usual arguments for the pinentry
    callback.  */
 static gpg_error_t
 do_writekey (app_t app, ctrl_t ctrl,
              const char *keyid, unsigned int flags,
              gpg_error_t (*pincb)(void*, const char *, char **),
              void *pincb_arg,
              const unsigned char *keydata, size_t keydatalen)
 {
   gpg_error_t err;
   int force = (flags & 1);
   const unsigned char *rsa_n = NULL;
   const unsigned char *rsa_e = NULL;
   size_t rsa_n_len, rsa_e_len;
   unsigned int nbits;
 
   (void)pincb;
   (void)pincb_arg;
 
   if (!strcmp (keyid, "$IFDAUTHKEY") && app->appversion >= 3)
     ;
   else
     return gpg_error (GPG_ERR_INV_ID);
 
   if (!force && !do_readkey (app, ctrl, keyid, 0, NULL, NULL))
     return gpg_error (GPG_ERR_EEXIST);
 
   /* Parse the S-expression.  */
   err = get_rsa_pk_from_canon_sexp (keydata, keydatalen,
                                     &rsa_n, &rsa_n_len, &rsa_e, &rsa_e_len);
   if (err)
     goto leave;
 
   /* Check that the parameters match the requirements.  */
   nbits = app_help_count_bits (rsa_n, rsa_n_len);
   if (nbits != 1024)
     {
       log_error (_("RSA modulus missing or not of size %d bits\n"), 1024);
       err = gpg_error (GPG_ERR_BAD_PUBKEY);
       goto leave;
     }
 
   nbits = app_help_count_bits (rsa_e, rsa_e_len);
   if (nbits < 2 || nbits > 32)
     {
       log_error (_("RSA public exponent missing or larger than %d bits\n"),
                  32);
       err = gpg_error (GPG_ERR_BAD_PUBKEY);
       goto leave;
     }
 
 /*   /\* Store them.  *\/ */
 /*   err = verify_pin (app, 0, NULL, pincb, pincb_arg); */
 /*   if (err) */
 /*     goto leave; */
 
   /* Send the MSE:Store_Public_Key.  */
   /* We will need to clear the cache here.  */
   err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
 /*   mse = xtrymalloc (1000); */
 
 /*   mse[0] = 0x80; /\* Algorithm reference.  *\/ */
 /*   mse[1] = 1; */
 /*   mse[2] = 0x17; */
 /*   mse[3] = 0x84; /\* Private key reference.  *\/ */
 /*   mse[4] = 1; */
 /*   mse[5] = 0x77; */
 /*   mse[6] = 0x7F; /\* Public key parameter.  *\/ */
 /*   mse[7] = 0x49; */
 /*   mse[8] = 0x81; */
 /*   mse[9] = 3 + 0x80 + 2 + rsa_e_len; */
 /*   mse[10] = 0x81; /\* RSA modulus of 128 byte.  *\/ */
 /*   mse[11] = 0x81; */
 /*   mse[12] = rsa_n_len; */
 /*   memcpy (mse+12, rsa_n, rsa_n_len); */
 /*   mse[10] = 0x82; /\* RSA public exponent of up to 4 bytes.  *\/ */
 /*   mse[12] = rsa_e_len; */
 /*   memcpy (mse+12, rsa_e, rsa_e_len); */
 /*   err = iso7816_manage_security_env (app->slot, 0x81, 0xB6, */
 /*                                      mse, sizeof mse); */
 
  leave:
   return err;
 }
 
 
 /* Return an allocated string to be used as prompt.  Returns NULL on
  * malloc error.  */
 static char *
 make_prompt (app_t app, int remaining, const char *firstline,
              const char *extraline)
 {
   char *serial, *tmpbuf, *result;
 
   serial = get_dispserialno (app);
 
   /* TRANSLATORS: Put a \x1f right before a colon.  This can be
    * used by pinentry to nicely align the names and values.  Keep
    * the %s at the start and end of the string.  */
   result = xtryasprintf (_("%s"
                            "Number\x1f: %s%%0A"
                            "Holder\x1f: %s"
                            "%s"),
                          "\x1e",
                          serial,
                          "",
                          "");
   xfree (serial);
   if (!result)
     return NULL; /* Out of core.  */
 
   /* Append a "remaining attempts" info if needed.  */
   if (remaining != -1 && remaining < 3)
     {
       char *rembuf;
 
       /* TRANSLATORS: This is the number of remaining attempts to
        * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed. */
       rembuf = xtryasprintf (_("Remaining attempts: %d"), remaining);
       if (rembuf)
         {
           tmpbuf = strconcat (firstline, "%0A%0A", result,
                               "%0A%0A", rembuf, NULL);
           xfree (rembuf);
         }
       else
         tmpbuf = NULL;
       xfree (result);
       result = tmpbuf;
     }
   else
     {
       tmpbuf = strconcat (firstline, "%0A%0A", result,
                           extraline? "%0A%0A":"", extraline,
                           NULL);
       xfree (result);
       result = tmpbuf;
     }
 
   return result;
 }
 
 
 static gpg_error_t
 basic_pin_checks (const char *pinvalue, int minlen, int maxlen)
 {
   if (strlen (pinvalue) < minlen)
     {
       log_error ("PIN is too short; minimum length is %d\n", minlen);
       return gpg_error (GPG_ERR_BAD_PIN);
     }
   if (strlen (pinvalue) > maxlen)
     {
       log_error ("PIN is too large; maximum length is %d\n", maxlen);
       return gpg_error (GPG_ERR_BAD_PIN);
     }
   return 0;
 }
 
 
 /* Verify the PIN if required.  */
 static gpg_error_t
 verify_pin (app_t app, int pwid, const char *desc,
             gpg_error_t (*pincb)(void*, const char *, char **),
             void *pincb_arg)
 {
   int rc;
   pininfo_t pininfo;
   char *prompt;
   const char *extrapromptline = NULL;
   int remaining, nullpin;
 
   if (!desc)
     desc = "||PIN";
 
   memset (&pininfo, 0, sizeof pininfo);
   pininfo.fixedlen = -1;
 
   /* FIXME: TCOS allows to read the min. and max. values - do this.  */
   if (app->appversion == 15)
     {
       if (app->app_local->active_nks_app == NKS_APP_NKS && pwid == 0x03)
         pininfo.minlen = 6;
       else if (app->app_local->active_nks_app == NKS_APP_ESIGN && pwid == 0x81)
         pininfo.minlen = 6;
       else
         pininfo.minlen = 8;
       pininfo.maxlen = 24;
     }
   else if (app->app_local->active_nks_app == NKS_APP_IDLM)
     {
       if (pwid == 0x00)
         pininfo.minlen = 6;
       else
         pininfo.minlen = 8;
       pininfo.maxlen = 24;
     }
   else
     {
       /* For NKS3 we used these fixed values; let's keep this.  */
       pininfo.minlen = 6;
       pininfo.maxlen = 16;
     }
 
   remaining = iso7816_verify_status (app_get_slot (app), pwid);
   nullpin = (remaining == ISO7816_VERIFY_NULLPIN);
   if (remaining < 0)
     remaining = -1; /* We don't care about the concrete error.  */
   if (remaining < 3)
     {
       if (remaining >= 0)
         log_info ("nks: PIN has %d attempts left\n", remaining);
     }
 
   if (nullpin)
     {
       log_info ("nks: The NullPIN for PIN 0x%02x has not yet been changed\n",
                 pwid);
       extrapromptline = _("Note: PIN has not yet been enabled.");
     }
 
   if (!opt.disable_pinpad
       && !iso7816_check_pinpad (app->slot, ISO7816_VERIFY, &pininfo) )
     {
       prompt = make_prompt (app, remaining, desc, extrapromptline);
       rc = pincb (pincb_arg, prompt, NULL);
       xfree (prompt);
       if (rc)
         {
           log_info (_("PIN callback returned error: %s\n"),
                     gpg_strerror (rc));
           return rc;
         }
 
       rc = iso7816_verify_kp (app->slot, pwid, &pininfo);
       pincb (pincb_arg, NULL, NULL);  /* Dismiss the prompt. */
     }
   else
     {
       char *pinvalue;
 
       prompt = make_prompt (app, remaining, desc, extrapromptline);
       rc = pincb (pincb_arg, prompt, &pinvalue);
       xfree (prompt);
       if (rc)
         {
           log_info ("PIN callback returned error: %s\n", gpg_strerror (rc));
           return rc;
         }
 
       rc = basic_pin_checks (pinvalue, pininfo.minlen, pininfo.maxlen);
       if (rc)
         {
           xfree (pinvalue);
           return rc;
         }
 
       rc = iso7816_verify (app->slot, pwid, pinvalue, strlen (pinvalue));
       xfree (pinvalue);
     }
 
   if (rc)
     {
       if ( gpg_err_code (rc) == GPG_ERR_USE_CONDITIONS )
         log_error (_("the NullPIN has not yet been changed\n"));
       else
         log_error ("verify PIN failed\n");
       return rc;
     }
 
   return 0;
 }
 
 
 /* Create the signature and return the allocated result in OUTDATA.
    If a PIN is required the PINCB will be used to ask for the PIN;
    that callback should return the PIN in an allocated buffer and
    store that in the 3rd argument.  */
 static gpg_error_t
 do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
          gpg_error_t (*pincb)(void*, const char *, char **),
          void *pincb_arg,
          const void *indata, size_t indatalen,
          unsigned char **outdata, size_t *outdatalen )
 {
   static unsigned char sha1_prefix[15] = /* Object ID is 1.3.14.3.2.26 */
     { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
       0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 };
   static unsigned char rmd160_prefix[15] = /* Object ID is 1.3.36.3.2.1 */
     { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x24, 0x03,
       0x02, 0x01, 0x05, 0x00, 0x04, 0x14 };
   static unsigned char sha224_prefix[19] = /* (2.16.840.1.101.3.4.2.4) */
     { 0x30, 0x2D, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48,
       0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05, 0x00, 0x04,
       0x1C  };
   static unsigned char sha256_prefix[19] = /* (2.16.840.1.101.3.4.2.1) */
     { 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
       0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05,
       0x00, 0x04, 0x20  };
   static unsigned char sha384_prefix[19] = /* (2.16.840.1.101.3.4.2.2) */
     { 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
       0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05,
       0x00, 0x04, 0x30  };
   static unsigned char sha512_prefix[19] = /* (2.16.840.1.101.3.4.2.3) */
     { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
       0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05,
       0x00, 0x04, 0x40  };
   gpg_error_t err;
   int idx;
   int pwid;
   unsigned char kid;
   unsigned char data[83];   /* Must be large enough for a SHA-1 digest
                                + the largest OID prefix. */
   size_t datalen;
 
   (void)ctrl;
 
   switch (indatalen)
     {
     case 20: // plain SHA-1 or RMD160 digest
     case 28: // plain SHA-224 digest
     case 32: // plain SHA-256 digest
     case 48: // plain SHA-384 digest
     case 64: // plain SHA-512 digest
     case 35: // ASN.1 encoded SHA-1 or RMD160 digest
     case 47: // ASN.1 encoded SHA-224 digest
     case 51: // ASN.1 encoded SHA-256 digest
     case 67: // ASN.1 encoded SHA-384 digest
     case 83: // ASN.1 encoded SHA-512 digest
         break;
     default:
       log_debug ("invalid length of input data: %zu\n", indatalen);
       return gpg_error (GPG_ERR_INV_VALUE);
     }
 
   err = find_fid_by_keyref (app, keyidstr, &idx, NULL);
   if (err)
     return err;
 
   if (app->app_local->active_nks_app == NKS_APP_SIGG
       && app->app_local->sigg_is_msig)
     {
       log_info ("mass signature cards are not allowed\n");
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 
   if (!filelist[idx].issignkey)
     {
       log_debug ("key %s is not a signing key\n", keyidstr);
       return gpg_error (GPG_ERR_INV_ID);
     }
 
   kid = filelist[idx].kid;
 
   /* Prepare the DER object from INDATA.  */
   if (app->appversion > 2 && (indatalen == 35
                               || indatalen == 47
                               || indatalen == 51
                               || indatalen == 67
                               || indatalen == 83))
     {
       /* Verify that the caller has sent a proper ASN.1 encoded hash
          for RMD160 or SHA-{1,224,256,384,512}. */
 #define X(algo,prefix,plaindigestlen)                      \
       if (hashalgo == (algo)                               \
           && indatalen == sizeof prefix + (plaindigestlen) \
           && !memcmp (indata, prefix, sizeof prefix))      \
         ;
       X(GCRY_MD_RMD160, rmd160_prefix, 20)
       else X(GCRY_MD_SHA1, sha1_prefix, 20)
       else X(GCRY_MD_SHA224, sha224_prefix, 28)
       else X(GCRY_MD_SHA256, sha256_prefix, 32)
       else X(GCRY_MD_SHA384, sha384_prefix, 48)
       else X(GCRY_MD_SHA512, sha512_prefix, 64)
       else
         return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
 #undef X
 
       log_assert (indatalen <= sizeof data);
       memcpy (data, indata, indatalen);
       datalen = indatalen;
     }
   else if (indatalen == 35)
     {
       /* Alright, the caller was so kind to send us an already
          prepared DER object.  This is for TCOS 2. */
       if (hashalgo == GCRY_MD_SHA1 && !memcmp (indata, sha1_prefix, 15))
         ;
       else if (hashalgo == GCRY_MD_RMD160 && !memcmp (indata,rmd160_prefix,15))
         ;
       else
         return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
       memcpy (data, indata, indatalen);
       datalen = 35;
     }
   /* Concatenate prefix and digest.  */
 #define X(algo,prefix,plaindigestlen) \
   if ((hashalgo == (algo)) && (indatalen == (plaindigestlen))) \
     {                                                          \
       datalen = sizeof prefix + indatalen;                     \
       log_assert (datalen <= sizeof data);                     \
       memcpy (data, prefix, sizeof prefix);                    \
       memcpy (data + sizeof prefix, indata, indatalen);        \
     }
   else X(GCRY_MD_RMD160, rmd160_prefix, 20)
   else X(GCRY_MD_SHA1, sha1_prefix, 20)
   else X(GCRY_MD_SHA224, sha224_prefix, 28)
   else X(GCRY_MD_SHA256, sha256_prefix, 32)
   else X(GCRY_MD_SHA384, sha384_prefix, 48)
   else X(GCRY_MD_SHA512, sha512_prefix, 64)
   else
     return gpg_error (GPG_ERR_INV_VALUE);
 #undef X
 
   /* Send an MSE for PSO:Computer_Signature.  */
   if (app->appversion > 2)
     {
       unsigned char mse[6];
 
       mse[0] = 0x80; /* Algorithm reference.  */
       mse[1] = 1;
       mse[2] = 2;    /* RSA, card does pkcs#1 v1.5 padding, no ASN.1 check.  */
       mse[3] = 0x84; /* Private key reference.  */
       mse[4] = 1;
       mse[5] = kid;
       err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB6,
                                          mse, sizeof mse);
     }
 
   /* We use the Global PIN 1 */
   if (app->appversion == 15)
     pwid = 0x03;
   else
     pwid = 0x00;
 
   if (!err)
     err = verify_pin (app, pwid, NULL, pincb, pincb_arg);
   /* Compute the signature.  */
   if (!err)
     err = iso7816_compute_ds (app_get_slot (app), 0, data, datalen, 0,
                               outdata, outdatalen);
   return err;
 }
 
 
 
 /* Decrypt the data in INDATA and return the allocated result in OUTDATA.
    If a PIN is required the PINCB will be used to ask for the PIN; it
    should return the PIN in an allocated buffer and put it into PIN.  */
 static gpg_error_t
 do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
              gpg_error_t (*pincb)(void*, const char *, char **),
              void *pincb_arg,
              const void *indata, size_t indatalen,
              unsigned char **outdata, size_t *outdatalen,
              unsigned int *r_info)
 {
   gpg_error_t err;
   int idx;
   int kid;
   int algo;
   int pwid;
   int padind;
   int extended_mode;
 
   (void)ctrl;
   (void)r_info;
 
   if (!indatalen)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   err = find_fid_by_keyref (app, keyidstr, &idx, &algo);
   if (err)
     return err;
 
   if (!filelist[idx].isencrkey)
     return gpg_error (GPG_ERR_INV_ID);
 
   kid = filelist[idx].kid;
 
   if (app->appversion <= 2)
     {
       static const unsigned char mse[] =
         {
           0x80, 1, 0x10, /* Select algorithm RSA. */
           0x84, 1, 0x81  /* Select local secret key 1 for decryption. */
         };
       err = iso7816_manage_security_env (app_get_slot (app), 0xC1, 0xB8,
                                          mse, sizeof mse);
       extended_mode = 0;
       padind = 0x81;
     }
   else if (algo == GCRY_PK_ECC)
     {
       unsigned char mse[3];
       mse[0] = 0x84; /* Private key reference.  */
       mse[1] = 1;
       mse[2] = kid;
       err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB8,
                                          mse, sizeof mse);
       extended_mode = 0;
       padind = 0x00;
     }
   else
     {
       unsigned char mse[6];
       mse[0] = 0x80; /* Algorithm reference.  */
       mse[1] = 1;
       mse[2] = 0x0a; /* RSA no padding.  (0x1A is pkcs#1.5 padding.)  */
       mse[3] = 0x84; /* Private key reference.  */
       mse[4] = 1;
       mse[5] = kid;
       err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB8,
                                          mse, sizeof mse);
       extended_mode = 1;
       padind = 0x81;
     }
   if (err)
     {
       log_error ("nks: MSE failed: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   /* We use the Global PIN 1 */
   if (app->appversion == 15)
     pwid = 0x03;
   else
     pwid = 0x00;
 
   err = verify_pin (app, pwid, NULL, pincb, pincb_arg);
   if (err)
     goto leave;
 
   err = iso7816_decipher (app_get_slot (app), extended_mode,
                           indata, indatalen, 0, padind,
                           outdata, outdatalen);
 
  leave:
   return err;
 }
 
 
 
 /* Parse a password ID string.  Returns NULL on error or a string
  * suitable as passphrase prompt on success.  On success stores the
  * reference value for the password at R_PWID and a flag indicating
  * which app is to be used at R_NKS_APP_ID.  If NEW_MODE is true, the
  * returned description is suitable for a new password.  Here is a
  * take mapping the PWIDSTR to the used PWIDs:
  *
  *  | pwidstr    |              | NKS3 | NKS15 | IDKEY1 |
  *  |------------+--------------+------+-------+--------|
  *  | PW1.CH     | Global PIN 1 | 0x00 |  0x03 | 0x00   |
  *  | PW2.CH     | Global PIN 2 | 0x01 |  0x04 | 0x01   |
  *  | PW1.CH.SIG | SigG PIN 1   | 0x81 |  0x81 | -      |
  *  | PW2.CH.SIG | SigG PIN 2   | 0x83 |  0x82 | -      |
  *
  * The names for PWIDSTR are taken from the NKS3 specs; the specs of
  * other cards use different names but we keep using the.  PIN1 can be
  * used to unlock PIN2 and vice versa; for consistence with other
  * cards we name PIN2 a "PUK".  The IDKEY card also features a Card
  * Reset Key (CR Key 0x01) which can also be used to reset PIN1.
  *
  * For testing it is possible to specify the PWID directly; the
  * prompts are then not very descriptive:
  *
  *   NKS.0xnn   - Switch to NKS and select id 0xnn
  *   SIGG.0xnn  - Switch to SigG and select id 0xnn
  *   ESIGN.0xnn - Switch to ESIGN and select id 0xnn
  */
 static const char *
 parse_pwidstr (app_t app, const char *pwidstr, int new_mode,
                int *r_nks_app_id, int *r_pwid)
 {
   const char *desc;
   int nks15 = app->appversion == 15;
 
   if (!pwidstr)
     desc = NULL;
   else if (!strcmp (pwidstr, "PW1.CH"))
     {
       *r_nks_app_id = NKS_APP_NKS;
       *r_pwid = nks15? 0x03 : 0x00;
       /* TRANSLATORS: Do not translate the "|*|" prefixes but keep
          them verbatim at the start of the string.  */
       desc = (new_mode
               ? _("|N|Please enter a new PIN for the standard keys.")
               : _("||Please enter the PIN for the standard keys."));
     }
   else if (!strcmp (pwidstr, "PW2.CH"))
     {
       *r_nks_app_id = NKS_APP_NKS;
       *r_pwid = nks15? 0x04 : 0x01;
       desc = (new_mode
               ? _("|NP|Please enter a new PIN Unblocking Code (PUK) "
                   "for the standard keys.")
               : _("|P|Please enter the PIN Unblocking Code (PUK) "
                   "for the standard keys."));
     }
   else if (!strcmp (pwidstr, "PW1.CH.SIG") && !app->app_local->only_idlm)
     {
       *r_nks_app_id = app->app_local->qes_app_id;
       *r_pwid = 0x81;
       desc = (new_mode
               ? _("|N|Please enter a new PIN for the key to create "
                   "qualified signatures.")
               : _("||Please enter the PIN for the key to create "
                   "qualified signatures."));
     }
   else if (!strcmp (pwidstr, "PW2.CH.SIG") && !app->app_local->only_idlm)
     {
       *r_nks_app_id = app->app_local->qes_app_id;
       *r_pwid = nks15? 0x82 : 0x83;
       desc = (new_mode
               ? _("|NP|Please enter a new PIN Unblocking Code (PUK) "
                   "for the key to create qualified signatures.")
               : _("|P|Please enter the PIN Unblocking Code (PUK) "
                   "for the key to create qualified signatures."));
     }
   else if (!strncmp (pwidstr, "NKS.0x", 6)
            && hexdigitp (pwidstr+6) && hexdigitp (pwidstr+7) && !pwidstr[8])
     {
       /* Hack to help debugging.  */
       *r_nks_app_id = NKS_APP_NKS;
       *r_pwid = xtoi_2 (pwidstr+6);
       desc = (new_mode
               ? "|N|Please enter a new PIN for the given NKS pwid"
               : "||Please enter the PIN for the given NKS pwid" );
     }
   else if (!strncmp (pwidstr, "SIGG.0x", 7)
            && hexdigitp (pwidstr+7) && hexdigitp (pwidstr+8) && !pwidstr[9])
     {
       /* Hack to help debugging.  */
       *r_nks_app_id = NKS_APP_SIGG;
       *r_pwid = xtoi_2 (pwidstr+7);
       desc = (new_mode
               ? "|N|Please enter a new PIN for the given SIGG pwid"
               : "||Please enter the PIN for the given SIGG pwid" );
     }
   else if (!strncmp (pwidstr, "ESIGN.0x", 8)
            && hexdigitp (pwidstr+8) && hexdigitp (pwidstr+9) && !pwidstr[10])
     {
       /* Hack to help debugging.  */
       *r_nks_app_id = NKS_APP_ESIGN;
       *r_pwid = xtoi_2 (pwidstr+8);
       desc = (new_mode
               ? "|N|Please enter a new PIN for the given ESIGN pwid"
               : "||Please enter the PIN for the given ESIGN pwid" );
     }
   else if (!strncmp (pwidstr, "IDLM.0x", 7)
            && hexdigitp (pwidstr+7) && hexdigitp (pwidstr+8) && !pwidstr[9])
     {
       /* Hack to help debugging.  */
       *r_nks_app_id = NKS_APP_IDLM;
       *r_pwid = xtoi_2 (pwidstr+7);
       desc = (new_mode
               ? "|N|Please enter a new PIN for the given IDLM pwid"
               : "||Please enter the PIN for the given IDLM pwid" );
     }
   else
     {
       *r_pwid = 0; /* Only to avoid gcc warning in calling function.  */
       desc = NULL; /* Error.  */
     }
 
   return desc;
 }
 
 
 /* Handle the PASSWD command. See parse_pwidstr() for allowed values
    for CHVNOSTR.  */
 static gpg_error_t
 do_change_pin (app_t app, ctrl_t ctrl,  const char *pwidstr,
                unsigned int flags,
                gpg_error_t (*pincb)(void*, const char *, char **),
                void *pincb_arg)
 {
   gpg_error_t err;
   char *newpin = NULL;
   char *oldpin = NULL;
   size_t newpinlen;
   size_t oldpinlen;
   int nks_app_id;
   const char *newdesc;
   int pwid;
   pininfo_t pininfo;
   int remaining;
   char *prompt;
 
   (void)ctrl;
 
   /* The minimum length is enforced by TCOS, the maximum length is
      just a reasonable value.  */
   memset (&pininfo, 0, sizeof pininfo);
   pininfo.minlen = 6;
   pininfo.maxlen = 16;
 
   newdesc = parse_pwidstr (app, pwidstr, 1, &nks_app_id, &pwid);
   if (!newdesc)
     return gpg_error (GPG_ERR_INV_ID);
 
   if ((flags & APP_CHANGE_FLAG_CLEAR))
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   err = switch_application (app, nks_app_id);
   if (err)
     return err;
 
   if ((flags & APP_CHANGE_FLAG_NULLPIN))
     {
       /* With the nullpin flag, we do not verify the PIN - it would
          fail if the Nullpin is still set.  */
       oldpin = xtrycalloc (1, 6);
       if (!oldpin)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       if (app->appversion == 15)
         {
           memset (oldpin, '0', 5);
           oldpinlen = 5;  /* 5 ascii zeroes.  */
         }
       else
         {
           oldpinlen = 6;  /* 6 binary Nuls.  */
         }
     }
   else
     {
       const char *desc;
       int dummy1, dummy2;
 
       if ((flags & APP_CHANGE_FLAG_RESET))
         {
           /* Reset mode: Ask for the alternate PIN.  */
           const char *altpwidstr;
 
           if (!strcmp (pwidstr, "PW1.CH"))
             altpwidstr = "PW2.CH";
           else if (!strcmp (pwidstr, "PW2.CH"))
             altpwidstr = "PW1.CH";
           else if (!strcmp (pwidstr, "PW1.CH.SIG"))
             altpwidstr = "PW2.CH.SIG";
           else if (!strcmp (pwidstr, "PW2.CH.SIG"))
             altpwidstr = "PW1.CH.SIG";
           else
             {
               err = gpg_error (GPG_ERR_BUG);
               goto leave;
             }
           desc = parse_pwidstr (app, altpwidstr, 0, &dummy1, &dummy2);
           remaining = iso7816_verify_status (app_get_slot (app), dummy2);
         }
       else
         {
           /* Regular change mode:  Ask for the old PIN.  */
           desc = parse_pwidstr (app, pwidstr, 0, &dummy1, &dummy2);
           remaining = iso7816_verify_status (app_get_slot (app), pwid);
         }
 
       if (remaining < 0)
         remaining = -1; /* We don't care about the concrete error.  */
       if (remaining < 3)
         {
           if (remaining >= 0)
             log_info ("nks: PIN has %d attempts left\n", remaining);
         }
 
       prompt = make_prompt (app, remaining, desc, NULL);
       err = pincb (pincb_arg, prompt, &oldpin);
       xfree (prompt);
       if (err)
         {
           log_error ("error getting old PIN: %s\n", gpg_strerror (err));
           goto leave;
         }
       oldpinlen = strlen (oldpin);
       err = basic_pin_checks (oldpin, pininfo.minlen, pininfo.maxlen);
       if (err)
         goto leave;
     }
 
 
   prompt = make_prompt (app, -1, newdesc, NULL);
   err = pincb (pincb_arg, prompt, &newpin);
   xfree (prompt);
   if (err)
     {
       log_error (_("error getting new PIN: %s\n"), gpg_strerror (err));
       goto leave;
     }
   newpinlen = strlen (newpin);
 
   err = basic_pin_checks (newpin, pininfo.minlen, pininfo.maxlen);
   if (err)
     goto leave;
 
   if ((flags & APP_CHANGE_FLAG_RESET))
     {
       char *data;
       size_t datalen = oldpinlen + newpinlen;
 
       data = xtrymalloc (datalen);
       if (!data)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       memcpy (data, oldpin, oldpinlen);
       memcpy (data+oldpinlen, newpin, newpinlen);
       err = iso7816_reset_retry_counter_with_rc (app->slot, pwid,
                                                  data, datalen);
       wipememory (data, datalen);
       xfree (data);
     }
   else
     err = iso7816_change_reference_data (app->slot, pwid,
                                          oldpin, oldpinlen,
                                          newpin, newpinlen);
  leave:
   xfree (oldpin);
   xfree (newpin);
   return err;
 }
 
 
 /* Perform a simple verify operation.  KEYIDSTR should be NULL or empty.  */
 static gpg_error_t
 do_check_pin (app_t app, ctrl_t ctrl, const char *pwidstr,
               gpg_error_t (*pincb)(void*, const char *, char **),
               void *pincb_arg)
 {
   gpg_error_t err;
   int pwid;
   int nks_app_id;
   const char *desc;
 
   (void)ctrl;
 
   desc = parse_pwidstr (app, pwidstr, 0, &nks_app_id, &pwid);
   if (!desc)
     return gpg_error (GPG_ERR_INV_ID);
 
   err = switch_application (app, nks_app_id);
   if (err)
     return err;
 
   return verify_pin (app, pwid, desc, pincb, pincb_arg);
 }
 
 
 /* Process the various keygrip based info requests.  */
 static gpg_error_t
 do_with_keygrip (app_t app, ctrl_t ctrl, int action,
                  const char *want_keygripstr, int capability)
 {
   gpg_error_t err;
   char keygripstr[2*KEYGRIP_LEN+1];
   char *serialno = NULL;
   int data = 0;
   int idx = -1;
 
   /* First a quick check for valid parameters.  */
   switch (action)
     {
     case KEYGRIP_ACTION_LOOKUP:
       if (!want_keygripstr)
         {
           return gpg_error (GPG_ERR_NOT_FOUND);
         }
       break;
     case KEYGRIP_ACTION_SEND_DATA:
       data = 1;
       break;
     case KEYGRIP_ACTION_WRITE_STATUS:
       break;
     default:
       return gpg_error (GPG_ERR_INV_ARG);
     }
 
   /* Allocate the S/N string if needed.  */
   if (action != KEYGRIP_ACTION_LOOKUP)
     {
       serialno = app_get_serialno (app);
       if (!serialno)
         return gpg_error_from_syserror ();
     }
 
   while (1)
     {
       err = iterate_over_filelist (app, want_keygripstr, capability,
                                    keygripstr, &idx);
       if (err)
         break;
 
       if (want_keygripstr)
         {
           if (!err)
             break;
         }
       else
         {
           char idbuf[20];
           const char *tagstr;
+          char usagebuf[5];
 
           if (app->app_local->active_nks_app == NKS_APP_ESIGN)
             tagstr = "ESIGN";
           else if (app->app_local->active_nks_app == NKS_APP_SIGG)
             tagstr = "SIGG";
           else if (app->app_local->active_nks_app == NKS_APP_IDLM)
             tagstr = "IDLM";
           else if (app->appversion < 3)
             tagstr = "DF01";
           else
             tagstr = "NKS3";
 
           snprintf (idbuf, sizeof idbuf, "NKS-%s.%04X",
                     tagstr, filelist[idx].fid);
-          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf);
+          set_usage_string (usagebuf, idx);
+          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf, usagebuf);
         }
     }
 
   xfree (serialno);
   return err;
 }
 
 
 /* Return the version of the NKS application.  */
 static int
 get_nks_version (int slot)
 {
   unsigned char *result = NULL;
   size_t resultlen;
   int type;
 
   if (iso7816_apdu_direct (slot, "\x80\xaa\x06\x00\x00", 5, 0,
                            NULL, &result, &resultlen))
     return 2; /* NKS 2 does not support this command.  */
   /* Example values:   04 11 19 22 21 6A 20 80 03 03 01 01 01 00 00 00
    *                   05 a0 22 3e c8 0c 04 20 0f 01 b6 01 01 00 00 02
    *                   vv tt ccccccccccccccccc aa bb cc vv ff rr rr xx
    * vendor -----------+  |  |                 |  |  |  |  |  |  |  |
    * chip type -----------+  |                 |  |  |  |  |  |  |  |
    * chip id ----------------+                 |  |  |  |  |  |  |  |
    * card type --------------------------------+  |  |  |  |  |  |  |
    * OS version of card type ---------------------+  |  |  |  |  |  |
    * OS release of card type ------------------------+  |  |  |  |  |
    * Completion code version number --------------------+  |  |  |  |
    * File system version ----------------------------------+  |  |  |
    * RFU (00) ------------------------------------------------+  |  |
    * RFU (00) ---------------------------------------------------+  |
    * Authentication key identifier ---------------------------------+
    *
    * vendor    4 := Philips
    *           5 := Infinion
    * card type 3 := TCOS 3
    *          15 := TCOS Signature Card (bb,cc is the ROM mask version)
    * Completion code version number Bit 7..5 := pre-completion code version
    *                                Bit 4..0 := completion code version
    *                                (pre-completion by chip vendor)
    *                                (completion by OS developer)
    */
   if (resultlen < 16)
     type = 0;  /* Invalid data returned.  */
   else
     type = result[8];
   xfree (result);
   return type;
 }
 
 
 /* Switch to the NKS app identified by NKS_APP_ID if not yet done.
  * Returns 0 on success.  */
 static gpg_error_t
 switch_application (app_t app, int nks_app_id)
 {
   gpg_error_t err;
 
   if (app->app_local->only_idlm)
     return 0;  /* No switching at all */
   if (app->app_local->active_nks_app == nks_app_id
       && !app->app_local->need_app_select)
     return 0;  /* Already switched.  */
 
   log_info ("nks: switching to %s\n",
             nks_app_id == NKS_APP_ESIGN? "eSign" :
             nks_app_id == NKS_APP_SIGG?  "SigG"  : "NKS");
 
   if (nks_app_id == NKS_APP_ESIGN)
     err = iso7816_select_application (app_get_slot (app),
                                       aid_esign, sizeof aid_esign, 0);
   else if (nks_app_id == NKS_APP_SIGG)
     err = iso7816_select_application (app_get_slot (app),
                                       aid_sigg, sizeof aid_sigg, 0);
   else
     err = iso7816_select_application (app->slot, aid_nks, sizeof aid_nks, 0);
 
   if (!err && nks_app_id == NKS_APP_SIGG
       && app->appversion >= 3
       && !app->app_local->sigg_msig_checked)
     {
       /* Check whether this card is a mass signature card.  */
       unsigned char *buffer;
       size_t buflen;
       const unsigned char *tmpl;
       size_t tmpllen;
 
       app->app_local->sigg_msig_checked = 1;
       app->app_local->sigg_is_msig = 1;
       err = iso7816_select_file (app->slot, 0x5349, 0);
       if (!err)
         err = iso7816_read_record (app->slot, 1, 1, 0, &buffer, &buflen);
       if (!err)
         {
           tmpl = find_tlv (buffer, buflen, 0x7a, &tmpllen);
           if (tmpl && tmpllen == 12
               && !memcmp (tmpl,
                           "\x93\x02\x00\x01\xA4\x06\x83\x01\x81\x83\x01\x83",
                           12))
             app->app_local->sigg_is_msig = 0;
           xfree (buffer);
         }
       if (app->app_local->sigg_is_msig)
         log_info ("nks: This is a mass signature card\n");
     }
 
   if (!err)
     {
       app->app_local->need_app_select = 0;
       app->app_local->active_nks_app = nks_app_id;
     }
   else
     log_error ("nks: error switching to %s: %s\n",
                nks_app_id == NKS_APP_ESIGN? "eSign" :
                nks_app_id == NKS_APP_SIGG?  "SigG"  : "NKS",
                gpg_strerror (err));
 
   return err;
 }
 
 
 /* Select the NKS application.  */
 gpg_error_t
 app_select_nks (app_t app)
 {
   int slot = app->slot;
   int rc;
   int is_idlm = 0;
 
   rc = iso7816_select_application (slot, aid_nks, sizeof aid_nks, 0);
   if (rc)
     {
       is_idlm = 1;
       rc = iso7816_select_application (slot, aid_idlm, sizeof aid_idlm, 0);
     }
   if (!rc)
     {
       app->apptype = APPTYPE_NKS;
 
       app->app_local = xtrycalloc (1, sizeof *app->app_local);
       if (!app->app_local)
         {
           rc = gpg_error (gpg_err_code_from_errno (errno));
           goto leave;
         }
 
       app->appversion = get_nks_version (slot);
       app->app_local->only_idlm = is_idlm;
       if (is_idlm) /* Set it once, there won't be any switching.  */
         app->app_local->active_nks_app = NKS_APP_IDLM;
 
       if (opt.verbose)
         {
           log_info ("Detected NKS version: %d\n", app->appversion);
           if (is_idlm)
             log_info ("Using only the IDLM application\n");
         }
 
       if (app->appversion == 15)
         app->app_local->qes_app_id = NKS_APP_ESIGN;
       else
         app->app_local->qes_app_id = NKS_APP_SIGG;
 
       app->fnc.deinit = do_deinit;
       app->fnc.learn_status = do_learn_status;
       app->fnc.readcert = do_readcert;
       app->fnc.readkey = do_readkey;
       app->fnc.getattr = do_getattr;
       app->fnc.setattr = NULL;
       app->fnc.writecert = do_writecert;
       app->fnc.writekey = do_writekey;
       app->fnc.genkey = NULL;
       app->fnc.sign = do_sign;
       app->fnc.auth = NULL;
       app->fnc.decipher = do_decipher;
       app->fnc.change_pin = do_change_pin;
       app->fnc.check_pin = do_check_pin;
       app->fnc.with_keygrip = do_with_keygrip;
    }
 
  leave:
   if (rc)
     do_deinit (app);
   return rc;
 }
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 2884e0df5..f1f1168ec 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -1,6290 +1,6290 @@
 /* app-p15.c - The pkcs#15 card application.
  *	Copyright (C) 2005 Free Software Foundation, Inc.
  *	Copyright (C) 2020, 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* Information pertaining to the BELPIC developer card samples:
 
        Unblock PUK: "222222111111"
        Reset PIN:   "333333111111")
 
    e.g. the APDUs 00:20:00:02:08:2C:33:33:33:11:11:11:FF
               and 00:24:01:01:08:24:12:34:FF:FF:FF:FF:FF
    should change the PIN into 1234.
 */
 
 #include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include "scdaemon.h"
 
 #include "iso7816.h"
 #include "../common/i18n.h"
 #include "../common/tlv.h"
 #include "../common/host2net.h"
 #include "../common/openpgpdefs.h"
 #include "apdu.h" /* fixme: we should move the card detection to a
                      separate file */
 
 
 static const char oid_kp_codeSigning[]    = "1.3.6.1.5.5.7.3.3";
 static const char oid_kp_timeStamping[]   = "1.3.6.1.5.5.7.3.8";
 static const char oid_kp_ocspSigning[]    = "1.3.6.1.5.5.7.3.9";
 static const char oid_kp_ms_documentSigning[] = "1.3.6.1.4.1.311.10.3.12";
 static const char oid_kp_ms_old_documentSigning[] = "1.3.6.1.4.1.311.3.10.3.12";
 
 static const char oid_kp_emailProtection[]= "1.3.6.1.5.5.7.3.4";
 
 static const char oid_kp_serverAuth[]     = "1.3.6.1.5.5.7.3.1";
 static const char oid_kp_clientAuth[]     = "1.3.6.1.5.5.7.3.2";
 static const char oid_kp_ms_smartcardLogon[] = "1.3.6.1.4.1.311.20.2.2";
 
 static const char oid_kp_anyExtendedKeyUsage[] = "2.5.29.37.0";
 
 static const char oid_kp_gpgUsageCert[] = "1.3.6.1.4.1.11591.2.6.1";
 static const char oid_kp_gpgUsageSign[] = "1.3.6.1.4.1.11591.2.6.2";
 static const char oid_kp_gpgUsageEncr[] = "1.3.6.1.4.1.11591.2.6.3";
 static const char oid_kp_gpgUsageAuth[] = "1.3.6.1.4.1.11591.2.6.4";
 
 /* Types of cards we know and which needs special treatment. */
 typedef enum
   {
     CARD_TYPE_UNKNOWN,
     CARD_TYPE_TCOS,
     CARD_TYPE_MICARDO,
     CARD_TYPE_CARDOS_50,
     CARD_TYPE_CARDOS_53,
     CARD_TYPE_AET,     /* A.E.T. Europe JCOP card.  */
     CARD_TYPE_BELPIC   /* Belgian eID card specs. */
   }
 card_type_t;
 
 /* The OS of card as specified by card_type_t is not always
  * sufficient.  Thus we also distinguish the actual product build upon
  * the given OS.  */
 typedef enum
   {
     CARD_PRODUCT_UNKNOWN,
     CARD_PRODUCT_RSCS,     /* Rohde&Schwarz Cybersecurity       */
     CARD_PRODUCT_DTRUST,   /* D-Trust GmbH (bundesdruckerei.de) */
     CARD_PRODUCT_GENUA     /* GeNUA mbH                         */
   }
 card_product_t;
 
 
 /* A list card types with ATRs noticed with these cards. */
 #define X(a) ((unsigned char const *)(a))
 static struct
 {
   size_t atrlen;
   unsigned char const *atr;
   card_type_t type;
 } card_atr_list[] = {
   { 19, X("\x3B\xBA\x13\x00\x81\x31\x86\x5D\x00\x64\x05\x0A\x02\x01\x31\x80"
           "\x90\x00\x8B"),
     CARD_TYPE_TCOS },  /* SLE44 */
   { 19, X("\x3B\xBA\x14\x00\x81\x31\x86\x5D\x00\x64\x05\x14\x02\x02\x31\x80"
           "\x90\x00\x91"),
     CARD_TYPE_TCOS }, /* SLE66S */
   { 19, X("\x3B\xBA\x96\x00\x81\x31\x86\x5D\x00\x64\x05\x60\x02\x03\x31\x80"
           "\x90\x00\x66"),
     CARD_TYPE_TCOS }, /* SLE66P */
   { 27, X("\x3B\xFF\x94\x00\xFF\x80\xB1\xFE\x45\x1F\x03\x00\x68\xD2\x76\x00"
           "\x00\x28\xFF\x05\x1E\x31\x80\x00\x90\x00\x23"),
     CARD_TYPE_MICARDO }, /* German BMI card */
   { 19, X("\x3B\x6F\x00\xFF\x00\x68\xD2\x76\x00\x00\x28\xFF\x05\x1E\x31\x80"
           "\x00\x90\x00"),
     CARD_TYPE_MICARDO }, /* German BMI card (ATR due to reader problem) */
   { 26, X("\x3B\xFE\x94\x00\xFF\x80\xB1\xFA\x45\x1F\x03\x45\x73\x74\x45\x49"
           "\x44\x20\x76\x65\x72\x20\x31\x2E\x30\x43"),
     CARD_TYPE_MICARDO }, /* EstEID (Estonian Big Brother card) */
   { 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x01\x14"),
     CARD_TYPE_CARDOS_50 }, /* CardOS 5.0 */
   { 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x03\x16"),
     CARD_TYPE_CARDOS_53 }, /* CardOS 5.3 */
   { 24, X("\x3b\xfe\x18\x00\x00\x80\x31\xfe\x45\x53\x43\x45"
           "\x36\x30\x2d\x43\x44\x30\x38\x31\x2d\x6e\x46\xa9"),
     CARD_TYPE_AET },
   { 0 }
 };
 #undef X
 
 
 /* Macro to test for CardOS 5.0 and 5.3.  */
 #define IS_CARDOS_5(a) ((a)->app_local->card_type == CARD_TYPE_CARDOS_50 \
                         || (a)->app_local->card_type == CARD_TYPE_CARDOS_53)
 
 /* The default PKCS-15 home DF */
 #define DEFAULT_HOME_DF 0x5015
 
 /* The AID of PKCS15. */
 static char const pkcs15_aid[] = { 0xA0, 0, 0, 0, 0x63,
                                    0x50, 0x4B, 0x43, 0x53, 0x2D, 0x31, 0x35 };
 
 /* The Belgian eID variant - they didn't understood why a shared AID
    is useful for a standard.  Oh well. */
 static char const pkcs15be_aid[] = { 0xA0, 0, 0, 0x01, 0x77,
                                    0x50, 0x4B, 0x43, 0x53, 0x2D, 0x31, 0x35 };
 
 
 /* The PIN types as defined in pkcs#15 v1.1 */
 typedef enum
   {
     PIN_TYPE_BCD = 0,
     PIN_TYPE_ASCII_NUMERIC = 1,
     PIN_TYPE_UTF8 = 2,
     PIN_TYPE_HALF_NIBBLE_BCD = 3,
     PIN_TYPE_ISO9564_1 = 4
   } pin_type_t;
 
 /* The AuthenticationTypes as defined in pkcs#15 v1.1 (6.8.1) */
 typedef enum
   {
     AUTH_TYPE_PIN = -1,
     AUTH_TYPE_BIOMETRIC = 0,
     AUTH_TYPE_AUTHKEY = 1,
     AUTH_TYPE_EXTERNAL = 2,
   } auth_type_t;
 
 /* A bit array with for the key usage flags from the
    commonKeyAttributes. */
 struct keyusage_flags_s
 {
     unsigned int encrypt: 1;
     unsigned int decrypt: 1;
     unsigned int sign: 1;
     unsigned int sign_recover: 1;
     unsigned int wrap: 1;
     unsigned int unwrap: 1;
     unsigned int verify: 1;
     unsigned int verify_recover: 1;
     unsigned int derive: 1;
     unsigned int non_repudiation: 1;
 };
 typedef struct keyusage_flags_s keyusage_flags_t;
 
 
 /* A bit array with for the key access flags from the
    commonKeyAttributes. */
 struct keyaccess_flags_s
 {
   unsigned int any:1;    /* Any access flag set.  */
   unsigned int sensitive:1;
   unsigned int extractable:1;
   unsigned int always_sensitive:1;
   unsigned int never_extractable:1;
   unsigned int local:1;
 };
 typedef struct keyaccess_flags_s keyaccess_flags_t;
 
 
 /* A bit array with for the gpg usage flags.  */
 struct gpgusage_flags_s
 {
   unsigned int any:1;    /* Any of the next flags are set.  */
   unsigned int cert:1;   /* 1.3.6.1.4.1.11591.2.6.1 */
   unsigned int sign:1;   /* 1.3.6.1.4.1.11591.2.6.2 */
   unsigned int encr:1;   /* 1.3.6.1.4.1.11591.2.6.3 */
   unsigned int auth:1;   /* 1.3.6.1.4.1.11591.2.6.4 */
 };
 typedef struct gpgusage_flags_s gpgusage_flags_t;
 
 
 /* This is an object to store information about a Certificate
    Directory File (CDF) in a format suitable for further processing by
    us. To keep memory management, simple we use a linked list of
    items; i.e. one such object represents one certificate and the list
    the entire CDF. */
 struct cdf_object_s
 {
   /* Link to next item when used in a linked list. */
   struct cdf_object_s *next;
 
   /* Flags to indicate whether fields are valid.  */
   unsigned int have_off:1;
 
   /* Length and allocated buffer with the Id of this object.
    * This field is used for X.509 in PKCS#11 to make it easier to
    * match a private key with a certificate.  */
   size_t objidlen;
   unsigned char *objid;
 
   /* Length and allocated buffer with the authId of this object or
      NULL if no authID is known. */
   size_t authidlen;
   unsigned char *authid;
 
   /* NULL or the malloced label of this object.  */
   char *label;
 
   /* To avoid reading and parsing a certificate more than once, we
    * cache the ksba object.  */
   ksba_cert_t cert;
 
   /* The offset and length of the object.  They are only valid if
      HAVE_OFF is true and set to 0 if HAVE_OFF is false. */
   unsigned long off, len;
 
   /* The length of the path as given in the CDF and the path itself.
      path[0] is the top DF (usually 0x3f00). The path will never be
      empty. */
   size_t pathlen;
   unsigned short path[1];
 };
 typedef struct cdf_object_s *cdf_object_t;
 
 
 /* This is an object to store information about a Private Key
    Directory File (PrKDF) in a format suitable for further processing
    by us. To keep memory management, simple we use a linked list of
    items; i.e. one such object represents one certificate and the list
    the entire PrKDF. */
 struct prkdf_object_s
 {
   /* Link to next item when used in a linked list. */
   struct prkdf_object_s *next;
 
   /* Flags to indicate whether fields are valid.  */
   unsigned int keygrip_valid:1;
   unsigned int key_reference_valid:1;
   unsigned int have_off:1;
   unsigned int have_keytime:1;
 
   /* Flag indicating that the corresponding PIN has already been
    * verified.  Note that for cards which are able to return the
    * verification stus, this flag is not used.  */
   unsigned int pin_verified:1;
 
   /* PKCS#15 info whether this is an EC key.  Default is RSA.  Note
    * that there is also a KEYALGO field which is derived from the
    * publick key via Libgcrypt.  */
   unsigned int is_ecc:1;
 
   /* The key's usage flags. */
   keyusage_flags_t usageflags;
 
   /* The key's access flags. */
   keyaccess_flags_t accessflags;
 
   /* Extended key usage flags.  Only used if .valid is set.  This
    * information is computed from an associated certificate15.  */
   struct {
     unsigned int valid:1;
     unsigned int sign:1;
     unsigned int encr:1;
     unsigned int auth:1;
   } extusage;
 
   /* OpenPGP key features for this key.  This is taken from special
    * extended key usage flags different from those tracked in EXTUSAGE
    * above.  There is also no valid flag as in EXTUSAGE.  */
   gpgusage_flags_t gpgusage;
 
   /* The keygrip of the key.  This is used as a cache.  */
   char keygrip[2*KEYGRIP_LEN+1];
 
   /* A malloced algorithm string or NULL if not known.  */
   char *keyalgostr;
 
   /* The Gcrypt algo identifier for the key.  It is valid if the
    * keygrip is also valid.  See also is_ecc above.  */
   int keyalgo;
 
   /* The length of the key in bits (e.g. for RSA the length of the
    * modulus).  It is valid if the keygrip is also valid.  */
   unsigned int keynbits;
 
   /* The creation time of the key or 0 if not known.  */
   u32 keytime;
 
   /* Malloced CN from the Subject-DN of the corresponding certificate
    * or NULL if not known.  */
   char *common_name;
 
   /* Malloced SerialNumber from the Subject-DN of the corresponding
    * certificate or NULL if not known.  */
   char *serial_number;
 
   /* KDF/KEK parameter for OpenPGP's ECDH.  First byte is zero if not
    * availabale. .*/
   unsigned char ecdh_kdf[4];
 
   /* Length and allocated buffer with the Id of this object. */
   size_t objidlen;
   unsigned char *objid;
 
   /* Length and allocated buffer with the authId of this object or
      NULL if no authID is known. */
   size_t authidlen;
   unsigned char *authid;
 
   /* NULL or the malloced label of this object.  */
   char *label;
 
   /* The keyReference and a flag telling whether it is valid. */
   unsigned long key_reference;
 
   /* The offset and length of the object.  They are only valid if
    * HAVE_OFF is true otherwise they are set to 0. */
   unsigned long off, len;
 
   /* The length of the path as given in the PrKDF and the path itself.
      path[0] is the top DF (usually 0x3f00). */
   size_t pathlen;
   unsigned short path[1];
 };
 typedef struct prkdf_object_s *prkdf_object_t;
 typedef struct prkdf_object_s *pukdf_object_t;
 
 
 /* This is an object to store information about a Authentication
    Object Directory File (AODF) in a format suitable for further
    processing by us. To keep memory management, simple we use a linked
    list of items; i.e. one such object represents one authentication
    object and the list the entire AOKDF. */
 struct aodf_object_s
 {
   /* Link to next item when used in a linked list. */
   struct aodf_object_s *next;
 
   /* Flags to indicate whether fields are valid.  */
   unsigned int have_off:1;
 
   /* Length and allocated buffer with the Id of this object. */
   size_t objidlen;
   unsigned char *objid;
 
   /* Length and allocated buffer with the authId of this object or
      NULL if no authID is known. */
   size_t authidlen;
   unsigned char *authid;
 
   /* NULL or the malloced label of this object.  */
   char *label;
 
   /* The file ID of this AODF.  */
   unsigned short fid;
 
   /* The type of this authentication object.  */
   auth_type_t auth_type;
 
   /* Info used for AUTH_TYPE_PIN: */
 
   /* The PIN Flags. */
   struct
   {
     unsigned int case_sensitive: 1;
     unsigned int local: 1;
     unsigned int change_disabled: 1;
     unsigned int unblock_disabled: 1;
     unsigned int initialized: 1;
     unsigned int needs_padding: 1;
     unsigned int unblocking_pin: 1;
     unsigned int so_pin: 1;
     unsigned int disable_allowed: 1;
     unsigned int integrity_protected: 1;
     unsigned int confidentiality_protected: 1;
     unsigned int exchange_ref_data: 1;
   } pinflags;
 
   /* The PIN Type. */
   pin_type_t pintype;
 
   /* The minimum length of a PIN. */
   unsigned long min_length;
 
   /* The stored length of a PIN. */
   unsigned long stored_length;
 
   /* The maximum length of a PIN and a flag telling whether it is valid. */
   unsigned long max_length;
   int max_length_valid;
 
   /* The pinReference and a flag telling whether it is valid. */
   unsigned long pin_reference;
   int pin_reference_valid;
 
   /* The padChar and a flag telling whether it is valid. */
   char pad_char;
   int pad_char_valid;
 
   /* The offset and length of the object.  They are only valid if
      HAVE_OFF is true and set to 0 if HAVE_OFF is false. */
   unsigned long off, len;
 
   /* The length of the path as given in the Aodf and the path itself.
      path[0] is the top DF (usually 0x3f00). PATH is optional and thus
      may be NULL.  Malloced.*/
   size_t pathlen;
   unsigned short *path;
 
   /* Info used for AUTH_TYPE_AUTHKEY: */
 
 };
 typedef struct aodf_object_s *aodf_object_t;
 
 
 /* Context local to this application. */
 struct app_local_s
 {
   /* The home DF. Note, that we don't yet support a multilevel
      hierarchy.  Thus we assume this is directly below the MF.  */
   unsigned short home_df;
 
   /* The type of the card's OS. */
   card_type_t card_type;
 
   /* The vendor's product.  */
   card_product_t card_product;
 
   /* Flag indicating that extended_mode is not supported.  */
   unsigned int no_extended_mode : 1;
 
   /* Flag indicating whether we may use direct path selection. */
   unsigned int direct_path_selection : 1;
 
   /* Flag indicating whether the card has any key with a gpgusage set.  */
   unsigned int any_gpgusage : 1;
 
   /* Structure with the EFIDs of the objects described in the ODF
      file. */
   struct
   {
     unsigned short private_keys;
     unsigned short public_keys;
     unsigned short trusted_public_keys;
     unsigned short secret_keys;
     unsigned short certificates;
     unsigned short trusted_certificates;
     unsigned short useful_certificates;
     unsigned short data_objects;
     unsigned short auth_objects;
   } odf;
 
   /* The PKCS#15 serialnumber from EF(TokenInfo) or NULL.  Malloced. */
   unsigned char *serialno;
   size_t serialnolen;
 
   /* The manufacturerID from the TokenInfo EF.  Malloced or NULL. */
   char *manufacturer_id;
 
   /* The label from the TokenInfo EF.  Malloced or NULL.  */
   char *token_label;
 
   /* The tokenflags from the TokenInfo EF.  Malloced or NULL.  */
   unsigned char *tokenflags;
   unsigned int tokenflagslen;
 
   /* Information on all certificates. */
   cdf_object_t certificate_info;
   /* Information on all trusted certificates. */
   cdf_object_t trusted_certificate_info;
   /* Information on all useful certificates. */
   cdf_object_t useful_certificate_info;
 
   /* Information on all public keys. */
   prkdf_object_t public_key_info;
 
   /* Information on all private keys. */
   pukdf_object_t private_key_info;
 
   /* Information on all authentication objects. */
   aodf_object_t auth_object_info;
 
 };
 
 
 /*** Local prototypes.  ***/
 static gpg_error_t select_ef_by_path (app_t app, const unsigned short *path,
                                       size_t pathlen);
 static gpg_error_t keygrip_from_prkdf (app_t app, prkdf_object_t prkdf);
 static gpg_error_t readcert_by_cdf (app_t app, cdf_object_t cdf,
                                     unsigned char **r_cert, size_t *r_certlen);
 static char *get_dispserialno (app_t app, prkdf_object_t prkdf);
 static gpg_error_t do_getattr (app_t app, ctrl_t ctrl, const char *name);
 
 
 
 static const char *
 cardtype2str (card_type_t cardtype)
 {
   switch (cardtype)
     {
     case CARD_TYPE_UNKNOWN:   return "";
     case CARD_TYPE_TCOS:      return "TCOS";
     case CARD_TYPE_MICARDO:   return "Micardo";
     case CARD_TYPE_CARDOS_50: return "CardOS 5.0";
     case CARD_TYPE_CARDOS_53: return "CardOS 5.3";
     case CARD_TYPE_BELPIC:    return "Belgian eID";
     case CARD_TYPE_AET:       return "AET";
     }
   return "";
 }
 
 static const char *
 cardproduct2str (card_product_t cardproduct)
 {
   switch (cardproduct)
     {
     case CARD_PRODUCT_UNKNOWN: return "";
     case CARD_PRODUCT_RSCS:    return "R&S";
     case CARD_PRODUCT_DTRUST:  return "D-Trust";
     case CARD_PRODUCT_GENUA:   return "GeNUA";
     }
   return "";
 }
 
 /* Release the CDF object A  */
 static void
 release_cdflist (cdf_object_t a)
 {
   while (a)
     {
       cdf_object_t tmp = a->next;
       ksba_free (a->cert);
       xfree (a->objid);
       xfree (a->authid);
       xfree (a->label);
       xfree (a);
       a = tmp;
     }
 }
 
 /* Release the PrKDF object A.  */
 static void
 release_prkdflist (prkdf_object_t a)
 {
   while (a)
     {
       prkdf_object_t tmp = a->next;
       xfree (a->keyalgostr);
       xfree (a->common_name);
       xfree (a->serial_number);
       xfree (a->objid);
       xfree (a->authid);
       xfree (a->label);
       xfree (a);
       a = tmp;
     }
 }
 
 static void
 release_pukdflist (pukdf_object_t a)
 {
   release_prkdflist (a);
 }
 
 /* Release just one aodf object. */
 void
 release_aodf_object (aodf_object_t a)
 {
   if (a)
     {
       xfree (a->objid);
       xfree (a->authid);
       xfree (a->label);
       xfree (a->path);
       xfree (a);
     }
 }
 
 /* Release the AODF list A.  */
 static void
 release_aodflist (aodf_object_t a)
 {
   while (a)
     {
       aodf_object_t tmp = a->next;
       release_aodf_object (a);
       a = tmp;
     }
 }
 
 
 static void
 release_lists (app_t app)
 {
   release_cdflist (app->app_local->certificate_info);
   app->app_local->certificate_info = NULL;
   release_cdflist (app->app_local->trusted_certificate_info);
   app->app_local->trusted_certificate_info = NULL;
   release_cdflist (app->app_local->useful_certificate_info);
   app->app_local->useful_certificate_info = NULL;
   release_pukdflist (app->app_local->public_key_info);
   app->app_local->public_key_info = NULL;
   release_prkdflist (app->app_local->private_key_info);
   app->app_local->private_key_info = NULL;
   release_aodflist (app->app_local->auth_object_info);
   app->app_local->auth_object_info = NULL;
 }
 
 
 static void
 release_tokeninfo (app_t app)
 {
   xfree (app->app_local->manufacturer_id);
   app->app_local->manufacturer_id = NULL;
   xfree (app->app_local->token_label);
   app->app_local->token_label = NULL;
   xfree (app->app_local->tokenflags);
   app->app_local->tokenflags = NULL;
   xfree (app->app_local->serialno);
   app->app_local->serialno = NULL;
 }
 
 
 /* Release all local resources.  */
 static void
 do_deinit (app_t app)
 {
   if (app && app->app_local)
     {
       release_lists (app);
       release_tokeninfo (app);
       xfree (app->app_local);
       app->app_local = NULL;
     }
 }
 
 
 /* Do a select and a read for the file with EFID.  EFID_DESC is a
    desctription of the EF to be used with error messages.  On success
    BUFFER and BUFLEN contain the entire content of the EF.  The caller
    must free BUFFER only on success.  If EFID is 0 no seelct is done. */
 static gpg_error_t
 select_and_read_binary (app_t app, unsigned short efid, const char *efid_desc,
                         unsigned char **buffer, size_t *buflen)
 {
   gpg_error_t err;
   int sw;
 
   if (efid)
     {
       err = select_ef_by_path (app, &efid, 1);
       if (err)
         {
           log_error ("p15: error selecting %s (0x%04X): %s\n",
                      efid_desc, efid, gpg_strerror (err));
           return err;
         }
     }
 
   err = iso7816_read_binary_ext (app_get_slot (app),
                                  0, 0, 0, buffer, buflen, &sw);
   if (err)
     log_error ("p15: error reading %s (0x%04X): %s (sw=%04X)\n",
                efid_desc, efid, gpg_strerror (err), sw);
   return err;
 }
 
 
 /* If EFID is not 0 do a select and then read the record RECNO.
  * EFID_DESC is a description of the EF to be used with error
  * messages.  On success BUFFER and BUFLEN contain the entire content
  * of the EF.  The caller must free BUFFER only on success. */
 static gpg_error_t
 select_and_read_record (app_t app, unsigned short efid, int recno,
                         const char *efid_desc,
                         unsigned char **buffer, size_t *buflen, int *r_sw)
 {
   gpg_error_t err;
   int sw;
 
   if (r_sw)
     *r_sw = 0x9000;
 
   if (efid)
     {
       err = select_ef_by_path (app, &efid, 1);
       if (err)
         {
           log_error ("p15: error selecting %s (0x%04X): %s\n",
                      efid_desc, efid, gpg_strerror (err));
           if (r_sw)
             *r_sw = sw;
           return err;
         }
     }
 
   err = iso7816_read_record_ext (app_get_slot (app),
                                  recno, 1, 0, buffer, buflen, &sw);
   if (err)
     {
       if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
           ;
       else if (err && sw == SW_FILE_STRUCT)
         ;
       else
         log_error ("p15: error reading %s (0x%04X) record %d: %s (sw=%04X)\n",
                    efid_desc, efid, recno, gpg_strerror (err), sw);
       if (r_sw)
         *r_sw = sw;
       return err;
     }
   /* On CardOS with a Linear TLV file structure the records starts
    * with some tag (often the record number) followed by the length
    * byte for this record.  Detect and remove this prefix.  */
   if (*buflen > 2 && (*buffer)[0] != 0x30 && (*buffer)[1] == *buflen - 2)
     {
       memmove (*buffer, *buffer + 2, *buflen - 2);
       *buflen = *buflen - 2;
     }
 
   return 0;
 }
 
 
 /* This function calls select file to read a file using a complete
    path which may or may not start at the master file (MF). */
 static gpg_error_t
 select_ef_by_path (app_t app, const unsigned short *path, size_t pathlen)
 {
   gpg_error_t err;
   int i, j;
 
   if (!pathlen)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   /* log_debug ("%s: path=", __func__); */
   /* for (j=0; j < pathlen; j++) */
   /*   log_printf ("%s%04hX", j? "/":"", path[j]); */
   /* log_printf ("%s\n",app->app_local->direct_path_selection?" (direct)":"");*/
 
   if (app->app_local->direct_path_selection)
     {
       if (pathlen && *path == 0x3f00 )
         {
           if (pathlen == 1)
             err = iso7816_select_mf (app_get_slot (app));
           else
             err = iso7816_select_path (app_get_slot (app), path+1, pathlen-1,
                                        0);
         }
       else
         err = iso7816_select_path (app_get_slot (app), path, pathlen,
                                    app->app_local->home_df);
       if (err)
         {
           log_error ("p15: error selecting path ");
           goto err_print_path;
         }
     }
   else if (pathlen > 1 && path[0] == 0x3fff)
     {
       err = iso7816_select_file (app_get_slot (app), 0x3f00, 0);
       if (err)
         {
           log_error ("p15: error selecting part %d from path ", 0);
           goto err_print_path;
         }
       path++;
       pathlen--;
       for (i=0; i < pathlen; i++)
         {
           err = iso7816_select_file (app_get_slot (app),
                                      path[i], (i+1 == pathlen)? 2 : 1);
           if (err)
             {
               log_error ("p15: error selecting part %d from path ", i);
               goto err_print_path;
             }
         }
     }
   else
     {
       if (pathlen && *path != 0x3f00 )
         log_error ("p15: warning: relative path select not yet implemented\n");
 
       /* FIXME: Use home_df.  */
       for (i=0; i < pathlen; i++)
         {
           err = iso7816_select_file (app_get_slot (app),
                                      path[i], !(i+1 == pathlen));
           if (err)
             {
               log_error ("p15: error selecting part %d from path ", i);
               goto err_print_path;
             }
         }
     }
   return 0;
 
  err_print_path:
   if (pathlen && *path != 0x3f00 )
     log_printf ("3F00/");
   else
     log_printf ("%04hX/", app->app_local->home_df);
   for (j=0; j < pathlen; j++)
     log_printf ("%s%04hX", j? "/":"", path[j]);
   log_printf (": %s\n", gpg_strerror (err));
   return err;
 }
 
 
 /* Parse a cert Id string (or a key Id string) and return the binary
    object Id string in a newly allocated buffer stored at R_OBJID and
    R_OBJIDLEN.  On Error NULL will be stored there and an error code
    returned. On success caller needs to free the buffer at R_OBJID. */
 static gpg_error_t
 parse_certid (app_t app, const char *certid,
               unsigned char **r_objid, size_t *r_objidlen)
 {
   char tmpbuf[10];
   const char *s;
   size_t objidlen;
   unsigned char *objid;
   int i;
 
   *r_objid = NULL;
   *r_objidlen = 0;
 
   if (certid[0] != 'P' && strlen (certid) == 40)  /* This is a keygrip.  */
     {
       prkdf_object_t prkdf;
 
       for (prkdf = app->app_local->private_key_info;
            prkdf; prkdf = prkdf->next)
         if (!keygrip_from_prkdf (app, prkdf)
             && !strcmp (certid, prkdf->keygrip))
           break;
       if (!prkdf || !prkdf->objidlen || !prkdf->objid)
         return gpg_error (GPG_ERR_NOT_FOUND);
       objidlen = prkdf->objidlen;
       objid = xtrymalloc (objidlen);
       if (!objid)
         return gpg_error_from_syserror ();
       memcpy (objid, prkdf->objid, prkdf->objidlen);
     }
   else /* This is a usual keyref.  */
     {
       if (app->app_local->home_df != DEFAULT_HOME_DF)
         snprintf (tmpbuf, sizeof tmpbuf, "P15-%04X.",
                   (unsigned int)(app->app_local->home_df & 0xffff));
       else
         strcpy (tmpbuf, "P15.");
       if (strncmp (certid, tmpbuf, strlen (tmpbuf)) )
         {
           if (!strncmp (certid, "P15.", 4)
               || (!strncmp (certid, "P15-", 4)
                   && hexdigitp (certid+4)
                   && hexdigitp (certid+5)
                   && hexdigitp (certid+6)
                   && hexdigitp (certid+7)
                   && certid[8] == '.'))
             return gpg_error (GPG_ERR_NOT_FOUND);
           return gpg_error (GPG_ERR_INV_ID);
         }
       certid += strlen (tmpbuf);
       for (s=certid, objidlen=0; hexdigitp (s); s++, objidlen++)
         ;
       if (*s || !objidlen || (objidlen%2))
         return gpg_error (GPG_ERR_INV_ID);
       objidlen /= 2;
       objid = xtrymalloc (objidlen);
       if (!objid)
         return gpg_error_from_syserror ();
       for (s=certid, i=0; i < objidlen; i++, s+=2)
         objid[i] = xtoi_2 (s);
     }
 
   *r_objid = objid;
   *r_objidlen = objidlen;
   return 0;
 }
 
 
 /* Find a certificate object by its object ID and store a pointer to
  * it at R_CDF. */
 static gpg_error_t
 cdf_object_from_objid (app_t app, size_t objidlen, const unsigned char *objid,
                        cdf_object_t *r_cdf)
 {
   cdf_object_t cdf;
 
   for (cdf = app->app_local->certificate_info; cdf; cdf = cdf->next)
     if (cdf->objidlen == objidlen && !memcmp (cdf->objid, objid, objidlen))
       break;
   if (!cdf)
     for (cdf = app->app_local->trusted_certificate_info; cdf; cdf = cdf->next)
       if (cdf->objidlen == objidlen && !memcmp (cdf->objid, objid, objidlen))
         break;
   if (!cdf)
     for (cdf = app->app_local->useful_certificate_info; cdf; cdf = cdf->next)
       if (cdf->objidlen == objidlen && !memcmp (cdf->objid, objid, objidlen))
         break;
   if (!cdf)
     return gpg_error (GPG_ERR_NOT_FOUND);
   *r_cdf = cdf;
   return 0;
 }
 
 
 /* Find a certificate object by its label and store a pointer to it at
  * R_CDF. */
 static gpg_error_t
 cdf_object_from_label (app_t app, const char *label, cdf_object_t *r_cdf)
 {
   cdf_object_t cdf;
 
   if (!label)
     return gpg_error (GPG_ERR_NOT_FOUND);
 
   for (cdf = app->app_local->certificate_info; cdf; cdf = cdf->next)
     if (cdf->label && !strcmp (cdf->label, label))
       break;
   if (!cdf)
     for (cdf = app->app_local->trusted_certificate_info; cdf; cdf = cdf->next)
       if (cdf->label && !strcmp (cdf->label, label))
         break;
   if (!cdf)
     for (cdf = app->app_local->useful_certificate_info; cdf; cdf = cdf->next)
       if (cdf->label && !strcmp (cdf->label, label))
         break;
   if (!cdf)
     return gpg_error (GPG_ERR_NOT_FOUND);
   *r_cdf = cdf;
   return 0;
 }
 
 
 /* Find a certificate object by the certificate ID CERTID and store a
  * pointer to it at R_CDF. */
 static gpg_error_t
 cdf_object_from_certid (app_t app, const char *certid, cdf_object_t *r_cdf)
 {
   gpg_error_t err;
   size_t objidlen;
   unsigned char *objid;
   cdf_object_t cdf;
   prkdf_object_t prkdf;
 
   err = parse_certid (app, certid, &objid, &objidlen);
   if (err)
     return err;
 
   err = cdf_object_from_objid (app, objidlen, objid, &cdf);
   if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
     {
       /* Try again by finding the certid in the prkdf and matching by
        * label.  */
       for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
         if (prkdf->objidlen == objidlen
             && !memcmp (prkdf->objid, objid, objidlen))
           break;
       if (prkdf)
         err = cdf_object_from_label (app, prkdf->label, &cdf);
     }
   xfree (objid);
   if (err)
     return err;
   *r_cdf = cdf;
   return 0;
 }
 
 
 /* Find a private key object by the key Id string KEYIDSTR and store a
    pointer to it at R_PRKDF. */
 static gpg_error_t
 prkdf_object_from_keyidstr (app_t app, const char *keyidstr,
                             prkdf_object_t *r_prkdf)
 {
   gpg_error_t err;
   size_t objidlen;
   unsigned char *objid;
   prkdf_object_t prkdf;
 
   err = parse_certid (app, keyidstr, &objid, &objidlen);
   if (err)
     return err;
 
   for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
     if (prkdf->objidlen == objidlen && !memcmp (prkdf->objid, objid, objidlen))
       break;
   xfree (objid);
   if (!prkdf)
     return gpg_error (GPG_ERR_NOT_FOUND);
   *r_prkdf = prkdf;
   return 0;
 }
 
 
 
 
 /* Read and parse the Object Directory File and store away the
    pointers. ODF_FID shall contain the FID of the ODF.
 
    Example of such a file:
 
    A0 06 30 04 04 02 60 34  = Private Keys
    A4 06 30 04 04 02 60 35  = Certificates
    A5 06 30 04 04 02 60 36  = Trusted Certificates
    A7 06 30 04 04 02 60 37  = Data Objects
    A8 06 30 04 04 02 60 38  = Auth Objects
 
    These are all PathOrObjects using the path CHOICE element.  The
    paths are octet strings of length 2.  Using this Path CHOICE
    element is recommended, so we only implement that for now.
 */
 static gpg_error_t
 read_ef_odf (app_t app, unsigned short odf_fid)
 {
   gpg_error_t err;
   unsigned char *buffer, *p;
   size_t buflen, n;
   unsigned short value;
   size_t offset;
   unsigned short home_df = 0;
 
 
   app->app_local->odf.private_keys = 0;
   app->app_local->odf.public_keys = 0;
   app->app_local->odf.trusted_public_keys = 0;
   app->app_local->odf.secret_keys = 0;
   app->app_local->odf.certificates = 0;
   app->app_local->odf.trusted_certificates = 0;
   app->app_local->odf.useful_certificates = 0;
   app->app_local->odf.data_objects = 0;
   app->app_local->odf.auth_objects = 0;
 
   err = select_and_read_binary (app, odf_fid, "ODF",
                                 &buffer, &buflen);
   if (err)
     return err;
 
   if (buflen < 8)
     {
       log_error ("p15: error: ODF too short\n");
       xfree (buffer);
       return gpg_error (GPG_ERR_INV_OBJ);
     }
 
   home_df = app->app_local->home_df;
   p = buffer;
   while (buflen && *p && *p != 0xff)
     {
       if ( buflen >= 8
            && (p[0] & 0xf0) == 0xA0
            && !memcmp (p+1, "\x06\x30\x04\x04\x02", 5) )
         {
           offset = 6;
         }
       else if ( buflen >= 12
                 && (p[0] & 0xf0) == 0xA0
                 && !memcmp (p+1, "\x0a\x30\x08\x04\x06\x3F\x00", 7)
                 && (!home_df || home_df == ((p[8]<<8)|p[9])) )
         {
           /* FIXME: Is this hack still required?  */
           /* If we do not know the home DF, we take it from the first
            * ODF object.  Here are sample values:
            * a0 0a 30 08 0406 3f00 5015 4401
            * a1 0a 30 08 0406 3f00 5015 4411
            * a4 0a 30 08 0406 3f00 5015 4441
            * a5 0a 30 08 0406 3f00 5015 4451
            * a8 0a 30 08 0406 3f00 5015 4481
            * 00000000 */
           if (!home_df)
             {
               home_df = ((p[8]<<8)|p[9]);
               app->app_local->home_df = home_df;
               log_info ("p15: application directory detected as 0x%04hX\n",
                         home_df);
               /* We assume that direct path selection is possible.  */
               app->app_local->direct_path_selection = 1;
             }
 
           /* We only allow a full path if all files are at the same
              level and below the home directory.  To extend this we
              would need to make use of new data type capable of
              keeping a full path. */
           offset = 10;
         }
       else
         {
           log_printhex (p, buflen, "p15: ODF format not supported:");
           xfree (buffer);
           return gpg_error (GPG_ERR_INV_OBJ);
         }
       switch ((p[0] & 0x0f))
         {
         case 0: value = app->app_local->odf.private_keys; break;
         case 1: value = app->app_local->odf.public_keys; break;
         case 2: value = app->app_local->odf.trusted_public_keys; break;
         case 3: value = app->app_local->odf.secret_keys; break;
         case 4: value = app->app_local->odf.certificates; break;
         case 5: value = app->app_local->odf.trusted_certificates; break;
         case 6: value = app->app_local->odf.useful_certificates; break;
         case 7: value = app->app_local->odf.data_objects; break;
         case 8: value = app->app_local->odf.auth_objects; break;
         default: value = 0; break;
         }
       if (value)
         {
           log_error ("p15: duplicate object type %d in ODF ignored\n",
                      (p[0]&0x0f));
           continue;
         }
       value = ((p[offset] << 8) | p[offset+1]);
       switch ((p[0] & 0x0f))
         {
         case 0: app->app_local->odf.private_keys = value; break;
         case 1: app->app_local->odf.public_keys = value; break;
         case 2: app->app_local->odf.trusted_public_keys = value; break;
         case 3: app->app_local->odf.secret_keys = value; break;
         case 4: app->app_local->odf.certificates = value; break;
         case 5: app->app_local->odf.trusted_certificates = value; break;
         case 6: app->app_local->odf.useful_certificates = value; break;
         case 7: app->app_local->odf.data_objects = value; break;
         case 8: app->app_local->odf.auth_objects = value; break;
         default:
           log_error ("p15: unknown object type %d in ODF ignored\n",
                      (p[0]&0x0f));
         }
       offset += 2;
 
       if (buflen < offset)
         break;
       p += offset;
       buflen -= offset;
     }
 
   if (buflen)
     {
       /* Print a warning if non-null garbage is left over.  */
       for (n=0; n < buflen && !p[n]; n++)
         ;
       if (n < buflen)
         {
           log_info ("p15: warning: garbage detected at end of ODF: ");
           log_printhex (p, buflen, "");
         }
     }
 
   xfree (buffer);
   return 0;
 }
 
 
 /* Helper for the read_ef_foo functions to read the first record or
  * the entire data.  */
 static gpg_error_t
 read_first_record (app_t app, unsigned short fid, const char *fid_desc,
                    unsigned char **r_buffer, size_t *r_buflen,
                    int *r_use_read_record)
 {
   gpg_error_t err;
   int sw;
 
   *r_buffer = NULL;
   *r_buflen = 0;
   *r_use_read_record = 0;
 
   if (!fid)
     return gpg_error (GPG_ERR_NO_DATA); /* No such file. */
 
   if (IS_CARDOS_5 (app))
     {
       *r_use_read_record = 1;
       err = select_and_read_record (app, fid, 1, fid_desc,
                                     r_buffer, r_buflen, &sw);
       if (err && sw == SW_FILE_STRUCT)
         {
           *r_use_read_record = 0;
           err = select_and_read_binary (app, 0, fid_desc, r_buffer, r_buflen);
         }
     }
   else
     err = select_and_read_binary (app, fid, fid_desc, r_buffer, r_buflen);
 
   /* We get a not_found state in read_record mode if the select
    * succeeded but reading the record failed.  Map that to no_data
    * which is what the caller of the read_ef_foo functions expect.  */
   if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
     err = gpg_error (GPG_ERR_NO_DATA);
 
   return err;
 }
 
 
 /* Parse the BIT STRING with the keyUsageFlags from the
    CommonKeyAttributes. */
 static gpg_error_t
 parse_keyusage_flags (const unsigned char *der, size_t derlen,
                       keyusage_flags_t *usageflags)
 {
   unsigned int bits, mask;
   int i, unused, full;
 
   memset (usageflags, 0, sizeof *usageflags);
   if (!derlen)
     return gpg_error (GPG_ERR_INV_OBJ);
 
   unused = *der++; derlen--;
   if ((!derlen && unused) || unused/8 > derlen)
     return gpg_error (GPG_ERR_ENCODING_PROBLEM);
   full = derlen - (unused+7)/8;
   unused %= 8;
   mask = 0;
   for (i=1; unused; i <<= 1, unused--)
     mask |= i;
 
   /* First octet */
   if (derlen)
     {
       bits = *der++; derlen--;
       if (full)
         full--;
       else
         {
           bits &= ~mask;
           mask = 0;
         }
     }
   else
     bits = 0;
   if ((bits & 0x80)) usageflags->encrypt = 1;
   if ((bits & 0x40)) usageflags->decrypt = 1;
   if ((bits & 0x20)) usageflags->sign = 1;
   if ((bits & 0x10)) usageflags->sign_recover = 1;
   if ((bits & 0x08)) usageflags->wrap = 1;
   if ((bits & 0x04)) usageflags->unwrap = 1;
   if ((bits & 0x02)) usageflags->verify = 1;
   if ((bits & 0x01)) usageflags->verify_recover = 1;
 
   /* Second octet. */
   if (derlen)
     {
       bits = *der++; derlen--;
       if (full)
         full--;
       else
         {
           bits &= ~mask;
         }
     }
   else
     bits = 0;
   if ((bits & 0x80)) usageflags->derive = 1;
   if ((bits & 0x40)) usageflags->non_repudiation = 1;
 
   return 0;
 }
 
 
 static void
 dump_keyusage_flags (keyusage_flags_t usageflags)
 {
   const char *s = "";
 
   log_info ("p15:             usage=");
   if (usageflags.encrypt)
     log_printf ("%sencrypt", s), s = ",";
   if (usageflags.decrypt)
     log_printf ("%sdecrypt", s), s = ",";
   if (usageflags.sign   )
     log_printf ("%ssign", s), s = ",";
   if (usageflags.sign_recover)
     log_printf ("%ssign_recover", s), s = ",";
   if (usageflags.wrap   )
     log_printf ("%swrap", s), s = ",";
   if (usageflags.unwrap )
     log_printf ("%sunwrap", s), s = ",";
   if (usageflags.verify )
     log_printf ("%sverify", s), s = ",";
   if (usageflags.verify_recover)
     log_printf ("%sverify_recover", s), s = ",";
   if (usageflags.derive )
     log_printf ("%sderive", s), s = ",";
   if (usageflags.non_repudiation)
     log_printf ("%snon_repudiation", s), s = ",";
 }
 
 
 static void
 dump_keyaccess_flags (keyaccess_flags_t accessflags)
 {
   const char *s = "";
 
   log_info ("p15:             access=");
   if (accessflags.sensitive)
     log_printf ("%ssensitive", s), s = ",";
   if (accessflags.extractable)
     log_printf ("%sextractable", s), s = ",";
   if (accessflags.always_sensitive)
     log_printf ("%salways_sensitive", s), s = ",";
   if (accessflags.never_extractable)
     log_printf ("%snever_extractable", s), s = ",";
   if (accessflags.local)
     log_printf ("%slocal", s), s = ",";
 }
 
 
 static void
 dump_gpgusage_flags (gpgusage_flags_t gpgusage)
 {
   const char *s = "";
 
   log_info ("p15:             gpgusage=");
   if (gpgusage.cert)
     log_printf ("%scert", s), s = ",";
   if (gpgusage.sign)
     log_printf ("%ssign", s), s = ",";
   if (gpgusage.encr)
     log_printf ("%sencr", s), s = ",";
   if (gpgusage.auth)
     log_printf ("%sauth", s), s = ",";
 }
 
 
 /* Parse the BIT STRING with the keyAccessFlags from the
    CommonKeyAttributes. */
 static gpg_error_t
 parse_keyaccess_flags (const unsigned char *der, size_t derlen,
                        keyaccess_flags_t *accessflags)
 {
   unsigned int bits, mask;
   int i, unused, full;
 
   memset (accessflags, 0, sizeof *accessflags);
   if (!derlen)
     return gpg_error (GPG_ERR_INV_OBJ);
 
   unused = *der++; derlen--;
   if ((!derlen && unused) || unused/8 > derlen)
     return gpg_error (GPG_ERR_ENCODING_PROBLEM);
   full = derlen - (unused+7)/8;
   unused %= 8;
   mask = 0;
   for (i=1; unused; i <<= 1, unused--)
     mask |= i;
 
   /* First octet */
   if (derlen)
     {
       bits = *der++; derlen--;
       if (full)
         full--;
       else
         {
           bits &= ~mask;
           mask = 0;
         }
     }
   else
     bits = 0;
   if ((bits & 0x10)) accessflags->local = 1;
   if ((bits & 0x08)) accessflags->never_extractable = 1;
   if ((bits & 0x04)) accessflags->always_sensitive = 1;
   if ((bits & 0x02)) accessflags->extractable = 1;
   if ((bits & 0x01)) accessflags->sensitive = 1;
 
   accessflags->any = 1;
   return 0;
 }
 
 
 /* Parse the commonObjectAttributes and store a malloced authid at
  * (r_authid,r_authidlen).  (NULL,0) is stored on error or if no
  * authid is found.  IF R_LABEL is not NULL the label is stored there
  * as a malloced string (spaces are replaced by underscores).
  *
  * Example data:
  *  2 30   17:   SEQUENCE { -- commonObjectAttributes
  *  4 0C    8:     UTF8String 'SK.CH.DS'    -- label
  * 14 03    2:     BIT STRING 6 unused bits
  *           :       '01'B (bit 0)
  * 18 04    1:     OCTET STRING --authid
  *           :       07
  *           :     }
  */
 static gpg_error_t
 parse_common_obj_attr (unsigned char const **buffer, size_t *size,
                        unsigned char **r_authid, size_t *r_authidlen,
                        char **r_label)
 {
   gpg_error_t err;
   int where;
   int class, tag, constructed, ndef;
   size_t objlen, hdrlen, nnn;
   const unsigned char *ppp;
   int ignore_eof = 0;
   char *p;
 
   *r_authid = NULL;
   *r_authidlen = 0;
   if (r_label)
     *r_label = NULL;
 
   where = __LINE__;
   err = parse_ber_header (buffer, size, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > *size || tag != TAG_SEQUENCE))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   ppp = *buffer;
   nnn = objlen;
   *buffer += objlen;
   *size   -= objlen;
 
   /* Search the optional AuthId.  */
   ignore_eof = 1;
   where = __LINE__;
   err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > nnn || class != CLASS_UNIVERSAL))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   if (tag == TAG_UTF8_STRING)
     {
       if (r_label)
         {
           *r_label = xtrymalloc (objlen + 1);
           if (!*r_label)
             {
               err = gpg_error_from_syserror ();
               goto leave;
             }
           memcpy (*r_label, ppp, objlen);
           (*r_label)[objlen] = 0;
           /* We don't want spaces in the labels due to the properties
            * of CHV-LABEL.  */
           for (p = *r_label; *p; p++)
             if (ascii_isspace (*p))
               *p = '_';
         }
 
       ppp += objlen;
       nnn -= objlen;
 
       where = __LINE__;
       err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nnn || class != CLASS_UNIVERSAL))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   if (tag == TAG_BIT_STRING)
     {
       ppp += objlen; /* Skip the CommonObjectFlags.  */
       nnn -= objlen;
 
       where = __LINE__;
       err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nnn || class != CLASS_UNIVERSAL))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   if (tag == TAG_OCTET_STRING && objlen)
     {
       *r_authid = xtrymalloc (objlen);
       if (!*r_authid)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       memcpy (*r_authid, ppp, objlen);
       *r_authidlen = objlen;
     }
 
  leave:
   if (ignore_eof && gpg_err_code (err) == GPG_ERR_EOF)
     err = 0;
   else if (err)
     log_error ("p15: error parsing commonObjectAttributes at %d: %s\n",
                where, gpg_strerror (err));
 
   if (err && r_label)
     {
       xfree (*r_label);
       *r_label = NULL;
     }
 
   return err;
 }
 
 
 /* Parse the commonKeyAttributes.  On success store the objid at
  * (R_OBJID/R_OBJIDLEN), sets the key usage flags at USAGEFLAGS and
  * the optiona key refrence at R_KEY_REFERENCE.  The latter is only
  * valid if true is also stored at R_KEY_REFERENCE_VALID.
  *
  * Example data:
  *
  * 21 30   12:   SEQUENCE { -- commonKeyAttributes
  * 23 04    1:     OCTET STRING
  *           :       01
  * 26 03    3:     BIT STRING 6 unused bits
  *           :       '1000000000'B (bit 9)
  * 31 02    2:     INTEGER 80  -- keyReference (optional)
  *           :     }
  */
 static gpg_error_t
 parse_common_key_attr (unsigned char const **buffer, size_t *size,
                        unsigned char **r_objid, size_t *r_objidlen,
                        keyusage_flags_t *usageflags,
                        keyaccess_flags_t *accessflags,
                        unsigned long *r_key_reference,
                        int *r_key_reference_valid)
 {
   gpg_error_t err;
   int where;
   int class, tag, constructed, ndef;
   size_t objlen, hdrlen, nnn;
   const unsigned char *ppp;
   int ignore_eof = 0;
   unsigned long ul;
   const unsigned char *objid = NULL;
   size_t objidlen;
   unsigned long key_reference = 0;
   int key_reference_valid = 0;
 
   *r_objid = NULL;
   *r_objidlen = 0;
   memset (usageflags, 0, sizeof *usageflags);
   memset (accessflags, 0, sizeof *accessflags);
   *r_key_reference_valid = 0;
 
   where = __LINE__;
   err = parse_ber_header (buffer, size, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > *size || tag != TAG_SEQUENCE))
         err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   ppp = *buffer;
   nnn = objlen;
   *buffer += objlen;
   *size   -= objlen;
 
   /* Get the Id. */
   where = __LINE__;
   err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > nnn
                || class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   objid = ppp;
   objidlen = objlen;
   ppp += objlen;
   nnn -= objlen;
 
   /* Get the KeyUsageFlags. */
   where = __LINE__;
   err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > nnn
                || class != CLASS_UNIVERSAL || tag != TAG_BIT_STRING))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   err = parse_keyusage_flags (ppp, objlen, usageflags);
   if (err)
     goto leave;
   ppp += objlen;
   nnn -= objlen;
 
   ignore_eof = 1; /* Remaining items are optional.  */
 
   /* Find the keyReference */
   where = __LINE__;
   err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && objlen > nnn)
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   if (class == CLASS_UNIVERSAL && tag == TAG_BOOLEAN)
     {
       /* Skip the native element. */
       ppp += objlen;
       nnn -= objlen;
 
       err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nnn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   if (class == CLASS_UNIVERSAL && tag == TAG_BIT_STRING)
     {
       /* These are the keyAccessFlags. */
       err = parse_keyaccess_flags (ppp, objlen, accessflags);
       if (err)
         goto leave;
       ppp += objlen;
       nnn -= objlen;
 
       err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nnn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER)
     {
       /* This is the keyReference.  */
       for (ul=0; objlen; objlen--)
         {
           ul <<= 8;
           ul |= (*ppp++) & 0xff;
           nnn--;
         }
       key_reference = ul;
       key_reference_valid = 1;
     }
 
  leave:
   if (ignore_eof && gpg_err_code (err) == GPG_ERR_EOF)
     err = 0;
 
   if (!err)
     {
       if (!objid || !objidlen)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else
         {
           *r_objid = xtrymalloc (objidlen);
           if (!*r_objid)
             err = gpg_error_from_syserror ();
           else
             {
               memcpy (*r_objid, objid, objidlen);
               *r_objidlen = objidlen;
             }
         }
     }
   if (!err && key_reference_valid)
     {
       *r_key_reference = key_reference;
       *r_key_reference_valid = 1;
     }
 
   if (err)
     log_error ("p15: error parsing commonKeyAttributes at %d: %s\n",
                where, gpg_strerror (err));
   return err;
 
 }
 
 
 /* Read and  parse the Private Key Directory Files.
  *
  * Sample object:
  *  SEQUENCE {
  *    SEQUENCE { -- commonObjectAttributes
  *      UTF8String 'SK.CH.DS'
  *      BIT STRING 6 unused bits
  *        '01'B (bit 0) -- flags: non-modifiable,private
  *      OCTET STRING --authid
  *        07
  *      }
  *    SEQUENCE { -- commonKeyAttributes
  *      OCTET STRING
  *        01
  *      BIT STRING 6 unused bits
  *        '1000000000'B (bit 9) -- keyusage: non-repudiation
  *      INTEGER 80  -- keyReference (optional)
  *      }
  *    [1] {  -- keyAttributes
  *      SEQUENCE { -- privateRSAKeyAttributes
  *        SEQUENCE { -- objectValue
  *          OCTET STRING --path
  *            3F 00 40 16 00 50
  *          }
  *        INTEGER 1024 -- modulus
  *        }
  *      }
  *    }
  *
  * Sample part for EC objects:
  *    [1] {  -- keyAttributes
  *      [1] { -- privateECkeyAttributes
  *        SEQUENCE { -- objectValue
  *          SEQUENCE { --path
  *            OCTET STRING 50 72 4B 03
  *          }
  *        INTEGER 33  -- Not in PKCS#15v1.1, need to buy 7816-15?
  *        }
  *      }
  */
 static gpg_error_t
 read_ef_prkdf (app_t app, unsigned short fid, prkdf_object_t *result)
 {
   gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   const unsigned char *p;
   size_t n, objlen, hdrlen;
   int class, tag, constructed, ndef;
   prkdf_object_t prkdflist = NULL;
   int i;
   int recno = 1;
   unsigned char *authid = NULL;
   size_t authidlen = 0;
   unsigned char *objid = NULL;
   size_t objidlen = 0;
   char *label = NULL;
   int record_mode;
 
   err = read_first_record (app, fid, "PrKDF", &buffer, &buflen, &record_mode);
   if (err)
     return err;
 
   p = buffer;
   n = buflen;
 
   /* Loop over the records.  We stop as soon as we detect a new record
      starting with 0x00 or 0xff as these values are commonly used to
      pad data blocks and are no valid ASN.1 encoding.  Note the
      special handling for record mode at the end of the loop. */
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
       size_t nn;
       int where;
       const char *errstr = NULL;
       prkdf_object_t prkdf = NULL;
       unsigned long ul;
       keyusage_flags_t usageflags;
       keyaccess_flags_t accessflags;
       unsigned long key_reference = 0;
       int key_reference_valid = 0;
       int is_ecc = 0;
 
       where = __LINE__;
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (objlen > n)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         ; /* PrivateRSAKeyAttributes  */
       else if (class == CLASS_CONTEXT)
         {
           switch (tag)
             {
             case 0: is_ecc = 1; break; /* PrivateECKeyAttributes  */
             case 1: errstr = "DH key objects are not supported"; break;
             case 2: errstr = "DSA key objects are not supported"; break;
             case 3: errstr = "KEA key objects are not supported"; break;
             default: errstr = "unknown privateKeyObject"; break;
             }
           if (errstr)
             goto parse_error;
         }
       else
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto parse_error;
         }
 
       if (err)
         {
           log_error ("p15: error parsing PrKDF record: %s\n",
                      gpg_strerror (err));
           goto leave;
         }
 
       pp = p;
       nn = objlen;
       p += objlen;
       n -= objlen;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
       xfree (authid);
       xfree (label);
       err = parse_common_obj_attr (&pp, &nn, &authid, &authidlen, &label);
       if (err)
         goto parse_error;
 
       /* Parse the commonKeyAttributes.  */
       where = __LINE__;
       xfree (objid);
       err = parse_common_key_attr (&pp, &nn,
                                    &objid, &objidlen,
                                    &usageflags, &accessflags,
                                    &key_reference, &key_reference_valid);
       if (err)
         goto parse_error;
       log_assert (objid);
 
       /* Skip commonPrivateKeyAttributes.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       if (class == CLASS_CONTEXT && tag == 0)
         {
           pp += objlen;
           nn -= objlen;
 
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
         }
       /* Parse the keyAttributes.  */
       if (!err && (objlen > nn || class != CLASS_CONTEXT || tag != 1))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       nn = objlen;
 
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         ; /* A typeAttribute always starts with a sequence.  */
       else
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       nn = objlen;
 
       /* Check that the reference is a Path object.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       if (class != CLASS_UNIVERSAL || tag != TAG_SEQUENCE)
         {
           errstr = "unsupported reference type";
           goto parse_error;
         }
       nn = objlen;
 
       /* Parse the Path object. */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       /* Make sure that the next element is a non zero path and of
          even length (FID are two bytes each). */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
           ||  !objlen || (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
         }
 
       /* Create a new PrKDF list item. */
       prkdf = xtrycalloc (1, (sizeof *prkdf
                               - sizeof(unsigned short)
                               + objlen/2 * sizeof(unsigned short)));
       if (!prkdf)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       prkdf->is_ecc = is_ecc;
 
       prkdf->objidlen = objidlen;
       prkdf->objid = objid;
       objid = NULL;
       if (authid)
         {
           prkdf->authidlen = authidlen;
           prkdf->authid = authid;
           authid = NULL;
         }
       if (label)
         {
           prkdf->label = label;
           label = NULL;
         }
 
       prkdf->pathlen = objlen/2;
       for (i=0; i < prkdf->pathlen; i++, pp += 2, nn -= 2)
         prkdf->path[i] = ((pp[0] << 8) | pp[1]);
 
       prkdf->usageflags = usageflags;
       prkdf->accessflags = accessflags;
       prkdf->key_reference = key_reference;
       prkdf->key_reference_valid = key_reference_valid;
 
       if (nn)
         {
           /* An index and length follows. */
           prkdf->have_off = 1;
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           prkdf->off = ul;
 
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_CONTEXT || tag != 0))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           prkdf->len = ul;
         }
 
       /* The info is printed later in read_p15_info because we also
        * want to look at the certificates.  */
 
       /* Put it into the list. */
       prkdf->next = prkdflist;
       prkdflist = prkdf;
       prkdf = NULL;
       goto next_record; /* Ready with this record. */
 
     parse_error:
       log_error ("p15: error parsing PrKDF record at %d: %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       if (prkdf)
         {
           xfree (prkdf->objid);
           xfree (prkdf->authid);
           xfree (prkdf->label);
           xfree (prkdf);
         }
       err = 0;
 
     next_record:
       /* If the card uses a record oriented file structure, read the
        * next record.  Otherwise we keep on parsing the current buffer.  */
       recno++;
       if (record_mode)
         {
           xfree (buffer); buffer = NULL;
           err = select_and_read_record (app, 0, recno, "PrKDF",
                                         &buffer, &buflen, NULL);
           if (err) {
             if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
               err = 0;
             goto leave;
           }
           p = buffer;
           n = buflen;
         }
     } /* End looping over all records. */
 
  leave:
   xfree (authid);
   xfree (label);
   xfree (objid);
   xfree (buffer);
   if (err)
     release_prkdflist (prkdflist);
   else
     *result = prkdflist;
   return err;
 }
 
 
 /* Read and parse the Public Keys Directory File. */
 static gpg_error_t
 read_ef_pukdf (app_t app, unsigned short fid, pukdf_object_t *result)
 {
   gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   const unsigned char *p;
   size_t n, objlen, hdrlen;
   int class, tag, constructed, ndef;
   pukdf_object_t pukdflist = NULL;
   int i;
   int recno = 1;
   unsigned char *authid = NULL;
   size_t authidlen = 0;
   unsigned char *objid = NULL;
   size_t objidlen = 0;
   char *label = NULL;
   int record_mode;
 
   err = read_first_record (app, fid, "PuKDF", &buffer, &buflen, &record_mode);
   if (err)
     return err;
 
   p = buffer;
   n = buflen;
 
   /* Loop over the records.  We stop as soon as we detect a new record
    * starting with 0x00 or 0xff as these values are commonly used to
    * pad data blocks and are no valid ASN.1 encoding.  Note the
    * special handling for record mode at the end of the loop. */
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
       size_t nn;
       int where;
       const char *errstr = NULL;
       pukdf_object_t pukdf = NULL;
       unsigned long ul;
       keyusage_flags_t usageflags;
       keyaccess_flags_t accessflags;
       unsigned long key_reference = 0;
       int key_reference_valid = 0;
 
       where = __LINE__;
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (objlen > n)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         ; /* PublicRSAKeyAttributes  */
       else if (class == CLASS_CONTEXT)
         {
           switch (tag)
             {
             case 0: break; /* EC key object */
             case 1: errstr = "DH key objects are not supported"; break;
             case 2: errstr = "DSA key objects are not supported"; break;
             case 3: errstr = "KEA key objects are not supported"; break;
             default: errstr = "unknown publicKeyObject"; break;
             }
           if (errstr)
             goto parse_error;
         }
       else
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto parse_error;
         }
 
       if (err)
         {
           log_error ("p15: error parsing PuKDF record: %s\n",
                      gpg_strerror (err));
           goto leave;
         }
 
       pp = p;
       nn = objlen;
       p += objlen;
       n -= objlen;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
       xfree (authid);
       xfree (label);
       err = parse_common_obj_attr (&pp, &nn, &authid, &authidlen, &label);
       if (err)
         goto parse_error;
 
       /* Parse the commonKeyAttributes.  */
       where = __LINE__;
       xfree (objid);
       err = parse_common_key_attr (&pp, &nn,
                                    &objid, &objidlen,
                                    &usageflags, &accessflags,
                                    &key_reference, &key_reference_valid);
       if (err)
         goto parse_error;
       log_assert (objid);
 
       /* Parse the subClassAttributes.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       if (class == CLASS_CONTEXT && tag == 0)
         {
           /* Skip this CommonPublicKeyAttribute.  */
           pp += objlen;
           nn -= objlen;
 
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
         }
       /* We expect a typeAttribute.  */
       if (!err && (objlen > nn || class != CLASS_CONTEXT || tag != 1))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;  /* No typeAttribute.  */
       nn = objlen;
 
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         ; /* A typeAttribute always starts with a sequence.  */
       else
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       nn = objlen;
 
       /* Check that the reference is a Path object.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       if (class != CLASS_UNIVERSAL || tag != TAG_SEQUENCE)
         {
           errstr = "unsupported reference type";
           goto parse_error;
         }
       nn = objlen;
 
       /* Parse the Path object. */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       /* Make sure that the next element is a non zero path and of
          even length (FID are two bytes each). */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
           ||  !objlen || (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
         }
 
       /* Create a new PuKDF list item. */
       pukdf = xtrycalloc (1, (sizeof *pukdf
                               - sizeof(unsigned short)
                               + objlen/2 * sizeof(unsigned short)));
       if (!pukdf)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       pukdf->objidlen = objidlen;
       pukdf->objid = objid;
       objid = NULL;
       if (authid)
         {
           pukdf->authidlen = authidlen;
           pukdf->authid = authid;
           authid = NULL;
         }
       if (label)
         {
           pukdf->label = label;
           label = NULL;
         }
 
       pukdf->pathlen = objlen/2;
       for (i=0; i < pukdf->pathlen; i++, pp += 2, nn -= 2)
         pukdf->path[i] = ((pp[0] << 8) | pp[1]);
 
       pukdf->usageflags = usageflags;
       pukdf->accessflags = accessflags;
       pukdf->key_reference = key_reference;
       pukdf->key_reference_valid = key_reference_valid;
 
       if (nn)
         {
           /* An index and length follows. */
           pukdf->have_off = 1;
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           pukdf->off = ul;
 
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_CONTEXT || tag != 0))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           pukdf->len = ul;
         }
 
 
       if (opt.verbose)
         {
           log_info ("p15: PuKDF %04hX: id=", fid);
           for (i=0; i < pukdf->objidlen; i++)
             log_printf ("%02X", pukdf->objid[i]);
           if (pukdf->label)
             log_printf (" (%s)", pukdf->label);
           log_info ("p15:             path=");
           for (i=0; i < pukdf->pathlen; i++)
             log_printf ("%s%04hX", i?"/":"",pukdf->path[i]);
           if (pukdf->have_off)
             log_printf ("[%lu/%lu]", pukdf->off, pukdf->len);
           if (pukdf->authid)
             {
               log_printf (" authid=");
               for (i=0; i < pukdf->authidlen; i++)
                 log_printf ("%02X", pukdf->authid[i]);
             }
           if (pukdf->key_reference_valid)
             log_printf (" keyref=0x%02lX", pukdf->key_reference);
           if (pukdf->accessflags.any)
             dump_keyaccess_flags (pukdf->accessflags);
           dump_keyusage_flags (pukdf->usageflags);
           log_printf ("\n");
         }
 
       /* Put it into the list. */
       pukdf->next = pukdflist;
       pukdflist = pukdf;
       pukdf = NULL;
       goto next_record; /* Ready with this record. */
 
     parse_error:
       log_error ("p15: error parsing PuKDF record at %d: %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       if (pukdf)
         {
           xfree (pukdf->objid);
           xfree (pukdf->authid);
           xfree (pukdf->label);
           xfree (pukdf);
         }
       err = 0;
 
     next_record:
       /* If the card uses a record oriented file structure, read the
        * next record.  Otherwise we keep on parsing the current buffer.  */
       recno++;
       if (record_mode)
         {
           xfree (buffer); buffer = NULL;
           err = select_and_read_record (app, 0, recno, "PuKDF",
                                         &buffer, &buflen, NULL);
           if (err) {
             if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
               err = 0;
             goto leave;
           }
           p = buffer;
           n = buflen;
         }
     } /* End looping over all records. */
 
  leave:
   xfree (authid);
   xfree (label);
   xfree (objid);
   xfree (buffer);
   if (err)
     release_pukdflist (pukdflist);
   else
     *result = pukdflist;
   return err;
 }
 
 
 /* Read and parse the Certificate Directory Files identified by FID.
    On success a newlist of CDF object gets stored at RESULT and the
    caller is then responsible of releasing this list.  On error a
    error code is returned and RESULT won't get changed.  */
 static gpg_error_t
 read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
 {
   gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   const unsigned char *p;
   size_t n, objlen, hdrlen;
   int class, tag, constructed, ndef;
   cdf_object_t cdflist = NULL;
   int i;
   int recno = 1;
   unsigned char *authid = NULL;
   size_t authidlen = 0;
   char *label = NULL;
   int record_mode;
 
   err = read_first_record (app, fid, "CDF", &buffer, &buflen, &record_mode);
   if (err)
     return err;
 
   p = buffer;
   n = buflen;
 
   /* Loop over the records.  We stop as soon as we detect a new record
      starting with 0x00 or 0xff as these values are commonly used to
      pad data blocks and are no valid ASN.1 encoding.  Note the
      special handling for record mode at the end of the loop. */
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
       size_t nn;
       int where;
       const char *errstr = NULL;
       cdf_object_t cdf = NULL;
       unsigned long ul;
       const unsigned char *objid;
       size_t objidlen;
 
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > n || tag != TAG_SEQUENCE))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         {
           log_error ("p15: error parsing CDF record: %s\n", gpg_strerror (err));
           goto leave;
         }
       pp = p;
       nn = objlen;
       p += objlen;
       n -= objlen;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
       xfree (authid);
       xfree (label);
       err = parse_common_obj_attr (&pp, &nn, &authid, &authidlen, &label);
       if (err)
         goto parse_error;
 
       /* Parse the commonCertificateAttributes.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nn || tag != TAG_SEQUENCE))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       {
         const unsigned char *ppp = pp;
         size_t nnn = objlen;
 
         pp += objlen;
         nn -= objlen;
 
         /* Get the Id. */
         where = __LINE__;
         err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
         if (!err && (objlen > nnn
                      || class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING))
           err = gpg_error (GPG_ERR_INV_OBJ);
         if (err)
           goto parse_error;
         objid = ppp;
         objidlen = objlen;
       }
 
       /* Parse the certAttribute.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nn || class != CLASS_CONTEXT || tag != 1))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       nn = objlen;
 
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nn
                    || class != CLASS_UNIVERSAL || tag != TAG_SEQUENCE))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       nn = objlen;
 
       /* Check that the reference is a Path object.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       if (class != CLASS_UNIVERSAL || tag != TAG_SEQUENCE)
         {
           errstr = "unsupported reference type";
           goto parse_error;
         }
       nn = objlen;
 
       /* Parse the Path object. */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       /* Make sure that the next element is a non zero path and of
          even length (FID are two bytes each). */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
           ||  !objlen || (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
         }
       /* Create a new CDF list item. */
       cdf = xtrycalloc (1, (sizeof *cdf
                             - sizeof(unsigned short)
                             + objlen/2 * sizeof(unsigned short)));
       if (!cdf)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       if (authid)
         {
           cdf->authidlen = authidlen;
           cdf->authid = authid;
           authid = NULL;
         }
       if (label)
         {
           cdf->label = label;
           label = NULL;
         }
 
       cdf->objidlen = objidlen;
       cdf->objid = xtrymalloc (objidlen);
       if (!cdf->objid)
         {
           err = gpg_error_from_syserror ();
           xfree (cdf);
           goto leave;
         }
       memcpy (cdf->objid, objid, objidlen);
 
       cdf->pathlen = objlen/2;
       for (i=0; i < cdf->pathlen; i++, pp += 2, nn -= 2)
         cdf->path[i] = ((pp[0] << 8) | pp[1]);
 
       if (nn)
         {
           /* An index and length follows. */
           cdf->have_off = 1;
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           cdf->off = ul;
 
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_CONTEXT || tag != 0))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           cdf->len = ul;
         }
 
       if (opt.verbose)
         {
           log_info ("p15: CDF-%c %04hX: id=", cdftype, fid);
           for (i=0; i < cdf->objidlen; i++)
             log_printf ("%02X", cdf->objid[i]);
           if (cdf->label)
             log_printf (" (%s)", cdf->label);
           log_info ("p15:             path=");
           for (i=0; i < cdf->pathlen; i++)
             log_printf ("%s%04hX", i?"/":"", cdf->path[i]);
           if (cdf->have_off)
             log_printf ("[%lu/%lu]", cdf->off, cdf->len);
           if (cdf->authid)
             {
               log_printf (" authid=");
               for (i=0; i < cdf->authidlen; i++)
                 log_printf ("%02X", cdf->authid[i]);
             }
           log_printf ("\n");
         }
 
       /* Put it into the list. */
       cdf->next = cdflist;
       cdflist = cdf;
       cdf = NULL;
       goto next_record; /* Ready with this record. */
 
     parse_error:
       log_error ("p15: error parsing CDF record at %d: %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       xfree (cdf);
       err = 0;
 
     next_record:
       xfree (authid);
       xfree (label);
       /* If the card uses a record oriented file structure, read the
        * next record.  Otherwise we keep on parsing the current buffer.  */
       recno++;
       if (record_mode)
         {
           xfree (buffer); buffer = NULL;
           err = select_and_read_record (app, 0, recno, "CDF",
                                         &buffer, &buflen, NULL);
           if (err) {
             if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
               err = 0;
             goto leave;
           }
           p = buffer;
           n = buflen;
         }
     } /* End loop over all records. */
 
  leave:
   xfree (authid);
   xfree (label);
   xfree (buffer);
   if (err)
     release_cdflist (cdflist);
   else
     *result = cdflist;
   return err;
 }
 
 
 /*
  * SEQUENCE {
  *   SEQUENCE { -- CommonObjectAttributes
  *     UTF8String 'specific PIN for DS'
  *     BIT STRING 0 unused bits
  *       '00000011'B
  *     }
  *   SEQUENCE { -- CommonAuthenticationObjectAttributes
  *     OCTET STRING
  *       07    -- iD
  *     }
  *
  *   [1] { -- typeAttributes
  *     SEQUENCE { -- PinAttributes
  *       BIT STRING 0 unused bits
  *         '0000100000110010'B  -- local,initialized,needs-padding
  *                              -- exchangeRefData
  *       ENUMERATED 1           -- ascii-numeric
  *       INTEGER 6              -- minLength
  *       INTEGER 6              -- storedLength
  *       INTEGER 8              -- maxLength
  *       [0]
  *         02                   -- pinReference
  *       GeneralizedTime 19/04/2002 12:12 GMT  -- lastPinChange
  *       SEQUENCE {
  *         OCTET STRING
  *           3F 00 40 16        -- path to DF of PIN
  *         }
  *       }
  *     }
  *   }
  *
  * Or for an authKey:
  *
  *   [1] { -- typeAttributes
  *     SEQUENCE { -- AuthKeyAttributes
  *       BOOLEAN TRUE    -- derivedKey
  *       OCTET STRING 02 -- authKeyId
  *       }
  *     }
  *   }
 */
 /* Read and parse an Authentication Object Directory File identified
    by FID.  On success a newlist of AODF objects gets stored at RESULT
    and the caller is responsible of releasing this list.  On error a
    error code is returned and RESULT won't get changed.  */
 static gpg_error_t
 read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
 {
   gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   const unsigned char *p;
   size_t n, objlen, hdrlen;
   int class, tag, constructed, ndef;
   aodf_object_t aodflist = NULL;
   int i;
   int recno = 1;
   int record_mode;
 
   err = read_first_record (app, fid, "AODF", &buffer, &buflen, &record_mode);
   if (err)
     return err;
 
   p = buffer;
   n = buflen;
 
   /* Loop over the records.  We stop as soon as we detect a new record
      starting with 0x00 or 0xff as these values are commonly used to
      pad data blocks and are no valid ASN.1 encoding.  Note the
      special handling for record mode at the end of the loop.  */
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
       size_t nn;
       int where;
       const char *errstr = NULL;
       auth_type_t auth_type;
       aodf_object_t aodf = NULL;
       unsigned long ul;
       const char *s;
 
       where = __LINE__;
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (objlen > n)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         auth_type = AUTH_TYPE_PIN;    /* PinAttributes */
       else if (class == CLASS_CONTEXT && tag == 1 )
         auth_type = AUTH_TYPE_AUTHKEY; /* AuthKeyAttributes */
       else if (class == CLASS_CONTEXT)
         {
           switch (tag)
             {
             case 0: errstr = "biometric auth types are not supported"; break;
             case 2: errstr = "external auth type are not supported"; break;
             default: errstr = "unknown privateKeyObject"; break;
             }
           goto parse_error;
         }
       else
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto parse_error;
         }
 
       if (err)
         {
           log_error ("p15: error parsing AODF record: %s\n",
                      gpg_strerror (err));
           goto leave;
         }
       pp = p;
       nn = objlen;
       p += objlen;
       n -= objlen;
 
       /* Allocate memory for a new AODF list item. */
       aodf = xtrycalloc (1, sizeof *aodf);
       if (!aodf)
         goto no_core;
       aodf->fid = fid;
       aodf->auth_type = auth_type;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
       err = parse_common_obj_attr (&pp, &nn, &aodf->authid, &aodf->authidlen,
                                    &aodf->label);
       if (err)
         goto parse_error;
 
       /* Parse the CommonAuthenticationObjectAttributes.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nn || tag != TAG_SEQUENCE))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       {
         const unsigned char *ppp = pp;
         size_t nnn = objlen;
 
         pp += objlen;
         nn -= objlen;
 
         /* Get the Id. */
         where = __LINE__;
         err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                                 &ndef, &objlen, &hdrlen);
         if (!err && (objlen > nnn
                      || class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING))
           err = gpg_error (GPG_ERR_INV_OBJ);
         if (err)
           goto parse_error;
 
         aodf->objidlen = objlen;
         aodf->objid = xtrymalloc (objlen);
         if (!aodf->objid)
           goto no_core;
         memcpy (aodf->objid, ppp, objlen);
       }
 
       /* Parse the typeAttributes.  */
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > nn || class != CLASS_CONTEXT || tag != 1))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
       nn = objlen;
 
       where = __LINE__;
       err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         ;
       else if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
         ; /* Okay */
       else
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto parse_error;
 
       nn = objlen;
 
       if (auth_type == AUTH_TYPE_PIN)
         {
           /* PinFlags */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn || !objlen
                        || class != CLASS_UNIVERSAL || tag != TAG_BIT_STRING))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
 
           {
             unsigned int bits, mask;
             int unused, full;
 
             unused = *pp++; nn--; objlen--;
             if ((!objlen && unused) || unused/8 > objlen)
               {
                 err = gpg_error (GPG_ERR_ENCODING_PROBLEM);
                 goto parse_error;
               }
             full = objlen - (unused+7)/8;
             unused %= 8;
             mask = 0;
             for (i=1; unused; i <<= 1, unused--)
               mask |= i;
 
             /* The first octet */
             bits = 0;
             if (objlen)
               {
                 bits = *pp++; nn--; objlen--;
                 if (full)
                   full--;
                 else
                   {
                     bits &= ~mask;
                     mask = 0;
                   }
               }
             if ((bits & 0x80)) /* ASN.1 bit 0. */
               aodf->pinflags.case_sensitive = 1;
             if ((bits & 0x40)) /* ASN.1 bit 1. */
               aodf->pinflags.local = 1;
             if ((bits & 0x20))
               aodf->pinflags.change_disabled = 1;
             if ((bits & 0x10))
               aodf->pinflags.unblock_disabled = 1;
             if ((bits & 0x08))
               aodf->pinflags.initialized = 1;
             if ((bits & 0x04))
               aodf->pinflags.needs_padding = 1;
             if ((bits & 0x02))
               aodf->pinflags.unblocking_pin = 1;
             if ((bits & 0x01))
               aodf->pinflags.so_pin = 1;
             /* The second octet. */
             bits = 0;
             if (objlen)
               {
                 bits = *pp++; nn--; objlen--;
                 if (full)
                   full--;
                 else
                   {
                     bits &= ~mask;
                   }
               }
             if ((bits & 0x80))
               aodf->pinflags.disable_allowed = 1;
             if ((bits & 0x40))
               aodf->pinflags.integrity_protected = 1;
             if ((bits & 0x20))
               aodf->pinflags.confidentiality_protected = 1;
             if ((bits & 0x10))
               aodf->pinflags.exchange_ref_data = 1;
             /* Skip remaining bits. */
             pp += objlen;
             nn -= objlen;
           }
 
           /* PinType */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_ENUMERATED))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (!err && objlen > sizeof (ul))
             err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
 
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           aodf->pintype = ul;
 
           /* minLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (!err && objlen > sizeof (ul))
             err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           aodf->min_length = ul;
 
           /* storedLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (!err && (objlen > nn
                        || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (!err && objlen > sizeof (ul))
             err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
           aodf->stored_length = ul;
 
           /* optional maxLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
           if (gpg_err_code (err) == GPG_ERR_EOF)
             goto ready;
           if (!err && objlen > nn)
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
           if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER)
             {
               if (objlen > sizeof (ul))
                 {
                   err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
                   goto parse_error;
                 }
               for (ul=0; objlen; objlen--)
                 {
                   ul <<= 8;
                   ul |= (*pp++) & 0xff;
                   nn--;
                 }
               aodf->max_length = ul;
               aodf->max_length_valid = 1;
 
               where = __LINE__;
               err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (gpg_err_code (err) == GPG_ERR_EOF)
                 goto ready;
               if (!err && objlen > nn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
             }
 
           /* Optional pinReference. */
           if (class == CLASS_CONTEXT && tag == 0)
             {
               if (objlen > sizeof (ul))
                 {
                   err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
                   goto parse_error;
                 }
               for (ul=0; objlen; objlen--)
                 {
                   ul <<= 8;
                   ul |= (*pp++) & 0xff;
                   nn--;
                 }
               aodf->pin_reference = ul;
               aodf->pin_reference_valid = 1;
 
               where = __LINE__;
               err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (gpg_err_code (err) == GPG_ERR_EOF)
                 goto ready;
               if (!err && objlen > nn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
             }
 
           /* Optional padChar. */
           if (class == CLASS_UNIVERSAL && tag == TAG_OCTET_STRING)
             {
               if (objlen != 1)
                 {
                   errstr = "padChar is not of size(1)";
                   goto parse_error;
                 }
               aodf->pad_char = *pp++; nn--;
               aodf->pad_char_valid = 1;
 
               where = __LINE__;
               err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (gpg_err_code (err) == GPG_ERR_EOF)
                 goto ready;
               if (!err && objlen > nn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
             }
 
           /* Skip optional lastPinChange. */
           if (class == CLASS_UNIVERSAL && tag == TAG_GENERALIZED_TIME)
             {
               pp += objlen;
               nn -= objlen;
 
               where = __LINE__;
               err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (gpg_err_code (err) == GPG_ERR_EOF)
                 goto ready;
               if (!err && objlen > nn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
             }
 
           /* Optional Path object.  */
           if (class == CLASS_UNIVERSAL || tag == TAG_SEQUENCE)
             {
               const unsigned char *ppp = pp;
               size_t nnn = objlen;
 
               pp += objlen;
               nn -= objlen;
 
               where = __LINE__;
               err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (!err && objlen > nnn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
 
               /* Make sure that the next element has a path of even
                * length (FIDs are two bytes each).  */
               if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
                   || (objlen & 1) )
                 {
                   errstr = "invalid path reference";
                   goto parse_error;
                 }
 
               aodf->pathlen = objlen/2;
               aodf->path = xtrycalloc (aodf->pathlen, sizeof *aodf->path);
               if (!aodf->path)
                 goto no_core;
               for (i=0; i < aodf->pathlen; i++, ppp += 2, nnn -= 2)
                 aodf->path[i] = ((ppp[0] << 8) | ppp[1]);
 
               if (nnn)
                 {
                   /* An index and length follows. */
                   aodf->have_off = 1;
                   where = __LINE__;
                   err = parse_ber_header (&ppp, &nnn, &class, &tag,
                                           &constructed,
                                           &ndef, &objlen, &hdrlen);
                   if (!err && (objlen > nnn
                                || class != CLASS_UNIVERSAL
                                || tag != TAG_INTEGER))
                     err = gpg_error (GPG_ERR_INV_OBJ);
                   if (err)
                     goto parse_error;
 
                   for (ul=0; objlen; objlen--)
                     {
                       ul <<= 8;
                       ul |= (*ppp++) & 0xff;
                       nnn--;
                     }
                   aodf->off = ul;
 
                   where = __LINE__;
                   err = parse_ber_header (&ppp, &nnn, &class, &tag,
                                           &constructed,
                                           &ndef, &objlen, &hdrlen);
                   if (!err && (objlen > nnn
                                || class != CLASS_CONTEXT || tag != 0))
                     err = gpg_error (GPG_ERR_INV_OBJ);
                   if (err)
                     goto parse_error;
 
                   for (ul=0; objlen; objlen--)
                     {
                       ul <<= 8;
                       ul |= (*ppp++) & 0xff;
                       nnn--;
                     }
                   aodf->len = ul;
                 }
             }
         }
       else if (auth_type == AUTH_TYPE_AUTHKEY)
         {
 
         }
 
       /* Ignore further objects which might be there due to future
          extensions of pkcs#15. */
 
     ready:
       if (gpg_err_code (err) == GPG_ERR_EOF)
         err = 0;
       if (opt.verbose)
         {
           log_info ("p15: AODF %04hX:  id=", fid);
           for (i=0; i < aodf->objidlen; i++)
             log_printf ("%02X", aodf->objid[i]);
           if (aodf->label)
             log_printf (" (%s)", aodf->label);
           log_info ("p15:            ");
           log_printf (" %s",
                       aodf->auth_type == AUTH_TYPE_PIN? "pin" :
                       aodf->auth_type == AUTH_TYPE_AUTHKEY? "authkey" : "?");
           if (aodf->pathlen)
             {
               log_printf (" path=");
               for (i=0; i < aodf->pathlen; i++)
                 log_printf ("%s%04hX", i?"/":"",aodf->path[i]);
               if (aodf->have_off)
                 log_printf ("[%lu/%lu]", aodf->off, aodf->len);
             }
           if (aodf->authid)
             {
               log_printf (" authid=");
               for (i=0; i < aodf->authidlen; i++)
                 log_printf ("%02X", aodf->authid[i]);
             }
           if (aodf->auth_type == AUTH_TYPE_PIN)
             {
               if (aodf->pin_reference_valid)
                 log_printf (" pinref=0x%02lX", aodf->pin_reference);
               log_printf (" min=%lu", aodf->min_length);
               log_printf (" stored=%lu", aodf->stored_length);
               if (aodf->max_length_valid)
                 log_printf (" max=%lu", aodf->max_length);
               if (aodf->pad_char_valid)
                 log_printf (" pad=0x%02x", aodf->pad_char);
 
               log_info ("p15:             flags=");
               s = "";
               if (aodf->pinflags.case_sensitive)
                 log_printf ("%scase_sensitive", s), s = ",";
               if (aodf->pinflags.local)
                 log_printf ("%slocal", s), s = ",";
               if (aodf->pinflags.change_disabled)
                 log_printf ("%schange_disabled", s), s = ",";
               if (aodf->pinflags.unblock_disabled)
                 log_printf ("%sunblock_disabled", s), s = ",";
               if (aodf->pinflags.initialized)
                 log_printf ("%sinitialized", s), s = ",";
               if (aodf->pinflags.needs_padding)
                 log_printf ("%sneeds_padding", s), s = ",";
               if (aodf->pinflags.unblocking_pin)
                 log_printf ("%sunblocking_pin", s), s = ",";
               if (aodf->pinflags.so_pin)
                 log_printf ("%sso_pin", s), s = ",";
               if (aodf->pinflags.disable_allowed)
                 log_printf ("%sdisable_allowed", s), s = ",";
               if (aodf->pinflags.integrity_protected)
                 log_printf ("%sintegrity_protected", s), s = ",";
               if (aodf->pinflags.confidentiality_protected)
                 log_printf ("%sconfidentiality_protected", s), s = ",";
               if (aodf->pinflags.exchange_ref_data)
                 log_printf ("%sexchange_ref_data", s), s = ",";
               {
                 char numbuf[50];
                 const char *s2;
 
                 switch (aodf->pintype)
                   {
                   case PIN_TYPE_BCD: s2 = "bcd"; break;
                   case PIN_TYPE_ASCII_NUMERIC: s2 = "ascii-numeric"; break;
                   case PIN_TYPE_UTF8: s2 = "utf8"; break;
                   case PIN_TYPE_HALF_NIBBLE_BCD: s2 = "half-nibble-bcd"; break;
                   case PIN_TYPE_ISO9564_1: s2 = "iso9564-1"; break;
                   default:
                     sprintf (numbuf, "%lu", (unsigned long)aodf->pintype);
                     s2 = numbuf;
                   }
                 log_printf ("%stype=%s", s, s2); s = ",";
               }
             }
           else if (aodf->auth_type == AUTH_TYPE_AUTHKEY)
             {
             }
           log_printf ("\n");
         }
 
       /* Put it into the list. */
       aodf->next = aodflist;
       aodflist = aodf;
       aodf = NULL;
       goto next_record; /* Ready with this record. */
 
     no_core:
       err = gpg_error_from_syserror ();
       release_aodf_object (aodf);
       goto leave;
 
     parse_error:
       log_error ("p15: error parsing AODF record at %d: %s - skipped\n",
                  where, errstr? errstr : gpg_strerror (err));
       err = 0;
       release_aodf_object (aodf);
 
     next_record:
       /* If the card uses a record oriented file structure, read the
        * next record.  Otherwise we keep on parsing the current buffer.  */
       recno++;
       if (record_mode)
         {
           xfree (buffer); buffer = NULL;
           err = select_and_read_record (app, 0, recno, "AODF",
                                         &buffer, &buflen, NULL);
           if (err) {
             if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
               err = 0;
             goto leave;
           }
           p = buffer;
           n = buflen;
         }
     } /* End looping over all records. */
 
  leave:
   xfree (buffer);
   if (err)
     release_aodflist (aodflist);
   else
     *result = aodflist;
   return err;
 }
 
 
 /* Print the BIT STRING with the tokenflags from the TokenInfo.  */
 static void
 print_tokeninfo_tokenflags (const unsigned char *der, size_t derlen)
 {
   unsigned int bits, mask;
   int i, unused, full;
   int other = 0;
 
   if (!derlen)
     {
       log_printf (" [invalid object]");
       return;
     }
 
   unused = *der++; derlen--;
   if ((!derlen && unused) || unused/8 > derlen)
     {
       log_printf (" [wrong encoding]");
       return;
     }
   full = derlen - (unused+7)/8;
   unused %= 8;
   mask = 0;
   for (i=1; unused; i <<= 1, unused--)
     mask |= i;
 
   /* First octet */
   if (derlen)
     {
       bits = *der++; derlen--;
       if (full)
         full--;
       else
         {
           bits &= ~mask;
           mask = 0;
         }
     }
   else
     bits = 0;
   if ((bits & 0x80)) log_printf (" readonly");
   if ((bits & 0x40)) log_printf (" loginRequired");
   if ((bits & 0x20)) log_printf (" prnGeneration");
   if ((bits & 0x10)) log_printf (" eidCompliant");
   if ((bits & 0x08)) other = 1;
   if ((bits & 0x04)) other = 1;
   if ((bits & 0x02)) other = 1;
   if ((bits & 0x01)) other = 1;
 
   /* Next octet.  */
   if (derlen)
     other = 1;
 
   if (other)
     log_printf (" [unknown]");
 }
 
 
 
 /* Read and parse the EF(TokenInfo).
  *
  * TokenInfo ::= SEQUENCE {
  *     version		INTEGER {v1(0)} (v1,...),
  *     serialNumber	OCTET STRING,
  *     manufacturerID 	Label OPTIONAL,
  *     label 		[0] Label OPTIONAL,
  *     tokenflags 		TokenFlags,
  *     seInfo 		SEQUENCE OF SecurityEnvironmentInfo OPTIONAL,
  *     recordInfo 		[1] RecordInfo OPTIONAL,
  *     supportedAlgorithms	[2] SEQUENCE OF AlgorithmInfo OPTIONAL,
  *     ...,
  *     issuerId		[3] Label OPTIONAL,
  *     holderId		[4] Label OPTIONAL,
  *     lastUpdate		[5] LastUpdate OPTIONAL,
  *     preferredLanguage	PrintableString OPTIONAL -- In accordance with
  *     -- IETF RFC 1766
  * } (CONSTRAINED BY { -- Each AlgorithmInfo.reference value must be unique --})
  *
  * TokenFlags ::= BIT STRING {
  *     readOnly		(0),
  *     loginRequired 	(1),
  *     prnGeneration 	(2),
  *     eidCompliant  	(3)
  * }
  *
  *
  * Sample EF 5032:
  * 30 31 02 01 00 04 04 05 45  36 9F 0C 0C 44 2D 54   01......E6...D-T
  * 72 75 73 74 20 47 6D 62 48  80 14 4F 66 66 69 63   rust GmbH..Offic
  * 65 20 69 64 65 6E 74 69 74  79 20 63 61 72 64 03   e identity card.
  * 02 00 40 20 63 61 72 64 03  02 00 40 00 00 00 00   ..@ card...@....
  * 00 00 00 00 00 00 00 00 00  00 00 00 00 00 00 00   ................
  *
  *    0   49: SEQUENCE {
  *    2    1:   INTEGER 0
  *    5    4:   OCTET STRING 05 45 36 9F
  *   11   12:   UTF8String 'D-Trust GmbH'
  *   25   20:   [0] 'Office identity card'
  *   47    2:   BIT STRING
  *          :     '00000010'B (bit 1)
  *          :     Error: Spurious zero bits in bitstring.
  *          :   }
  */
 static gpg_error_t
 read_ef_tokeninfo (app_t app)
 {
   gpg_error_t err;
   unsigned char *buffer = NULL;
   size_t buflen;
   const unsigned char *p;
   size_t n, objlen, hdrlen;
   int class, tag, constructed, ndef;
   unsigned long ul;
 
   release_tokeninfo (app);
   app->app_local->card_product = CARD_PRODUCT_UNKNOWN;
 
   err = select_and_read_binary (app, 0x5032, "TokenInfo", &buffer, &buflen);
   if (err)
     return err;
 
   p = buffer;
   n = buflen;
 
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > n || tag != TAG_SEQUENCE))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     {
       log_error ("p15: error parsing TokenInfo: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   n = objlen;
 
   /* Version.  */
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > n || tag != TAG_INTEGER))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   for (ul=0; objlen; objlen--)
     {
       ul <<= 8;
       ul |= (*p++) & 0xff;
       n--;
     }
   if (ul)
     {
       log_error ("p15: invalid version %lu in TokenInfo\n", ul);
       err = gpg_error (GPG_ERR_INV_OBJ);
       goto leave;
     }
 
   /* serialNumber.  */
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > n || tag != TAG_OCTET_STRING || !objlen))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
 
   xfree (app->app_local->serialno);
   app->app_local->serialno = xtrymalloc (objlen);
   if (!app->app_local->serialno)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
   memcpy (app->app_local->serialno, p, objlen);
   app->app_local->serialnolen = objlen;
   p += objlen;
   n -= objlen;
 
   /* Is there an optional manufacturerID?  */
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (!err && (objlen > n || !objlen))
     err = gpg_error (GPG_ERR_INV_OBJ);
   if (err)
     goto leave;
   if (class == CLASS_UNIVERSAL && tag == TAG_UTF8_STRING)
     {
       app->app_local->manufacturer_id = percent_data_escape (0, NULL,
                                                              p, objlen);
       p += objlen;
       n -= objlen;
       /* Get next TLV.  */
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > n || !objlen))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   if (class == CLASS_CONTEXT && tag == 0)
     {
       app->app_local->token_label = percent_data_escape (0, NULL, p, objlen);
 
       p += objlen;
       n -= objlen;
       /* Get next TLV.  */
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (!err && (objlen > n || !objlen))
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
         goto leave;
     }
   /* The next is the mandatory tokenflags object.  */
   if (class == CLASS_UNIVERSAL && tag == TAG_BIT_STRING)
     {
       app->app_local->tokenflagslen = objlen;
       app->app_local->tokenflags = xtrymalloc (objlen);
       if (!app->app_local->tokenflags)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       memcpy (app->app_local->tokenflags, p, objlen);
       p += objlen;
       n -= objlen;
     }
 
 
  leave:
   xfree (buffer);
   return err;
 }
 
 
 /* Get all the basic information from the pkcs#15 card, check the
    structure and initialize our local context.  This is used once at
    application initialization. */
 static gpg_error_t
 read_p15_info (app_t app)
 {
   gpg_error_t err;
   prkdf_object_t prkdf;
   unsigned int flag;
 
   err = read_ef_tokeninfo (app);
   if (err)
     return err;
   /* If we don't have a serial number yet but the TokenInfo provides
    * one, use that. */
   if (!APP_CARD(app)->serialno && app->app_local->serialno)
     {
       APP_CARD(app)->serialno = app->app_local->serialno;
       APP_CARD(app)->serialnolen = app->app_local->serialnolen;
       app->app_local->serialno = NULL;
       app->app_local->serialnolen = 0;
       err = app_munge_serialno (APP_CARD(app));
       if (err)
         return err;
     }
 
   release_lists (app);
 
   if (IS_CARDOS_5 (app)
       && app->app_local->manufacturer_id
       && !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH"))
     {
       if (!app->app_local->card_product)
         app->app_local->card_product = CARD_PRODUCT_GENUA;
     }
 
   /* Read the ODF so that we know the location of all directory
      files. */
   /* Fixme: We might need to get a non-standard ODF FID from TokenInfo. */
   err = read_ef_odf (app, 0x5031);
   if (err)
     return err;
 
   /* Read certificate information. */
   log_assert (!app->app_local->certificate_info);
   log_assert (!app->app_local->trusted_certificate_info);
   log_assert (!app->app_local->useful_certificate_info);
   err = read_ef_cdf (app, app->app_local->odf.certificates, 'c',
                      &app->app_local->certificate_info);
   if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = read_ef_cdf (app, app->app_local->odf.trusted_certificates, 't',
                        &app->app_local->trusted_certificate_info);
   if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = read_ef_cdf (app, app->app_local->odf.useful_certificates, 'u',
                        &app->app_local->useful_certificate_info);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0;
   if (err)
     return err;
 
   /* Read information about public keys. */
   log_assert (!app->app_local->public_key_info);
   err = read_ef_pukdf (app, app->app_local->odf.public_keys,
                        &app->app_local->public_key_info);
   if (!err || gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = read_ef_pukdf (app, app->app_local->odf.trusted_public_keys,
                          &app->app_local->public_key_info);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0;
   if (err)
     return err;
 
   /* Read information about private keys. */
   log_assert (!app->app_local->private_key_info);
   err = read_ef_prkdf (app, app->app_local->odf.private_keys,
                        &app->app_local->private_key_info);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0;
   if (err)
     return err;
 
   /* Read information about authentication objects. */
   log_assert (!app->app_local->auth_object_info);
   err = read_ef_aodf (app, app->app_local->odf.auth_objects,
                       &app->app_local->auth_object_info);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0;
 
 
   /* See whether we can extend the private key information using
    * information from certificates.  We use only the first matching
    * certificate; if we want to change this strategy we should walk
    * over the certificates and then find the corresponsing private key
    * objects.  */
   app->app_local->any_gpgusage = 0;
   for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
     {
       cdf_object_t cdf;
       char *extusage;
       char *p, *pend;
       int seen, i;
 
       if (opt.debug)
         log_printhex (prkdf->objid, prkdf->objidlen, "p15: prkdf id=");
       if (cdf_object_from_objid (app, prkdf->objidlen, prkdf->objid, &cdf)
           && cdf_object_from_label (app, prkdf->label, &cdf))
         continue; /* No matching certificate.  */
       if (!cdf->cert)  /* Read and parse the certificate.  */
         readcert_by_cdf (app, cdf, NULL, NULL);
       if (!cdf->cert)
         continue; /* Unsupported or broken certificate.  */
 
       if (prkdf->is_ecc)
         {
           const char *oid;
           const unsigned char *der;
           size_t off, derlen, objlen, hdrlen;
           int class, tag, constructed, ndef;
 
           for (i=0; !(err = ksba_cert_get_extension
                       (cdf->cert, i, &oid, NULL, &off, &derlen)); i++)
             if (!strcmp (oid, "1.3.6.1.4.1.11591.2.2.10") )
               break;
           if (!err && (der = ksba_cert_get_image (cdf->cert, NULL)))
             {
               der += off;
               err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
               if (!err && (objlen > derlen || tag != TAG_OCTET_STRING || ndef))
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (!err)
                 {
                   derlen = objlen;
                   if (opt.debug)
                     log_printhex (der, derlen, "p15: OpenPGP KDF parms:");
                   /* Store them if they match the known OpenPGP format. */
                   if (derlen == 4 && der[0] == 3 && der[1]  == 1)
                     memcpy (prkdf->ecdh_kdf, der, 4);
                 }
             }
           err = 0;
         }
 
       if (ksba_cert_get_ext_key_usages (cdf->cert, &extusage))
         continue; /* No extended key usage attribute.  */
 
       if (opt.debug)
         log_debug ("p15: ExtKeyUsages: %s\n", extusage);
       p = extusage;
       while (p && (pend=strchr (p, ':')))
         {
           *pend++ = 0;
           if ( *pend == 'C' ) /* Look only at critical usages.  */
             {
               prkdf->extusage.valid = 1;
               seen = 1;
               if (!strcmp (p, oid_kp_codeSigning)
                   || !strcmp (p, oid_kp_timeStamping)
                   || !strcmp (p, oid_kp_ocspSigning)
                   || !strcmp (p, oid_kp_ms_documentSigning)
                   || !strcmp (p, oid_kp_ms_old_documentSigning))
                 prkdf->extusage.sign = 1;
               else if (!strcmp (p, oid_kp_emailProtection))
                 prkdf->extusage.encr = 1;
               else if (!strcmp (p, oid_kp_serverAuth)
                        || !strcmp (p, oid_kp_clientAuth)
                        || !strcmp (p, oid_kp_ms_smartcardLogon))
                 prkdf->extusage.auth = 1;
               else if (!strcmp (p, oid_kp_anyExtendedKeyUsage))
                 {
                   prkdf->extusage.sign = 1;
                   prkdf->extusage.encr = 1;
                   prkdf->extusage.auth = 1;
                 }
               else
                 seen = 0;
             }
           else
             seen = 0;
 
           /* Now check the gpg Usage.  Here we don't care about
            * critical or non-critical here. */
           if (seen)
             ; /* No more need to look for other caps.  */
           else if (!strcmp (p, oid_kp_gpgUsageCert))
             {
               prkdf->gpgusage.cert = 1;
               prkdf->gpgusage.any = 1;
               app->app_local->any_gpgusage = 1;
             }
           else if (!strcmp (p, oid_kp_gpgUsageSign))
             {
               prkdf->gpgusage.sign = 1;
               prkdf->gpgusage.any = 1;
               app->app_local->any_gpgusage = 1;
             }
           else if (!strcmp (p, oid_kp_gpgUsageEncr))
             {
               prkdf->gpgusage.encr = 1;
               prkdf->gpgusage.any = 1;
               app->app_local->any_gpgusage = 1;
             }
           else if (!strcmp (p, oid_kp_gpgUsageAuth))
             {
               prkdf->gpgusage.auth = 1;
               prkdf->gpgusage.any = 1;
               app->app_local->any_gpgusage = 1;
             }
 
           /* Skip to next item.  */
           if ((p = strchr (pend, '\n')))
             p++;
         }
       xfree (extusage);
     }
 
   /* See whether we can figure out something about the card.  */
   if (!app->app_local->card_product
       && app->app_local->manufacturer_id
       && !strcmp (app->app_local->manufacturer_id, "www.atos.net/cardos")
       && IS_CARDOS_5 (app))
     {
       /* This is a modern CARDOS card. */
       flag = 0;
       for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
         {
           if (prkdf->label && !strcmp (prkdf->label, "IdentityKey")
               && prkdf->key_reference_valid && prkdf->key_reference == 1
               && !prkdf->authid)
             flag |= 1;
           else if (prkdf->label && !strcmp (prkdf->label, "TransportKey")
                    && prkdf->key_reference_valid && prkdf->key_reference==2
                    && prkdf->authid)
             flag |= 2;
         }
       if (flag == 3)
         app->app_local->card_product = CARD_PRODUCT_RSCS;
 
     }
   if (!app->app_local->card_product
       && app->app_local->token_label
       && !strncmp (app->app_local->token_label, "D-TRUST Card V3", 15)
       && app->app_local->card_type == CARD_TYPE_CARDOS_50)
     {
       app->app_local->card_product = CARD_PRODUCT_DTRUST;
     }
 
 
   /* Now print the info about the PrKDF.  */
   if (opt.verbose)
     {
       int i;
       unsigned char *atr;
       size_t atrlen;
       const char *cardstr;
 
       for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
         {
           log_info ("p15: PrKDF %04hX: id=", app->app_local->odf.private_keys);
           for (i=0; i < prkdf->objidlen; i++)
             log_printf ("%02X", prkdf->objid[i]);
           if (prkdf->label)
             log_printf (" (%s)", prkdf->label);
           log_info ("p15:             path=");
           for (i=0; i < prkdf->pathlen; i++)
             log_printf ("%s%04hX", i?"/":"",prkdf->path[i]);
           if (prkdf->have_off)
             log_printf ("[%lu/%lu]", prkdf->off, prkdf->len);
           if (prkdf->authid)
             {
               log_printf (" authid=");
               for (i=0; i < prkdf->authidlen; i++)
                 log_printf ("%02X", prkdf->authid[i]);
             }
           if (prkdf->key_reference_valid)
             log_printf (" keyref=0x%02lX", prkdf->key_reference);
           log_printf (" type=%s", prkdf->is_ecc? "ecc":"rsa");
           if (prkdf->accessflags.any)
             dump_keyaccess_flags (prkdf->accessflags);
           dump_keyusage_flags (prkdf->usageflags);
           if (prkdf->extusage.valid)
             log_info ("p15:             extusage=%s%s%s%s%s",
                       prkdf->extusage.sign? "sign":"",
                       (prkdf->extusage.sign
                        && prkdf->extusage.encr)?",":"",
                       prkdf->extusage.encr? "encr":"",
                       ((prkdf->extusage.sign || prkdf->extusage.encr)
                        && prkdf->extusage.auth)?",":"",
                       prkdf->extusage.auth? "auth":"");
           if (prkdf->gpgusage.any)
             dump_gpgusage_flags (prkdf->gpgusage);
 
           log_printf ("\n");
         }
 
       log_info ("p15: TokenInfo:\n");
       if (app->app_local->serialno)
         {
           log_info ("p15:  serialNumber .: ");
           log_printhex (app->app_local->serialno, app->app_local->serialnolen,
                         "");
         }
       else if (APP_CARD(app)->serialno)
         {
           log_info ("p15:  serialNumber .: ");
           log_printhex (APP_CARD(app)->serialno, APP_CARD(app)->serialnolen,
                         "");
         }
 
       if (app->app_local->manufacturer_id)
         log_info ("p15:  manufacturerID: %s\n",
                   app->app_local->manufacturer_id);
       if (app->app_local->card_product)
         {
           cardstr = cardproduct2str (app->app_local->card_product);
           log_info ("p15:  product ......: %d%s%s%s\n",
                     app->app_local->card_product,
                     *cardstr? " (":"", cardstr, *cardstr? ")":"");
         }
       if (app->app_local->token_label)
         log_info ("p15:  label ........: %s\n", app->app_local->token_label);
       if (app->app_local->tokenflags)
         {
           log_info ("p15:  tokenflags ...:");
           print_tokeninfo_tokenflags (app->app_local->tokenflags,
                                       app->app_local->tokenflagslen);
           log_printf ("\n");
         }
 
       log_info ("p15:  atr ..........: ");
       atr = apdu_get_atr (app_get_slot (app), &atrlen);
       if (!atr)
         log_printf ("[error]\n");
       else
         {
           log_printhex (atr, atrlen, "");
           xfree (atr);
         }
 
       cardstr = cardtype2str (app->app_local->card_type);
       log_info ("p15:  cardtype .....: %d%s%s%s\n",
                 app->app_local->card_type,
                 *cardstr? " (":"", cardstr, *cardstr? ")":"");
     }
 
   return err;
 }
 
 
 /* Helper to do_learn_status: Send information about all certificates
    listed in CERTINFO back.  Use CERTTYPE as type of the
    certificate. */
 static gpg_error_t
 send_certinfo (app_t app, ctrl_t ctrl, const char *certtype,
                cdf_object_t certinfo)
 {
   for (; certinfo; certinfo = certinfo->next)
     {
       char *buf, *p;
       const char *label;
       char *labelbuf;
 
       buf = xtrymalloc (9 + certinfo->objidlen*2 + 1);
       if (!buf)
         return gpg_error_from_syserror ();
       p = stpcpy (buf, "P15");
       if (app->app_local->home_df != DEFAULT_HOME_DF)
         {
           snprintf (p, 6, "-%04X",
                     (unsigned int)(app->app_local->home_df & 0xffff));
           p += 5;
         }
       p = stpcpy (p, ".");
       bin2hex (certinfo->objid, certinfo->objidlen, p);
 
       label = (certinfo->label && *certinfo->label)? certinfo->label : "-";
       labelbuf = percent_data_escape (0, NULL, label, strlen (label));
       if (!labelbuf)
         {
           xfree (buf);
           return gpg_error_from_syserror ();
         }
 
       send_status_info (ctrl, "CERTINFO",
                         certtype, strlen (certtype),
                         buf, strlen (buf),
                         labelbuf, strlen (labelbuf),
                         NULL, (size_t)0);
       xfree (buf);
       xfree (labelbuf);
     }
   return 0;
 }
 
 
 /* Get the keygrip of the private key object PRKDF.  On success the
  * keygrip, the algo and the length are stored in the KEYGRIP,
  * KEYALGO, and KEYNBITS fields of the PRKDF object.  */
 static gpg_error_t
 keygrip_from_prkdf (app_t app, prkdf_object_t prkdf)
 {
   gpg_error_t err;
   cdf_object_t cdf;
   unsigned char *der;
   size_t derlen;
   ksba_cert_t cert;
   gcry_sexp_t s_pkey = NULL;
 
   /* Easy if we got a cached version.  */
   if (prkdf->keygrip_valid)
     return 0;
 
   xfree (prkdf->common_name);
   prkdf->common_name = NULL;
   xfree (prkdf->serial_number);
   prkdf->serial_number = NULL;
 
   /* We could have also checked whether a public key directory file
    * and a matching public key for PRKDF is available.  This would
    * make extraction of the key faster.  However, this way we don't
    * have a way to look at extended key attributes to check gpgusage.
    * FIXME: Add public key lookup if no certificate was found. */
 
   /* Look for a matching certificate. A certificate matches if the id
    * matches the one of the private key info.  If none was found we
    * also try to match on the label.  */
   err = cdf_object_from_objid (app, prkdf->objidlen, prkdf->objid, &cdf);
   if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
     err = cdf_object_from_label (app, prkdf->label, &cdf);
   if (!err && !cdf)
     err = gpg_error (GPG_ERR_NOT_FOUND);
   if (err)
     goto leave;
 
   err = readcert_by_cdf (app, cdf, &der, &derlen);
   if (err)
     goto leave;
 
   err = ksba_cert_new (&cert);
   if (!err)
     err = ksba_cert_init_from_mem (cert, der, derlen);
   xfree (der);
   if (!err)
     err = app_help_get_keygrip_string (cert, prkdf->keygrip, &s_pkey, NULL);
   if (!err && !prkdf->gpgusage.any)
     {
       /* Try to get the CN and the SerialNumber from the certificate;
        * we use a very simple approach here which should work in many
        * cases.  Eventually we should add a rfc-2253 parser into
        * libksba to make it easier to parse such a string.
        * We don't do this if this is marked as gpg key and thus
        * has only a dummy certificate.
        *
        * First example string:
        *   "CN=Otto Schily,O=Miniluv,C=DE"
        * Second example string:
        *   "2.5.4.5=#445452323030303236333531,2.5.4.4=#4B6F6368,"
        *   "2.5.4.42=#5765726E6572,CN=Werner Koch,OU=For testing"
        *   " purposes only!,O=Testorganisation,C=DE"
        */
       char *dn = ksba_cert_get_subject (cert, 0);
       if (dn)
         {
           char *p, *pend, *buf;
 
           p = strstr (dn, "CN=");
           if (p && (p==dn || p[-1] == ','))
             {
               p += 3;
               if (!(pend = strchr (p, ',')))
                 pend = p + strlen (p);
               if (pend && pend > p
                   && (prkdf->common_name = xtrymalloc ((pend - p) + 1)))
                 {
                   memcpy (prkdf->common_name, p, pend-p);
                   prkdf->common_name[pend-p] = 0;
                 }
             }
           p = strstr (dn, "2.5.4.5=#"); /* OID of the SerialNumber */
           if (p && (p==dn || p[-1] == ','))
             {
               p += 9;
               if (!(pend = strchr (p, ',')))
                 pend = p + strlen (p);
               if (pend && pend > p
                   && (buf = xtrymalloc ((pend - p) + 1)))
                 {
                   memcpy (buf, p, pend-p);
                   buf[pend-p] = 0;
                   if (!hex2str (buf, buf, strlen (buf)+1, NULL))
                     xfree (buf);  /* Invalid hex encoding.  */
                   else
                     prkdf->serial_number = buf;
                 }
             }
           ksba_free (dn);
         }
     }
 
   if (!err && !prkdf->keytime)
     {
       ksba_isotime_t isot;
       time_t t;
 
       ksba_cert_get_validity (cert, 0, isot);
       t = isotime2epoch (isot);
       prkdf->keytime = (t == (time_t)(-1))? 0 : (u32)t;
       prkdf->have_keytime = 1;
     }
 
   if (!err && !prkdf->keyalgostr)
     prkdf->keyalgostr = pubkey_algo_string (s_pkey, NULL);
 
   ksba_cert_release (cert);
   if (err)
     goto leave;
 
   prkdf->keyalgo = get_pk_algo_from_key (s_pkey);
   if (!prkdf->keyalgo)
     {
       err = gpg_error (GPG_ERR_PUBKEY_ALGO);
       goto leave;
     }
 
   prkdf->keynbits = gcry_pk_get_nbits (s_pkey);
   if (!prkdf->keynbits)
     {
       err = gpg_error (GPG_ERR_PUBKEY_ALGO);
       goto leave;
     }
 
   prkdf->keygrip_valid = 1;  /* Yeah, got everything.  */
 
  leave:
   gcry_sexp_release (s_pkey);
   return err;
 }
 
 
 /* Return a malloced keyref string for PRKDF.  Returns NULL on
  * malloc failure.  */
 static char *
 keyref_from_prkdf (app_t app, prkdf_object_t prkdf)
 {
   char *buf, *p;
 
   buf = xtrymalloc (4 + 5 + prkdf->objidlen*2 + 1);
   if (!buf)
     return NULL;
   p = stpcpy (buf, "P15");
   if (app->app_local->home_df != DEFAULT_HOME_DF)
     {
       snprintf (p, 6, "-%04X",
                 (unsigned int)(app->app_local->home_df & 0xffff));
       p += 5;
     }
   p = stpcpy (p, ".");
   bin2hex (prkdf->objid, prkdf->objidlen, p);
   return buf;
 }
 
 
 /* Helper to do_learn_status: Send information about all known
    keypairs back.  FIXME: much code duplication from
    send_certinfo(). */
 static gpg_error_t
 send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t prkdf)
 {
   gpg_error_t err;
 
   for (; prkdf; prkdf = prkdf->next)
     {
       char *buf;
       int j;
 
       buf = keyref_from_prkdf (app, prkdf);
       if (!buf)
         return gpg_error_from_syserror ();
 
       err = keygrip_from_prkdf (app, prkdf);
       if (err)
         {
           log_error ("p15: error getting keygrip from ");
           for (j=0; j < prkdf->pathlen; j++)
             log_printf ("%s%04hX", j?"/":"", prkdf->path[j]);
           log_printf (": %s\n", gpg_strerror (err));
         }
       else
         {
           char usage[5];
           char keytime[20];
           const char *algostr;
           size_t usagelen = 0;
 
           if (prkdf->gpgusage.any)
             {
               if (prkdf->gpgusage.sign)
                 usage[usagelen++] = 's';
               if (prkdf->gpgusage.cert)
                 usage[usagelen++] = 'c';
               if (prkdf->gpgusage.encr)
                 usage[usagelen++] = 'e';
               if (prkdf->gpgusage.auth)
                 usage[usagelen++] = 'a';
             }
           else
             {
               if ((prkdf->usageflags.sign
                    || prkdf->usageflags.sign_recover
                    || prkdf->usageflags.non_repudiation)
                   && (!prkdf->extusage.valid
                       || prkdf->extusage.sign))
                 usage[usagelen++] = 's';
               if ((prkdf->usageflags.sign
                    || prkdf->usageflags.sign_recover)
                   && (!prkdf->extusage.valid || prkdf->extusage.sign))
                 usage[usagelen++] = 'c';
               if ((prkdf->usageflags.decrypt
                    || prkdf->usageflags.unwrap)
                   && (!prkdf->extusage.valid || prkdf->extusage.encr))
                 usage[usagelen++] = 'e';
               if ((prkdf->usageflags.sign
                    || prkdf->usageflags.sign_recover)
                   && (!prkdf->extusage.valid || prkdf->extusage.auth))
                 usage[usagelen++] = 'a';
             }
 
           log_assert (strlen (prkdf->keygrip) == 40);
           if (prkdf->keytime && prkdf->have_keytime)
             snprintf (keytime, sizeof keytime, "%lu",
                       (unsigned long)prkdf->keytime);
           else
             strcpy (keytime, "-");
 
           algostr = prkdf->keyalgostr;
 
           send_status_info (ctrl, "KEYPAIRINFO",
                             prkdf->keygrip, 2*KEYGRIP_LEN,
                             buf, strlen (buf),
                             usage, usagelen,
                             keytime, strlen (keytime),
                             algostr, strlen (algostr?algostr:""),
                             NULL, (size_t)0);
         }
       xfree (buf);
     }
   return 0;
 }
 
 
 
 /* This is the handler for the LEARN command.  Note that if
  * APP_LEARN_FLAG_REREAD is set and this function returns an error,
  * the caller must deinitialize this application.  */
 static gpg_error_t
 do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
 {
   gpg_error_t err;
 
   if (flags & APP_LEARN_FLAG_REREAD)
     {
       err = read_p15_info (app);
       if (err)
         return err;
     }
 
   if ((flags & APP_LEARN_FLAG_KEYPAIRINFO))
     err = 0;
   else
     {
       err = do_getattr (app, ctrl, "MANUFACTURER");
       if (!err)
         err = send_certinfo (app, ctrl, "100",
                              app->app_local->certificate_info);
       if (!err)
         err = send_certinfo (app, ctrl, "101",
                              app->app_local->trusted_certificate_info);
       if (!err)
         err = send_certinfo (app, ctrl, "102",
                              app->app_local->useful_certificate_info);
     }
 
   if (!err)
     err = send_keypairinfo (app, ctrl, app->app_local->private_key_info);
 
   if (!err)
     err = do_getattr (app, ctrl, "CHV-STATUS");
   if (!err)
     err = do_getattr (app, ctrl, "CHV-LABEL");
 
 
   return err;
 }
 
 
 /* Read a certificate using the information in CDF and return the
  * certificate in a newly malloced buffer R_CERT and its length
  * R_CERTLEN.  Also parses the certificate.  R_CERT and R_CERTLEN may
  * be NULL to do just the caching.  */
 static gpg_error_t
 readcert_by_cdf (app_t app, cdf_object_t cdf,
                  unsigned char **r_cert, size_t *r_certlen)
 {
   gpg_error_t err;
   unsigned char *buffer = NULL;
   const unsigned char *p, *save_p;
   size_t buflen, n;
   int class, tag, constructed, ndef;
   size_t totobjlen, objlen, hdrlen;
   int rootca;
   int i;
 
   if (r_cert)
     *r_cert = NULL;
   if (r_certlen)
     *r_certlen = 0;
 
   /* First check whether it has been cached. */
   if (cdf->cert)
     {
       const unsigned char *image;
       size_t imagelen;
 
       if (!r_cert || !r_certlen)
         return 0; /* Caller does not actually want the result. */
 
       image = ksba_cert_get_image (cdf->cert, &imagelen);
       if (!image)
         {
           log_error ("p15: ksba_cert_get_image failed\n");
           return gpg_error (GPG_ERR_INTERNAL);
         }
       *r_cert = xtrymalloc (imagelen);
       if (!*r_cert)
         return gpg_error_from_syserror ();
       memcpy (*r_cert, image, imagelen);
       *r_certlen = imagelen;
       return 0;
     }
 
   if (DBG_CARD)
     {
       log_info ("p15: Reading CDF: id=");
       for (i=0; i < cdf->objidlen; i++)
         log_printf ("%02X", cdf->objid[i]);
       if (cdf->label)
         log_printf (" (%s)", cdf->label);
       log_info ("p15:             path=");
       for (i=0; i < cdf->pathlen; i++)
         log_printf ("%s%04hX", i?"/":"", cdf->path[i]);
       if (cdf->have_off)
         log_printf ("[%lu/%lu]", cdf->off, cdf->len);
       if (cdf->authid)
         {
           log_printf (" authid=");
           for (i=0; i < cdf->authidlen; i++)
             log_printf ("%02X", cdf->authid[i]);
         }
       log_printf ("\n");
     }
 
   /* Read the entire file.  fixme: This could be optimized by first
      reading the header to figure out how long the certificate
      actually is. */
   err = select_ef_by_path (app, cdf->path, cdf->pathlen);
   if (err)
     goto leave;
 
   if (app->app_local->no_extended_mode || !cdf->len)
     err = iso7816_read_binary_ext (app_get_slot (app), 0, cdf->off, 0,
                                    &buffer, &buflen, NULL);
   else
     err = iso7816_read_binary_ext (app_get_slot (app), 1, cdf->off, cdf->len,
                                    &buffer, &buflen, NULL);
   if (!err && (!buflen || *buffer == 0xff))
     err = gpg_error (GPG_ERR_NOT_FOUND);
   if (err)
     {
       log_error ("p15: error reading certificate id=");
       for (i=0; i < cdf->objidlen; i++)
         log_printf ("%02X", cdf->objid[i]);
       log_printf (" at ");
       for (i=0; i < cdf->pathlen; i++)
         log_printf ("%s%04hX", i? "/":"", cdf->path[i]);
       log_printf (": %s\n", gpg_strerror (err));
       goto leave;
     }
 
   /* Check whether this is really a certificate.  */
   p = buffer;
   n = buflen;
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (err)
     goto leave;
 
   if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && constructed)
     rootca = 0;
   else if ( class == CLASS_UNIVERSAL && tag == TAG_SET && constructed )
     rootca = 1;
   else
     {
       err = gpg_error (GPG_ERR_INV_OBJ);
       goto leave;
     }
   totobjlen = objlen + hdrlen;
   log_assert (totobjlen <= buflen);
 
   err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                           &ndef, &objlen, &hdrlen);
   if (err)
     goto leave;
 
   if (!rootca
       && class == CLASS_UNIVERSAL && tag == TAG_OBJECT_ID && !constructed)
     {
       /* The certificate seems to be contained in a userCertificate
          container.  Skip this and assume the following sequence is
          the certificate. */
       if (n < objlen)
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto leave;
         }
       p += objlen;
       n -= objlen;
       save_p = p;
       err = parse_ber_header (&p, &n, &class, &tag, &constructed,
                               &ndef, &objlen, &hdrlen);
       if (err)
         goto leave;
       if ( !(class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE && constructed) )
         {
           err = gpg_error (GPG_ERR_INV_OBJ);
           goto leave;
         }
       totobjlen = objlen + hdrlen;
       log_assert (save_p + totobjlen <= buffer + buflen);
       memmove (buffer, save_p, totobjlen);
     }
 
 
   /* Try to parse and cache the certificate. */
   err = ksba_cert_new (&cdf->cert);
   if (!err)
     {
       err = ksba_cert_init_from_mem (cdf->cert, buffer, totobjlen);
       if (!err) /* Call us to use the just cached cert object.  */
         err = readcert_by_cdf (app, cdf, r_cert, r_certlen);
       if (err)
         {
           ksba_cert_release (cdf->cert);
           cdf->cert = NULL;
         }
 
     }
   if (err)
     {
       log_error ("p15: caching certificate failed: %s\n",
                  gpg_strerror (err));
       /* We return the certificate anyway so that the caller has a
        * chance to get an even unsupported or broken certificate.  */
       if (r_cert && r_certlen)
         {
           *r_cert = buffer;
           buffer = NULL;
           *r_certlen = totobjlen;
         }
     }
 
  leave:
   xfree (buffer);
   return err;
 }
 
 
 /* Handler for the READCERT command.
 
    Read the certificate with id CERTID (as returned by learn_status in
    the CERTINFO status lines) and return it in the freshly allocated
    buffer to be stored at R_CERT and its length at R_CERTLEN.  A error
    code will be returned on failure and R_CERT and R_CERTLEN will be
    set to (NULL,0). */
 static gpg_error_t
 do_readcert (app_t app, const char *certid,
              unsigned char **r_cert, size_t *r_certlen)
 {
   gpg_error_t err;
   cdf_object_t cdf;
 
   *r_cert = NULL;
   *r_certlen = 0;
   err = cdf_object_from_certid (app, certid, &cdf);
   if (!err)
     err = readcert_by_cdf (app, cdf, r_cert, r_certlen);
   return err;
 }
 
 
 /* Sort helper for an array of authentication objects.  */
 static int
 compare_aodf_objid (const void *arg_a, const void *arg_b)
 {
   const aodf_object_t a = *(const aodf_object_t *)arg_a;
   const aodf_object_t b = *(const aodf_object_t *)arg_b;
   int rc;
 
   rc = memcmp (a->objid, b->objid,
                a->objidlen < b->objidlen? a->objidlen : b->objidlen);
   if (!rc)
     {
       if (a->objidlen < b->objidlen)
         rc = -1;
       else if (a->objidlen > b->objidlen)
         rc = 1;
     }
   return rc;
 }
 
 
 static void
 send_key_fpr_line (ctrl_t ctrl, int number, const unsigned char *fpr)
 {
   char buf[41];
   char numbuf[25];
 
   bin2hex (fpr, 20, buf);
   if (number == -1)
     *numbuf = 0; /* Don't print the key number */
   else
     snprintf (numbuf, sizeof numbuf, "%d", number);
   send_status_info (ctrl, "KEY-FPR",
                     numbuf, (size_t)strlen(numbuf),
                     buf, (size_t)strlen (buf),
                     NULL, 0);
 }
 
 
 /* If possible Emit a FPR-KEY status line for the private key object
  * PRKDF using NUMBER as index.  */
 static void
 send_key_fpr (app_t app, ctrl_t ctrl, prkdf_object_t prkdf, int number)
 {
   gpg_error_t err;
   cdf_object_t cdf;
   unsigned char *pk, *fixed_pk;
   size_t pklen, fixed_pklen;
   const unsigned char *m, *e, *q;
   size_t mlen, elen, qlen;
   unsigned char fpr20[20];
 
   if (cdf_object_from_objid (app, prkdf->objidlen, prkdf->objid, &cdf)
       && cdf_object_from_label (app, prkdf->label, &cdf))
     return;
   if (!cdf->cert)
     readcert_by_cdf (app, cdf, NULL, NULL);
   if (!cdf->cert)
     return;
   if (!prkdf->have_keytime)
     return;
   pk = ksba_cert_get_public_key (cdf->cert);
   if (!pk)
     return;
   pklen = gcry_sexp_canon_len (pk, 0, NULL, &err);
 
   if (uncompress_ecc_q_in_canon_sexp (pk, pklen, &fixed_pk, &fixed_pklen))
     {
       xfree (pk);
       return;
     }
   if (fixed_pk)
     {
       xfree (pk); pk = NULL;
       pk = fixed_pk;
       pklen = fixed_pklen;
     }
 
   switch (prkdf->keyalgo)
     {
     case GCRY_PK_RSA:
       if (!get_rsa_pk_from_canon_sexp (pk, pklen,
                                        &m, &mlen, &e, &elen)
           && !compute_openpgp_fpr_rsa (4,
                                        prkdf->keytime,
                                        m, mlen, e, elen,
                                        fpr20, NULL))
         send_key_fpr_line (ctrl, number, fpr20);
       break;
 
     case GCRY_PK_ECC:
     case GCRY_PK_ECDSA:
     case GCRY_PK_ECDH:
     case GCRY_PK_EDDSA:
       /* Note that NUMBER 2 indicates the encryption key.  */
       if (!get_ecc_q_from_canon_sexp (pk, pklen, &q, &qlen)
           && !compute_openpgp_fpr_ecc (4,
                                        prkdf->keytime,
                                        prkdf->keyalgostr,
                                        number == 2,
                                        q, qlen,
                                        prkdf->ecdh_kdf, 4,
                                        fpr20, NULL))
         send_key_fpr_line (ctrl, number, fpr20);
       break;
 
     default: /* No Fingerprint for an unknown algo.  */
       break;
 
     }
   xfree (pk);
 }
 
 
 /* Implement the GETATTR command.  This is similar to the LEARN
    command but returns just one value via the status interface. */
 static gpg_error_t
 do_getattr (app_t app, ctrl_t ctrl, const char *name)
 {
   gpg_error_t err;
   prkdf_object_t prkdf;
 
   if (!strcmp (name, "$AUTHKEYID")
       || !strcmp (name, "$ENCRKEYID")
       || !strcmp (name, "$SIGNKEYID"))
     {
       char *buf;
 
       /* We return the ID of the first private key capable of the
        * requested action.  If any gpgusage flag has been set for the
        * card we consult the gpgusage flags and not the regualr usage
        * flags.
        */
       /* FIXME: This changed: Note that we do not yet return
        * non_repudiation keys for $SIGNKEYID because our D-Trust
        * testcard uses rsaPSS, which is not supported by gpgsm and not
        * covered by the VS-NfD approval.  */
       for (prkdf = app->app_local->private_key_info; prkdf;
            prkdf = prkdf->next)
         {
           if (app->app_local->any_gpgusage)
             {
               if ((name[1] == 'A' && prkdf->gpgusage.auth)
                   || (name[1] == 'E' && prkdf->gpgusage.encr)
                   || (name[1] == 'S' && prkdf->gpgusage.sign))
                 break;
             }
           else
             {
               if ((name[1] == 'A' && (prkdf->usageflags.sign
                                       || prkdf->usageflags.sign_recover))
                   || (name[1] == 'E' && (prkdf->usageflags.decrypt
                                          || prkdf->usageflags.unwrap))
                   || (name[1] == 'S' && (prkdf->usageflags.sign
                                          || prkdf->usageflags.sign_recover)))
                 break;
             }
         }
       if (prkdf)
         {
           buf = keyref_from_prkdf (app, prkdf);
           if (!buf)
             return gpg_error_from_syserror ();
 
           send_status_info (ctrl, name, buf, strlen (buf), NULL, 0);
           xfree (buf);
         }
       return 0;
     }
   else if (!strcmp (name, "$DISPSERIALNO"))
     {
       /* For certain cards we return special IDs.  There is no
          general rule for it so we need to decide case by case. */
       if (app->app_local->card_type == CARD_TYPE_BELPIC)
         {
           /* The eID card has a card number printed on the front matter
              which seems to be a good indication. */
           unsigned char *buffer;
           const unsigned char *p;
           size_t buflen, n;
           unsigned short path[] = { 0x3F00, 0xDF01, 0x4031 };
 
           err = select_ef_by_path (app, path, DIM(path) );
           if (!err)
             err = iso7816_read_binary (app_get_slot (app), 0, 0,
                                        &buffer, &buflen);
           if (err)
             {
               log_error ("p15: error accessing EF(ID): %s\n",
                          gpg_strerror (err));
               return err;
             }
 
           p = find_tlv (buffer, buflen, 1, &n);
           if (p && n == 12)
             {
               char tmp[12+2+1];
               memcpy (tmp, p, 3);
               tmp[3] = '-';
               memcpy (tmp+4, p+3, 7);
               tmp[11] = '-';
               memcpy (tmp+12, p+10, 2);
               tmp[14] = 0;
               send_status_info (ctrl, name, tmp, strlen (tmp), NULL, 0);
               xfree (buffer);
               return 0;
             }
           xfree (buffer);
         }
       else
         {
           char *sn;
 
           /* We use the first private key object which has a serial
            * number set.  If none was found, we parse the first
            * object and see whether this has then a serial number.  */
           for (prkdf = app->app_local->private_key_info; prkdf;
                prkdf = prkdf->next)
             if (prkdf->serial_number)
               break;
           if (!prkdf && app->app_local->private_key_info)
             {
               prkdf = app->app_local->private_key_info;
               keygrip_from_prkdf (app, prkdf);
               if (!prkdf->serial_number)
                 prkdf = NULL;
             }
           sn = get_dispserialno (app, prkdf);
           /* Unless there is a bogus S/N in the cert, or the product
            * has a different strategy for the display-s/n, we should
            * have a suitable one from the cert now.  */
           if (sn)
             {
               err = send_status_printf (ctrl, name, "%s", sn);
               xfree (sn);
               return err;
             }
         }
       /* No abbreviated serial number. */
     }
   else if (!strcmp (name, "MANUFACTURER"))
     {
       if (app->app_local->manufacturer_id
           && !strchr (app->app_local->manufacturer_id, '[')
           && app->app_local->card_product)
         return send_status_printf (ctrl, "MANUFACTURER", "0 %s [%s]",
                               app->app_local->manufacturer_id,
                               cardproduct2str (app->app_local->card_product));
       else if (app->app_local->manufacturer_id)
         return send_status_printf (ctrl, "MANUFACTURER", "0 %s",
                                    app->app_local->manufacturer_id);
       else
         return 0;
     }
   else if (!strcmp (name, "CHV-STATUS") || !strcmp (name, "CHV-LABEL"))
     {
       int is_label = (name[4] == 'L');
       aodf_object_t aodf;
       aodf_object_t aodfarray[16];
       int naodf = 0;
       membuf_t mb;
       char *p;
       int i;
 
       /* Put the AODFs into an array for easier sorting.  Note that we
        * handle onl the first 16 encountrer which should be more than
        * enough.  */
       for (aodf = app->app_local->auth_object_info;
            aodf && naodf < DIM(aodfarray); aodf = aodf->next)
         if (aodf->objidlen && aodf->pin_reference_valid)
           aodfarray[naodf++] = aodf;
       qsort (aodfarray, naodf, sizeof *aodfarray, compare_aodf_objid);
 
       init_membuf (&mb, 256);
       for (i = 0; i < naodf; i++)
         {
           /* int j; */
           /* log_debug ("p15: AODF[%d] pinref=%lu id=", */
           /*            i, aodfarray[i]->pin_reference); */
           /* for (j=0; j < aodfarray[i]->objidlen; j++) */
           /*   log_printf ("%02X", aodfarray[i]->objid[j]); */
           /* Note that there is no need to percent escape the label
            * because all white space have been replaced by '_'.  */
           if (is_label)
             put_membuf_printf (&mb, "%s%s", i? " ":"",
                                (aodfarray[i]->label
                                 && *aodfarray[i]->label)?
                                aodfarray[i]->label:"X");
           else
             put_membuf_printf
               (&mb, "%s%d", i? " ":"",
                iso7816_verify_status (app_get_slot (app),
                                       aodfarray[i]->pin_reference));
         }
       put_membuf( &mb, "", 1);
       p = get_membuf (&mb, NULL);
       if (!p)
         return gpg_error_from_syserror ();
       err = send_status_direct (ctrl, is_label? "CHV-LABEL":"CHV-STATUS", p);
       xfree (p);
       return err;
     }
   else if (!strcmp (name, "KEY-LABEL"))
     {
       /* Send KEY-LABEL lines for all private key objects.  */
       const char *label;
       char *idbuf, *labelbuf;
 
       for (prkdf = app->app_local->private_key_info; prkdf;
            prkdf = prkdf->next)
         {
           idbuf = keyref_from_prkdf (app, prkdf);
           if (!idbuf)
             return gpg_error_from_syserror ();
 
           label = (prkdf->label && *prkdf->label)? prkdf->label : "-";
           labelbuf = percent_data_escape (0, NULL, label, strlen (label));
           if (!labelbuf)
             {
               xfree (idbuf);
               return gpg_error_from_syserror ();
             }
 
           send_status_info (ctrl, name,
                             idbuf, strlen (idbuf),
                             labelbuf, strlen(labelbuf),
                             NULL, 0);
           xfree (idbuf);
           xfree (labelbuf);
         }
       return 0;
     }
   else if (!strcmp (name, "KEY-FPR"))
     {
       /* Send KEY-FPR for the two openpgp keys. */
       for (prkdf = app->app_local->private_key_info; prkdf;
            prkdf = prkdf->next)
         {
           if (app->app_local->any_gpgusage)
             {
               if (prkdf->gpgusage.sign)
                 break;
             }
           else
             {
               if (prkdf->usageflags.sign || prkdf->usageflags.sign_recover)
                 break;
             }
         }
       if (prkdf)
         send_key_fpr (app, ctrl, prkdf, 1);
       for (prkdf = app->app_local->private_key_info; prkdf;
            prkdf = prkdf->next)
         {
           if (app->app_local->any_gpgusage)
             {
               if (prkdf->gpgusage.encr)
                 break;
             }
           else
             {
               if (prkdf->usageflags.decrypt || prkdf->usageflags.unwrap)
                 break;
             }
         }
       if (prkdf)
         send_key_fpr (app, ctrl, prkdf, 2);
       return 0;
     }
 
   return gpg_error (GPG_ERR_INV_NAME);
 }
 
 
 
 
 /* Micardo cards require special treatment. This is a helper for the
    crypto functions to manage the security environment.  We expect that
    the key file has already been selected. FID is the one of the
    selected key. */
 static gpg_error_t
 micardo_mse (app_t app, unsigned short fid)
 {
   gpg_error_t err;
   int recno;
   unsigned short refdata = 0;
   int se_num;
   unsigned char msebuf[10];
 
   /* Read the KeyD file containing extra information on keys. */
   err = iso7816_select_file (app_get_slot (app), 0x0013, 0);
   if (err)
     {
       log_error ("p15: error reading EF_keyD: %s\n", gpg_strerror (err));
       return err;
     }
 
   for (recno = 1, se_num = -1; ; recno++)
     {
       unsigned char *buffer;
       size_t buflen;
       size_t n, nn;
       const unsigned char *p, *pp;
 
       err = iso7816_read_record (app_get_slot (app), recno, 1, 0,
                                  &buffer, &buflen);
       if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
         break; /* ready */
       if (err)
         {
           log_error ("p15: error reading EF_keyD record: %s\n",
                      gpg_strerror (err));
           return err;
         }
       if (opt.verbose)
         {
           log_info (buffer, buflen, "p15: keyD record: ");
           log_printhex (buffer, buflen, "");
         }
       p = find_tlv (buffer, buflen, 0x83, &n);
       if (p && n == 4 && ((p[2]<<8)|p[3]) == fid)
         {
           refdata = ((p[0]<<8)|p[1]);
           /* Locate the SE DO and the there included sec env number. */
           p = find_tlv (buffer, buflen, 0x7b, &n);
           if (p && n)
             {
               pp = find_tlv (p, n, 0x80, &nn);
               if (pp && nn == 1)
                 {
                   se_num = *pp;
                   xfree (buffer);
                   break; /* found. */
                 }
             }
         }
       xfree (buffer);
     }
   if (se_num == -1)
     {
       log_error ("p15: CRT for keyfile %04hX not found\n", fid);
       return gpg_error (GPG_ERR_NOT_FOUND);
     }
 
 
   /* Restore the security environment to SE_NUM if needed */
   if (se_num)
     {
       err = iso7816_manage_security_env (app_get_slot (app),
                                          0xf3, se_num, NULL, 0);
       if (err)
         {
           log_error ("p15: restoring SE to %d failed: %s\n",
                      se_num, gpg_strerror (err));
           return err;
         }
     }
 
   /* Set the DST reference data. */
   msebuf[0] = 0x83;
   msebuf[1] = 0x03;
   msebuf[2] = 0x80;
   msebuf[3] = (refdata >> 8);
   msebuf[4] = refdata;
   err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xb6, msebuf, 5);
   if (err)
     {
       log_error ("p15: setting SE to reference file %04hX failed: %s\n",
                  refdata, gpg_strerror (err));
       return err;
     }
   return 0;
 }
 
 
 
 /* Prepare the verification of the PIN for the key PRKDF by checking
  * the AODF and selecting the key file.  KEYREF is used for error
  * messages.  AODF may be NULL if no verification needs to be done. */
 static gpg_error_t
 prepare_verify_pin (app_t app, const char *keyref,
                     prkdf_object_t prkdf, aodf_object_t aodf)
 {
   gpg_error_t err;
   int i;
 
   if (aodf)
     {
       if (opt.verbose)
         {
           log_info ("p15: using AODF %04hX id=", aodf->fid);
           for (i=0; i < aodf->objidlen; i++)
             log_printf ("%02X", aodf->objid[i]);
           log_printf ("\n");
         }
 
       if (aodf->authid && opt.verbose)
         log_info ("p15: PIN is controlled by another authentication token\n");
 
       if (aodf->pinflags.integrity_protected
           || aodf->pinflags.confidentiality_protected)
         {
           log_error ("p15: PIN verification requires"
                      " unsupported protection method\n");
           return gpg_error (GPG_ERR_BAD_PIN_METHOD);
         }
       if (!aodf->stored_length && aodf->pinflags.needs_padding)
         {
           log_error ("p15: PIN verification requires"
                      " padding but no length known\n");
           return gpg_error (GPG_ERR_INV_CARD);
         }
     }
 
 
   if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
     {
       /* According to our protocol analysis we need to select a
        * special AID here.  Before that the master file needs to be
        * selected.  (RID A000000167 is assigned to IBM) */
       static char const dtrust_aid[] =
         { 0xA0, 0x00, 0x00, 0x01, 0x67, 0x45, 0x53, 0x49, 0x47, 0x4E };
 
       err = iso7816_select_mf (app_get_slot (app));
       if (!err)
         err = iso7816_select_application (app_get_slot (app),
                                           dtrust_aid, sizeof dtrust_aid, 0);
       if (err)
         log_error ("p15: error selecting D-TRUST's AID for key %s: %s\n",
                    keyref, gpg_strerror (err));
     }
   else if (prkdf)
     {
       /* Standard case: Select the key file.  Note that this may
        * change the security environment thus we need to do it before
        * PIN verification. */
       err = select_ef_by_path (app, prkdf->path, prkdf->pathlen);
       if (err)
         log_error ("p15: error selecting file for key %s: %s\n",
                    keyref, gpg_strerror (err));
     }
   else
     {
       log_info ("p15: skipping EF selection for auth object '%s'\n", keyref);
       err = 0;
     }
 
   return err;
 }
 
 
 static int
 any_control_or_space (const char *string)
 {
   const unsigned char *s;
 
   for (s = string; *s; s++)
     if (*s <= 0x20 || *s >= 0x7f)
       return 1;
   return 0;
 }
 
 static int
 any_control_or_space_mem (const void *buffer, size_t buflen)
 {
   const unsigned char *s;
 
   for (s = buffer; buflen; s++, buflen--)
     if (*s <= 0x20 || *s >= 0x7f)
       return 1;
   return 0;
 }
 
 
 /* Return a malloced serial number to be shown to the user.  PRKDF is
  * used to get it from a certificate; PRKDF may be NULL.  */
 static char *
 get_dispserialno (app_t app, prkdf_object_t prkdf)
 {
   char *serial;
   const unsigned char *s;
   int i;
   size_t n;
 
   /* We prefer the SerialNumber RDN from the Subject-DN but we don't
    * use it if it features a percent sign (special character in pin
    * prompts) or has any control character.  For some cards we use a
    * different strategy.  */
   if (app->app_local->card_product == CARD_PRODUCT_RSCS)
     {
       /* We use only the right 8 hex digits.  */
       serial = app_get_serialno (app);
       if (serial && (n=strlen (serial)) > 8)
         memmove (serial, serial + n - 8, 9);
     }
   else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id
            && !ascii_strcasecmp (app->app_local->manufacturer_id,
                                  "Technology Nexus")
            && app->serialno && app->serialnolen == 4+9
            && !memcmp (app->serialno, "\xff\x00\x00\xff", 4)
            && !any_control_or_space_mem (app->serialno + 4, 9))
     {
       /* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */
       serial = xtrymalloc (9+2+1);
       if (serial)
         {
           s = app->serialno + 4;
           for (i=0; i < 4; i++)
             serial[i] = *s++;
           serial[i++] = ' ';
           for (; i < 9; i++)
             serial[i] = *s++;
           serial[i++] = ' ';
           serial[i++] = *s;
           serial[i] = 0;
         }
     }
   else if (prkdf && prkdf->serial_number && *prkdf->serial_number
       && !strchr (prkdf->serial_number, '%')
       && !any_control_or_space (prkdf->serial_number))
     {
       serial = xtrystrdup (prkdf->serial_number);
     }
   else
     {
       serial = app_get_serialno (app);
     }
 
   return serial;
 }
 
 
 /* Return an allocated string to be used as prompt.  PRKDF may be
  * NULL.  Returns NULL on malloc error.  */
 static char *
 make_pin_prompt (app_t app, int remaining, const char *firstline,
                  prkdf_object_t prkdf)
 {
   char *serial, *tmpbuf, *result;
   const char *holder = NULL;
 
   serial = get_dispserialno (app, prkdf);
 
   if (app->app_local->card_product == CARD_PRODUCT_GENUA)
     {
       /* The label of the first non SO-PIN is used for the holder.  */
       aodf_object_t aodf;
 
       for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
         if (aodf->auth_type == AUTH_TYPE_PIN
             && !aodf->pinflags.so_pin
             && aodf->label)
           {
             holder = aodf->label;
             break;
           }
     }
 
   if (holder)
     ;
   else if (prkdf && prkdf->common_name)
     holder = prkdf->common_name;
   else if (app->app_local->token_label)
     holder = app->app_local->token_label;
   else
     holder = "";
 
   /* TRANSLATORS: Put a \x1f right before a colon.  This can be
    * used by pinentry to nicely align the names and values.  Keep
    * the %s at the start and end of the string.  */
   result = xtryasprintf (_("%s"
                            "Number\x1f: %s%%0A"
                            "Holder\x1f: %s"
                            "%s"),
                          "\x1e",
                          serial,
                          holder,
                          "");
   xfree (serial);
   if (!result)
     return NULL; /* Out of core.  */
 
   /* Append a "remaining attempts" info if needed.  */
   if (remaining != -1 && remaining < 3)
     {
       char *rembuf;
 
       /* TRANSLATORS: This is the number of remaining attempts to
        * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed. */
       rembuf = xtryasprintf (_("Remaining attempts: %d"), remaining);
       if (rembuf)
         {
           tmpbuf = strconcat (firstline, "%0A%0A", result,
                               "%0A%0A", rembuf, NULL);
           xfree (rembuf);
         }
       else
         tmpbuf = NULL;
       xfree (result);
       result = tmpbuf;
     }
   else
     {
       tmpbuf = strconcat (firstline, "%0A%0A", result, NULL);
       xfree (result);
       result = tmpbuf;
     }
 
   return result;
 }
 
 
 /* Given the private key object PRKDF and its authentication object
  * AODF ask for the PIN and verify that PIN.  If AODF is NULL, no
  * authentication is done.  */
 static gpg_error_t
 verify_pin (app_t app,
             gpg_error_t (*pincb)(void*, const char *, char **), void *pincb_arg,
             prkdf_object_t prkdf, aodf_object_t aodf)
 {
   gpg_error_t err;
   char *pinvalue;
   size_t pinvaluelen;
   const char *label;
   const char *errstr;
   const char *s;
   int remaining;
   int pin_reference;
   int verified = 0;
   int i;
 
   if (!aodf)
     return 0;
 
   pin_reference = aodf->pin_reference_valid? aodf->pin_reference : 0;
 
   if (IS_CARDOS_5 (app))
     {
       /* We know that this card supports a verify status check.  Note
        * that in contrast to PIV cards ISO7816_VERIFY_NOT_NEEDED is
        * not supported.  We also don't use the pin_verified cache
        * status because that is not as reliable as to ask the card
        * about its state.  */
       if (prkdf)  /* Clear the cache which we don't use.  */
         prkdf->pin_verified = 0;
 
       remaining = iso7816_verify_status (app_get_slot (app), pin_reference);
       if (remaining == ISO7816_VERIFY_NOT_NEEDED)
         {
           verified = 1;
           remaining = -1;
         }
       else if (remaining < 0)
         remaining = -1; /* We don't care about the concrete error.  */
       else if (remaining < 3)
         log_info ("p15: PIN has %d attempts left\n", remaining);
     }
   else
     remaining = -1;  /* Unknown.  */
 
   /* Check whether we already verified it.  */
   if (prkdf && (prkdf->pin_verified || verified))
     return 0;  /* Already done.  */
 
   if (prkdf
       && prkdf->usageflags.non_repudiation
       && (app->app_local->card_type == CARD_TYPE_BELPIC
           || app->app_local->card_product == CARD_PRODUCT_DTRUST))
     label = _("||Please enter the PIN for the key to create "
               "qualified signatures.");
   else if (aodf->pinflags.so_pin)
     label = _("|A|Please enter the Admin PIN");
   else if (aodf->pinflags.unblocking_pin)
     label = _("|P|Please enter the PIN Unblocking Code (PUK) "
               "for the standard keys.");
   else
     label = _("||Please enter the PIN for the standard keys.");
 
   {
     char *prompt = make_pin_prompt (app, remaining, label, prkdf);
     if (!prompt)
       err = gpg_error_from_syserror ();
     else
       err = pincb (pincb_arg, prompt, &pinvalue);
     xfree (prompt);
   }
   if (err)
     {
       log_info ("p15: PIN callback returned error: %s\n", gpg_strerror (err));
       return err;
     }
 
   /* We might need to cope with UTF8 things here.  Not sure how
      min_length etc. are exactly defined, for now we take them as
      a plain octet count. */
   if (strlen (pinvalue) < aodf->min_length)
     {
       log_error ("p15: PIN is too short; minimum length is %lu\n",
                  aodf->min_length);
       err = gpg_error (GPG_ERR_BAD_PIN);
     }
   else if (aodf->stored_length && strlen (pinvalue) > aodf->stored_length)
     {
       /* This would otherwise truncate the PIN silently. */
       log_error ("p15: PIN is too large; maximum length is %lu\n",
                  aodf->stored_length);
       err = gpg_error (GPG_ERR_BAD_PIN);
     }
   else if (aodf->max_length_valid && strlen (pinvalue) > aodf->max_length)
     {
       log_error ("p15: PIN is too large; maximum length is %lu\n",
                  aodf->max_length);
       err = gpg_error (GPG_ERR_BAD_PIN);
     }
 
   if (err)
     {
       xfree (pinvalue);
       return err;
     }
 
   errstr = NULL;
   err = 0;
   switch (aodf->pintype)
     {
     case PIN_TYPE_BCD:
     case PIN_TYPE_ASCII_NUMERIC:
       for (s=pinvalue; digitp (s); s++)
         ;
       if (*s)
         {
           errstr = "Non-numeric digits found in PIN";
           err = gpg_error (GPG_ERR_BAD_PIN);
         }
       break;
     case PIN_TYPE_UTF8:
       break;
     case PIN_TYPE_HALF_NIBBLE_BCD:
       errstr = "PIN type Half-Nibble-BCD is not supported";
       break;
     case PIN_TYPE_ISO9564_1:
       errstr = "PIN type ISO9564-1 is not supported";
       break;
     default:
       errstr = "Unknown PIN type";
       break;
     }
   if (errstr)
     {
       log_error ("p15: can't verify PIN: %s\n", errstr);
       xfree (pinvalue);
       return err? err : gpg_error (GPG_ERR_BAD_PIN_METHOD);
     }
 
 
   if (aodf->pintype == PIN_TYPE_BCD )
     {
       char *paddedpin;
       int ndigits;
 
       for (ndigits=0, s=pinvalue; *s; ndigits++, s++)
         ;
       paddedpin = xtrymalloc (aodf->stored_length+1);
       if (!paddedpin)
         {
           err = gpg_error_from_syserror ();
           xfree (pinvalue);
           return err;
         }
 
       i = 0;
       paddedpin[i++] = 0x20 | (ndigits & 0x0f);
       for (s=pinvalue; i < aodf->stored_length && *s && s[1]; s = s+2 )
         paddedpin[i++] = (((*s - '0') << 4) | ((s[1] - '0') & 0x0f));
       if (i < aodf->stored_length && *s)
         paddedpin[i++] = (((*s - '0') << 4)
                           |((aodf->pad_char_valid?aodf->pad_char:0)&0x0f));
 
       if (aodf->pinflags.needs_padding)
         {
           while (i < aodf->stored_length)
             paddedpin[i++] = aodf->pad_char_valid? aodf->pad_char : 0;
         }
 
       xfree (pinvalue);
       pinvalue = paddedpin;
       pinvaluelen = i;
     }
   else if (aodf->pinflags.needs_padding)
     {
       char *paddedpin;
 
       paddedpin = xtrymalloc (aodf->stored_length+1);
       if (!paddedpin)
         {
           err = gpg_error_from_syserror ();
           xfree (pinvalue);
           return err;
         }
       for (i=0, s=pinvalue; i < aodf->stored_length && *s; i++, s++)
         paddedpin[i] = *s;
       /* Not sure what padding char to use if none has been set.
          For now we use 0x00; maybe a space would be better. */
       for (; i < aodf->stored_length; i++)
         paddedpin[i] = aodf->pad_char_valid? aodf->pad_char : 0;
       paddedpin[i] = 0;
       pinvaluelen = i;
       xfree (pinvalue);
       pinvalue = paddedpin;
     }
   else
     pinvaluelen = strlen (pinvalue);
 
   /* log_printhex (pinvalue, pinvaluelen, */
   /*               "about to verify with ref %lu pin:", pin_reference); */
   err = iso7816_verify (app_get_slot (app), pin_reference,
                         pinvalue, pinvaluelen);
   xfree (pinvalue);
   if (err)
     {
       log_error ("p15: PIN verification failed: %s\n", gpg_strerror (err));
       return err;
     }
   if (opt.verbose)
     log_info ("p15: PIN verification succeeded\n");
   if (prkdf)
     prkdf->pin_verified = 1;
 
   return 0;
 }
 
 
 
 
 /* Handler for the PKSIGN command.
 
    Create the signature and return the allocated result in OUTDATA.
    If a PIN is required, the PINCB will be used to ask for the PIN;
    that callback should return the PIN in an allocated buffer and
    store that as the 3rd argument.  */
 static gpg_error_t
 do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
          gpg_error_t (*pincb)(void*, const char *, char **),
          void *pincb_arg,
          const void *indata, size_t indatalen,
          unsigned char **outdata, size_t *outdatalen )
 {
   gpg_error_t err;
   prkdf_object_t prkdf;    /* The private key object. */
   aodf_object_t aodf;      /* The associated authentication object. */
   int mse_done = 0;        /* Set to true if the MSE has been done. */
   unsigned int digestlen;  /* Length of the hash.  */
   int exmode, le_value;
   unsigned char oidbuf[64];
   size_t oidbuflen;
   size_t n;
   unsigned char *indata_buffer = NULL; /* Malloced helper.  */
 
   (void)ctrl;
 
   if (!keyidstr || !*keyidstr || !indatalen)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
   if (err)
     return err;
   if (!(prkdf->usageflags.sign
         || prkdf->usageflags.sign_recover
         || prkdf->usageflags.non_repudiation
         || prkdf->gpgusage.cert
         || prkdf->gpgusage.sign
         || prkdf->gpgusage.auth ))
     {
       log_error ("p15: key %s may not be used for signing\n", keyidstr);
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
   if (!prkdf->authid)
     {
       log_error ("p15: no authentication object defined for %s\n", keyidstr);
       /* fixme: we might want to go ahead and do without PIN
          verification. */
       return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
     }
 
   /* Find the authentication object to this private key object. */
   for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
     if (aodf->objidlen == prkdf->authidlen
         && !memcmp (aodf->objid, prkdf->authid, prkdf->authidlen))
       break;
   if (!aodf)
     log_info ("p15: no authentication for %s needed\n", keyidstr);
 
   /* We need some more info about the key - get the keygrip to
    * populate these fields.  */
   err = keygrip_from_prkdf (app, prkdf);
   if (err)
     {
       log_error ("p15: keygrip_from_prkdf failed: %s\n", gpg_strerror (err));
       return err;
     }
 
 
   digestlen = gcry_md_get_algo_dlen (hashalgo);
 
   /* We handle ECC separately from RSA so that we do not need to touch
    * working code.  In particular we prepare the input data before the
    * verify and a possible MSE.  */
   if (prkdf->is_ecc)
     {
       if (digestlen != 32 && digestlen != 48 && digestlen != 64)
         {
           log_error ("p15: ECC signing not possible: dlen=%u\n", digestlen);
           err = gpg_error (GPG_ERR_DIGEST_ALGO);
           goto leave;
         }
 
       if (indatalen == digestlen)
         ; /* Already prepared.  */
       else if (indatalen > digestlen)
         {
           /* Assume a PKCS#1 prefix and remove it.  */
           oidbuflen = sizeof oidbuf;
           err = gcry_md_get_asnoid (hashalgo, &oidbuf, &oidbuflen);
           if (err)
             {
               log_error ("p15: no OID for hash algo %d\n", hashalgo);
               err = gpg_error (GPG_ERR_INTERNAL);
               goto leave;
             }
           if (indatalen != oidbuflen + digestlen
               || memcmp (indata, oidbuf, oidbuflen))
             {
               log_error ("p15: input data too long for ECC: len=%zu\n",
                          indatalen);
               err = gpg_error (GPG_ERR_INV_VALUE);
               goto leave;
             }
           indata = (const char*)indata + oidbuflen;
           indatalen -= oidbuflen;
         }
       else
         {
           log_error ("p15: input data too short for ECC: len=%zu\n",
                      indatalen);
           err = gpg_error (GPG_ERR_INV_VALUE);
           goto leave;
         }
     }
   else /* Prepare RSA input.  */
     {
       unsigned int framelen;
       unsigned char *frame;
       int i;
 
       framelen = (prkdf->keynbits+7) / 8;
       if (!framelen)
         {
           log_error ("p15: key length unknown"
                      " - can't prepare PKCS#v1.5 frame\n");
           err = gpg_error (GPG_ERR_INV_VALUE);
           goto leave;
         }
 
       oidbuflen = sizeof oidbuf;
       if (!hashalgo)
         {
           /* We assume that indata already has the required
            * digestinfo; thus merely prepend the padding below.  */
         }
       else if ((err = gcry_md_get_asnoid (hashalgo, &oidbuf, &oidbuflen)))
         {
           log_debug ("p15: no OID for hash algo %d\n", hashalgo);
           goto leave;
         }
       else
         {
           if (indatalen == digestlen)
             {
               /* Plain hash in INDATA; prepend the digestinfo.  */
               indata_buffer = xtrymalloc (oidbuflen + indatalen);
               if (!indata_buffer)
                 {
                   err = gpg_error_from_syserror ();
                   goto leave;
                 }
               memcpy (indata_buffer, oidbuf, oidbuflen);
               memcpy (indata_buffer+oidbuflen, indata, indatalen);
               indata = indata_buffer;
               indatalen = oidbuflen + indatalen;
             }
           else if (indatalen == oidbuflen + digestlen
                    && !memcmp (indata, oidbuf, oidbuflen))
             ; /* We already got the correct prefix.  */
           else
             {
               err = gpg_error (GPG_ERR_INV_VALUE);
               log_error ("p15: bad input for signing with RSA and hash %d\n",
                          hashalgo);
               goto leave;
             }
         }
       /* Now prepend the pkcs#v1.5 padding.  We require at least 8
        * byte of padding and 3 extra bytes for the prefix and the
        * delimiting nul.  */
       if (!indatalen || indatalen + 8 + 4 > framelen)
         {
           err = gpg_error (GPG_ERR_INV_VALUE);
           log_error ("p15: input does not fit into a %u bit PKCS#v1.5 frame\n",
                      8*framelen);
           goto leave;
         }
       frame = xtrymalloc (framelen);
       if (!frame)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
       if (app->app_local->card_type == CARD_TYPE_BELPIC)
         {
           /* This card wants only the plain hash w/o any prefix.  */
           /* FIXME: We may want to remove this code because it is unlikely
            * that such cards are still in use.  */
           memcpy (frame, indata, indatalen);
           framelen = indatalen;
         }
       else
         {
           n = 0;
           frame[n++] = 0;
           frame[n++] = 1; /* Block type. */
           i = framelen - indatalen - 3 ;
           memset (frame+n, 0xff, i);
           n += i;
           frame[n++] = 0; /* Delimiter.  */
           memcpy (frame+n, indata, indatalen);
           n += indatalen;
           log_assert (n == framelen);
         }
       /* And now put it into the indata_buffer.  */
       xfree (indata_buffer);
       indata_buffer = frame;
       indata = indata_buffer;
       indatalen = framelen;
     }
 
   /* Prepare PIN verification.  This is split so that we can do
    * MSE operation for some task after having selected the key file but
    * before sending the verify APDU.  */
   err = prepare_verify_pin (app, keyidstr, prkdf, aodf);
   if (err)
     return err;
 
   /* Due to the fact that the non-repudiation signature on a BELPIC
      card requires a verify immediately before the DSO we set the
      MSE before we do the verification.  Other cards might also allow
      this but I don't want to break anything, thus we do it only
      for the BELPIC card here.
      FIXME: see comment above about these cards.   */
   if (app->app_local->card_type == CARD_TYPE_BELPIC)
     {
       unsigned char mse[5];
 
       mse[0] = 4;    /* Length of the template. */
       mse[1] = 0x80; /* Algorithm reference tag. */
       if (hashalgo == MD_USER_TLS_MD5SHA1)
         mse[2] = 0x01; /* Let card do pkcs#1 0xFF padding. */
       else
         mse[2] = 0x02; /* RSASSA-PKCS1-v1.5 using SHA1. */
       mse[3] = 0x84; /* Private key reference tag. */
       mse[4] = prkdf->key_reference_valid? prkdf->key_reference : 0x82;
 
       err = iso7816_manage_security_env (app_get_slot (app),
                                          0x41, 0xB6,
                                          mse, sizeof mse);
       mse_done = 1;
     }
   if (err)
     {
       log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   /* Now that we have all the information available run the actual PIN
    * verification.*/
   err = verify_pin (app, pincb, pincb_arg, prkdf, aodf);
   if (err)
     return err;
 
   /* Manage security environment needs to be tweaked for certain cards. */
   if (mse_done)
     err = 0;
   else if (app->app_local->card_type == CARD_TYPE_TCOS)
     {
       /* TCOS creates signatures always using the local key 0.  MSE
          may not be used. */
     }
   else if (app->app_local->card_type == CARD_TYPE_MICARDO)
     {
       if (!prkdf->pathlen)
         err = gpg_error (GPG_ERR_BUG);
       else
         err = micardo_mse (app, prkdf->path[prkdf->pathlen-1]);
     }
   else if (prkdf->key_reference_valid)
     {
       unsigned char mse[3];
 
       mse[0] = 0x84; /* Select asym. key. */
       mse[1] = 1;
       mse[2] = prkdf->key_reference;
 
       err = iso7816_manage_security_env (app_get_slot (app),
                                          0x41, 0xB6,
                                          mse, sizeof mse);
     }
   if (err)
     {
       log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
       goto leave;
     }
 
   if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits >= 2048)
     {
       exmode = 1;
       le_value = prkdf->keynbits / 8;
     }
   else
     {
       exmode = 0;
       le_value = 0;
     }
 
   err = iso7816_compute_ds (app_get_slot (app),
                             exmode, indata, indatalen,
                             le_value, outdata, outdatalen);
 
  leave:
   xfree (indata_buffer);
   return err;
 }
 
 
 /* Handler for the PKAUTH command.
 
    This is basically the same as the PKSIGN command but we first check
    that the requested key is suitable for authentication; that is, it
    must match the criteria used for the attribute $AUTHKEYID.  See
    do_sign for calling conventions; there is no HASHALGO, though. */
 static gpg_error_t
 do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
          gpg_error_t (*pincb)(void*, const char *, char **),
          void *pincb_arg,
          const void *indata, size_t indatalen,
          unsigned char **outdata, size_t *outdatalen )
 {
   gpg_error_t err;
   prkdf_object_t prkdf;
   int algo;
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
   if (err)
     return err;
   if (!(prkdf->usageflags.sign || prkdf->gpgusage.auth))
     {
       log_error ("p15: key %s may not be used for authentication\n", keyidstr);
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
   algo = indatalen == 36? MD_USER_TLS_MD5SHA1 : GCRY_MD_SHA1;
   return do_sign (app, ctrl, keyidstr, algo, pincb, pincb_arg,
                   indata, indatalen, outdata, outdatalen);
 }
 
 
 /* Handler for the PKDECRYPT command.  Decrypt the data in INDATA and
  * return the allocated result in OUTDATA.  If a PIN is required the
  * PINCB will be used to ask for the PIN; it should return the PIN in
  * an allocated buffer and put it into PIN.  */
 static gpg_error_t
 do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
              gpg_error_t (*pincb)(void*, const char *, char **),
              void *pincb_arg,
              const void *indata, size_t indatalen,
              unsigned char **outdata, size_t *outdatalen,
              unsigned int *r_info)
 {
   gpg_error_t err;
   prkdf_object_t prkdf;    /* The private key object. */
   aodf_object_t aodf;      /* The associated authentication object. */
   int exmode, le_value, padind;
 
   (void)ctrl;
   (void)r_info;
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
   if (!indatalen || !indata || !outdatalen || !outdata)
     return gpg_error (GPG_ERR_INV_ARG);
 
   err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
   if (err)
     return err;
   if (!(prkdf->usageflags.decrypt
         || prkdf->usageflags.unwrap
         || prkdf->gpgusage.encr     ))
     {
       log_error ("p15: key %s may not be used for decryption\n", keyidstr);
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
   /* Find the authentication object to this private key object. */
   if (!prkdf->authid)
     {
       log_error ("p15: no authentication object defined for %s\n", keyidstr);
       /* fixme: we might want to go ahead and do without PIN
          verification. */
       return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
     }
   for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
     if (aodf->objidlen == prkdf->authidlen
         && !memcmp (aodf->objid, prkdf->authid, prkdf->authidlen))
       break;
   if (!aodf)
     log_info ("p15: no authentication for %s needed\n", keyidstr);
 
   /* We need some more info about the key - get the keygrip to
    * populate these fields.  */
   err = keygrip_from_prkdf (app, prkdf);
   if (err)
     {
       log_error ("p15: keygrip_from_prkdf failed: %s\n", gpg_strerror (err));
       return err;
     }
 
   /* Verify the PIN.  */
   err = prepare_verify_pin (app, keyidstr, prkdf, aodf);
   if (!err)
     err = verify_pin (app, pincb, pincb_arg, prkdf, aodf);
   if (err)
     return err;
 
   if (prkdf->is_ecc && IS_CARDOS_5(app))
     {
 
       err = iso7816_manage_security_env (app_get_slot (app), 0xF3, 0x01,
                                          NULL, 0);
       if (err)
         {
           log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
           return err;
         }
     }
 
 
   /* The next is guess work for CardOS.  */
   if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
     {
       /* From analyzing an USB trace of a Windows signing application
        * we see that the SE is simply reset to 0x14.  It seems to be
        * sufficient to do this for decryption; signing still works
        * with the standard code despite that our trace showed that
        * there the SE is restored to 0x09.  Note that the special
        * D-Trust AID is in any case select by prepare_verify_pin.
        *
        * Hey, D-Trust please hand over the specs so that you can
        * actually sell your cards and we can properly implement it;
        * other vendors understand this and do not demand ridiculous
        * paper work or complicated procedures to get samples.  */
       err = iso7816_manage_security_env (app_get_slot (app),
                                          0xF3, 0x14, NULL, 0);
 
     }
   else if (prkdf->key_reference_valid)
     {
       unsigned char mse[9];
       int i;
 
       /* Note: This works with CardOS but the D-Trust card has the
        * problem that the next created signature would be broken.  */
 
       i = 0;
       if (!prkdf->is_ecc)
         {
           mse[i++] = 0x80; /* Algorithm reference.  */
           mse[i++] = 1;
           mse[i++] = 0x0a; /* RSA, no padding.  */
         }
       mse[i++] = 0x84; /* Key reference.  */
       mse[i++] = 1;
       mse[i++] = prkdf->key_reference;
       if (prkdf->is_ecc && IS_CARDOS_5(app))
         {
           mse[i++] = 0x95; /* ???.  */
           mse[i++] = 1;
           mse[i++] = 0x40;
         }
       log_assert (i <= DIM(mse));
       err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB8,
                                          mse, i);
     }
   /* Check for MSE error.  */
   if (err)
     {
       log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
       return err;
     }
 
   exmode = le_value = 0;
   padind = 0;
   if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits >= 2048)
     {
       exmode = 1;   /* Extended length w/o a limit.  */
       le_value = prkdf->keynbits / 8;
     }
 
   if (app->app_local->card_product == CARD_PRODUCT_DTRUST)
     padind = 0x81;
 
   if (prkdf->is_ecc && IS_CARDOS_5(app))
     {
       if ((indatalen & 1) && *(const char *)indata == 0x04)
         {
           /* Strip indicator byte.  */
           indatalen--;
           indata = (const char *)indata + 1;
         }
       err = iso7816_pso_csv (app_get_slot (app), exmode,
                              indata, indatalen,
                              le_value,
                              outdata, outdatalen);
     }
   else
     {
       err = iso7816_decipher (app_get_slot (app), exmode,
                               indata, indatalen,
                               le_value, padind,
                               outdata, outdatalen);
     }
 
   return err;
 }
 
 
 /* Perform a simple verify operation for the PIN specified by
  * KEYIDSTR.  Note that we require a key reference which is then used
  * to select the authentication object.  Return GPG_ERR_NO_PIN if a
  * PIN is not required for using the private key KEYIDSTR.  */
 static gpg_error_t
 do_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
               gpg_error_t (*pincb)(void*, const char *, char **),
               void *pincb_arg)
 {
   gpg_error_t err;
   prkdf_object_t prkdf;    /* The private key object. */
   aodf_object_t aodf;      /* The associated authentication object. */
 
   (void)ctrl;
 
   if (!keyidstr || !*keyidstr)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   err = prkdf_object_from_keyidstr (app, keyidstr, &prkdf);
   if (err
       && gpg_err_code (err) != GPG_ERR_INV_ID
       && gpg_err_code (err) != GPG_ERR_NOT_FOUND)
     return err;
 
   if (err) /* Not found or invalid - assume it is the label.  */
     {
       prkdf = NULL;
       for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
         if (aodf->label && !ascii_strcasecmp (aodf->label, keyidstr))
           break;
       if (!aodf)
         return err;  /* Re-use the original error code.  */
     }
   else /* Find the authentication object to this private key object. */
     {
       if (!prkdf->authid)
         {
           log_error ("p15: no authentication object defined for %s\n",
                      keyidstr);
           return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
         }
       for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
         if (aodf->objidlen == prkdf->authidlen
             && !memcmp (aodf->objid, prkdf->authid, prkdf->authidlen))
           break;
       if (!aodf) /* None found.  */
         return gpg_error (GPG_ERR_NO_PIN);
     }
 
   err = prepare_verify_pin (app, keyidstr, prkdf, aodf);
   if (!err)
     err = verify_pin (app, pincb, pincb_arg, prkdf, aodf);
 
   return err;
 }
 
 
 /* Process the various keygrip based info requests.  */
 static gpg_error_t
 do_with_keygrip (app_t app, ctrl_t ctrl, int action,
                  const char *want_keygripstr, int capability)
 {
   gpg_error_t err;
   char *serialno = NULL;
   int as_data = 0;
   prkdf_object_t prkdf;
 
   /* First a quick check for valid parameters.  */
   switch (action)
     {
     case KEYGRIP_ACTION_LOOKUP:
       if (!want_keygripstr)
         {
           err = gpg_error (GPG_ERR_NOT_FOUND);
           goto leave;
         }
       break;
     case KEYGRIP_ACTION_SEND_DATA:
       as_data = 1;
       break;
     case KEYGRIP_ACTION_WRITE_STATUS:
       break;
     default:
       err = gpg_error (GPG_ERR_INV_ARG);
       goto leave;
     }
 
   /* Allocate the s/n string if needed.  */
   if (action != KEYGRIP_ACTION_LOOKUP)
     {
       serialno = app_get_serialno (app);
       if (!serialno)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
     }
 
   for (prkdf = app->app_local->private_key_info;
        prkdf; prkdf = prkdf->next)
     {
       if (keygrip_from_prkdf (app, prkdf))
         continue;
 
       if (action == KEYGRIP_ACTION_LOOKUP)
         {
           if (!strcmp (prkdf->keygrip, want_keygripstr))
             {
               err = 0; /* Found */
               goto leave;
             }
         }
       else if (!want_keygripstr || !strcmp (prkdf->keygrip, want_keygripstr))
         {
           char *keyref;
 
           if (capability == GCRY_PK_USAGE_SIGN)
             {
               if (!(prkdf->usageflags.sign || prkdf->usageflags.sign_recover
                     || prkdf->usageflags.non_repudiation))
                 continue;
             }
           else if (capability == GCRY_PK_USAGE_ENCR)
             {
               if (!(prkdf->usageflags.decrypt || prkdf->usageflags.unwrap))
                 continue;
             }
           else if (capability == GCRY_PK_USAGE_AUTH)
             {
               if (!(prkdf->usageflags.sign || prkdf->usageflags.sign_recover))
                 continue;
             }
 
           keyref = keyref_from_prkdf (app, prkdf);
           if (!keyref)
             {
               err = gpg_error_from_syserror ();
               goto leave;
             }
 
-          send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref);
+          send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref, NULL);
           xfree (keyref);
           if (want_keygripstr)
             {
               err = 0; /* Found */
               goto leave;
             }
         }
     }
 
   /* Return an error so that the dispatcher keeps on looping over the
    * other applications.  For clarity we use a different error code
    * when listing all keys.  Note that in lookup mode WANT_KEYGRIPSTR
    * is not NULL.  */
   if (!want_keygripstr)
     err = gpg_error (GPG_ERR_TRUE);
   else
     err = gpg_error (GPG_ERR_NOT_FOUND);
 
  leave:
   xfree (serialno);
   return err;
 }
 
 
 
 /* Assume that EF(DIR) has been selected.  Read its content and figure
    out the home EF of pkcs#15.  Return that home DF or 0 if not found
    and the value at the address of BELPIC indicates whether it was
    found by the belpic aid. */
 static unsigned short
 read_home_df (int slot, int *r_belpic)
 {
   gpg_error_t err;
   unsigned char *buffer;
   const unsigned char *p, *pp;
   size_t buflen, n, nn;
   unsigned short result = 0;
 
   *r_belpic = 0;
 
   err = iso7816_read_binary (slot, 0, 0, &buffer, &buflen);
   if (err)
     {
       log_error ("p15: error reading EF(DIR): %s\n", gpg_strerror (err));
       return 0;
     }
 
   /* FIXME: We need to scan all records. */
   p = find_tlv (buffer, buflen, 0x61, &n);
   if (p && n)
     {
       pp = find_tlv (p, n, 0x4f, &nn);
       if (pp && ((nn == sizeof pkcs15_aid && !memcmp (pp, pkcs15_aid, nn))
                  || (*r_belpic = (nn == sizeof pkcs15be_aid
                                   && !memcmp (pp, pkcs15be_aid, nn)))))
         {
           pp = find_tlv (p, n, 0x50, &nn);
           if (pp && opt.verbose)
             log_info ("p15: application label from EF(DIR) is '%.*s'\n",
                       (int)nn, pp);
           pp = find_tlv (p, n, 0x51, &nn);
           if (pp && nn == 4 && *pp == 0x3f && !pp[1])
             {
               result = ((pp[2] << 8) | pp[3]);
               if (opt.verbose)
                 log_info ("p15: application directory is 0x%04hX\n", result);
             }
         }
     }
   xfree (buffer);
   return result;
 }
 
 
 /*
    Select the PKCS#15 application on the card in SLOT.
  */
 gpg_error_t
 app_select_p15 (app_t app)
 {
   int slot = app_get_slot (app);
   int rc;
   unsigned short def_home_df = 0;
   card_type_t card_type = CARD_TYPE_UNKNOWN;
   int direct = 0;
   int is_belpic = 0;
   unsigned char *fci = NULL;
   size_t fcilen;
 
   rc = iso7816_select_application_ext (slot, pkcs15_aid, sizeof pkcs15_aid, 1,
                                        &fci, &fcilen);
   if (rc)
     { /* Not found: Try to locate it from 2F00.  We use direct path
          selection here because it seems that the Belgian eID card
          does only allow for that.  Many other cards supports this
          selection method too.  Note, that we don't use
          select_application above for the Belgian card - the call
          works but it seems that it does not switch to the correct DF.
          Using the 2f02 just works. */
       unsigned short path[1] = { 0x2f00 };
 
       rc = iso7816_select_path (slot, path, 1, 0);
       if (!rc)
         {
           direct = 1;
           def_home_df = read_home_df (slot, &is_belpic);
           if (def_home_df)
             {
               path[0] = def_home_df;
               rc = iso7816_select_path (slot, path, 1, 0);
             }
         }
     }
   if (rc)
     { /* Still not found:  Try the default DF. */
       def_home_df = DEFAULT_HOME_DF;
       rc = iso7816_select_file (slot, def_home_df, 1);
     }
   if (!rc)
     {
       /* Determine the type of the card.  The general case is to look
          it up from the ATR table.  For the Belgian eID card we know
          it instantly from the AID. */
       if (is_belpic)
         {
           card_type = CARD_TYPE_BELPIC;
         }
       else
         {
           unsigned char *atr;
           size_t atrlen;
           int i;
 
           atr = apdu_get_atr (app_get_slot (app), &atrlen);
           if (!atr)
             rc = gpg_error (GPG_ERR_INV_CARD);
           else
             {
               for (i=0; card_atr_list[i].atrlen; i++)
                 if (card_atr_list[i].atrlen == atrlen
                     && !memcmp (card_atr_list[i].atr, atr, atrlen))
                   {
                     card_type = card_atr_list[i].type;
                     break;
                   }
               xfree (atr);
             }
         }
     }
   if (!rc)
     {
       app->apptype = APPTYPE_P15;
 
       app->app_local = xtrycalloc (1, sizeof *app->app_local);
       if (!app->app_local)
         {
           rc = gpg_error_from_syserror ();
           goto leave;
         }
 
       /* Set the home DF from the FCI returned by the select.  */
       if (!def_home_df && fci)
         {
           const unsigned char *s;
           size_t n;
 
           s = find_tlv (fci, fcilen, 0x83, &n);
           if (s && n == 2)
             def_home_df = buf16_to_ushort (s);
           else
             {
               if (fcilen)
                 log_printhex (fci, fcilen, "fci:");
               log_info ("p15: select did not return the DF - using default\n");
               def_home_df = DEFAULT_HOME_DF;
             }
         }
       app->app_local->home_df = def_home_df;
 
       /* Store the card type.  FIXME: We might want to put this into
          the common APP structure. */
       app->app_local->card_type = card_type;
 
       app->app_local->card_product = CARD_PRODUCT_UNKNOWN;
 
       /* Store whether we may and should use direct path selection. */
       switch (card_type)
         {
         case CARD_TYPE_CARDOS_50:
         case CARD_TYPE_CARDOS_53:
           direct = 1;
           break;
         case CARD_TYPE_AET:
           app->app_local->no_extended_mode = 1;
           break;
         default:
           /* Use whatever has been determined above.  */
           break;
         }
       app->app_local->direct_path_selection = direct;
 
       /* Read basic information and thus check whether this is a real
          card.  */
       rc = read_p15_info (app);
       if (rc)
         goto leave;
 
       /* Special serial number munging.  We need to check for a German
          prototype card right here because we need to access to
          EF(TokenInfo).  We mark such a serial number by the using a
          prefix of FF0100. */
       if (APP_CARD(app)->serialnolen == 12
           && !memcmp (APP_CARD(app)->serialno,
                       "\xD2\x76\0\0\0\0\0\0\0\0\0\0", 12))
         {
           /* This is a German card with a silly serial number.  Try to get
              the serial number from the EF(TokenInfo). . */
           unsigned char *p;
 
           /* FIXME: actually get it from EF(TokenInfo). */
 
           p = xtrymalloc (3 + APP_CARD(app)->serialnolen);
           if (!p)
             rc = gpg_error (gpg_err_code_from_errno (errno));
           else
             {
               memcpy (p, "\xff\x01", 3);
               memcpy (p+3, APP_CARD(app)->serialno, APP_CARD(app)->serialnolen);
               APP_CARD(app)->serialnolen += 3;
               xfree (APP_CARD(app)->serialno);
               APP_CARD(app)->serialno = p;
             }
         }
 
       app->fnc.deinit = do_deinit;
       app->fnc.prep_reselect = NULL;
       app->fnc.reselect = NULL;
       app->fnc.learn_status = do_learn_status;
       app->fnc.readcert = do_readcert;
       app->fnc.getattr = do_getattr;
       app->fnc.setattr = NULL;
       app->fnc.genkey = NULL;
       app->fnc.sign = do_sign;
       app->fnc.auth = do_auth;
       app->fnc.decipher = do_decipher;
       app->fnc.change_pin = NULL;
       app->fnc.check_pin = do_check_pin;
       app->fnc.with_keygrip = do_with_keygrip;
 
     leave:
       if (rc)
         do_deinit (app);
    }
 
   xfree (fci);
   return rc;
 }
diff --git a/scd/command.c b/scd/command.c
index 925fd7597..ec6989a4d 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1,2130 +1,2131 @@
 /* command.c - SCdaemon command handler
  * Copyright (C) 2001, 2002, 2003, 2004, 2005,
  *               2007, 2008, 2009, 2011  Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <signal.h>
 #ifdef USE_NPTH
 # include <npth.h>
 #endif
 
 #include "scdaemon.h"
 #include <assuan.h>
 #include <ksba.h>
 #include "iso7816.h"
 #include "apdu.h" /* Required for apdu_*_reader (). */
 #include "atr.h"
 #include "../common/asshelp.h"
 #include "../common/server-help.h"
 
 /* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN */
 #define MAXLEN_PIN 100
 
 /* Maximum allowed size of key data as used in inquiries. */
 #define MAXLEN_KEYDATA 4096
 
 /* Maximum allowed total data size for SETDATA.  */
 #define MAXLEN_SETDATA 4096
 
 /* Maximum allowed size of certificate data as used in inquiries. */
 #define MAXLEN_CERTDATA 16384
 
 
 #define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
 
 #define IS_LOCKED(c) (locked_session && locked_session != (c)->server_local)
 
 
 /* Data used to associate an Assuan context with local server data.
    This object describes the local properties of one session.  */
 struct server_local_s
 {
   /* We keep a list of all active sessions with the anchor at
      SESSION_LIST (see below).  This field is used for linking. */
   struct server_local_s *next_session;
 
   /* This object is usually assigned to a CTRL object (which is
      globally visible).  While enumerating all sessions we sometimes
      need to access data of the CTRL object; thus we keep a
      backpointer here. */
   ctrl_t ctrl_backlink;
 
   /* The Assuan context used by this session/server. */
   assuan_context_t assuan_ctx;
 
 #ifdef HAVE_W32_SYSTEM
   void *event_signal;           /* Or NULL if not used. */
 #else
   int event_signal;             /* Or 0 if not used. */
 #endif
 
   /* True if the card has been removed and a reset is required to
      continue operation. */
   int card_removed;
 
   /* If set to true we will be terminate ourself at the end of the
      this session.  */
   int stopme;
 
 };
 
 
 /* To keep track of all running sessions, we link all active server
    contexts and the anchor in this variable.  */
 static struct server_local_s *session_list;
 
 /* If a session has been locked we store a link to its server object
    in this variable. */
 static struct server_local_s *locked_session;
 
 
 /* Convert the STRING into a newly allocated buffer while translating
    the hex numbers.  Stops at the first invalid character.  Blanks and
    colons are allowed to separate the hex digits.  Returns NULL on
    error or a newly malloced buffer and its length in LENGTH.  */
 static unsigned char *
 hex_to_buffer (const char *string, size_t *r_length)
 {
   unsigned char *buffer;
   const char *s;
   size_t n;
 
   buffer = xtrymalloc (strlen (string)+1);
   if (!buffer)
     return NULL;
   for (s=string, n=0; *s; s++)
     {
       if (spacep (s) || *s == ':')
         continue;
       if (hexdigitp (s) && hexdigitp (s+1))
         {
           buffer[n++] = xtoi_2 (s);
           s++;
         }
       else
         break;
     }
   *r_length = n;
   return buffer;
 }
 
 
 
 /* Reset the card and free the application context.  With SEND_RESET
    set to true actually send a RESET to the reader; this is the normal
    way of calling the function.  If KEEP_LOCK is set and the session
    is locked that lock wil not be released.  */
 static void
 do_reset (ctrl_t ctrl, int send_reset, int keep_lock)
 {
   app_t app = ctrl->app_ctx;
 
   if (app)
     app_reset (app, ctrl, IS_LOCKED (ctrl)? 0: send_reset);
 
   /* If we hold a lock, unlock now. */
   if (!keep_lock && locked_session && ctrl->server_local == locked_session)
     {
       locked_session = NULL;
       log_info ("implicitly unlocking due to RESET\n");
     }
 }
 
 static gpg_error_t
 reset_notify (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
 
   do_reset (ctrl, 1, has_option (line, "--keep-lock"));
   return 0;
 }
 
 
 static gpg_error_t
 option_handler (assuan_context_t ctx, const char *key, const char *value)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
 
   if (!strcmp (key, "event-signal"))
     {
       /* A value of 0 is allowed to reset the event signal. */
 #ifdef HAVE_W32_SYSTEM
       if (!*value)
         return gpg_error (GPG_ERR_ASS_PARAMETER);
 #ifdef _WIN64
       ctrl->server_local->event_signal = (void *)strtoull (value, NULL, 16);
 #else
       ctrl->server_local->event_signal = (void *)strtoul (value, NULL, 16);
 #endif
 #else
       int i = *value? atoi (value) : -1;
       if (i < 0)
         return gpg_error (GPG_ERR_ASS_PARAMETER);
       ctrl->server_local->event_signal = i;
 #endif
     }
 
  return 0;
 }
 
 
 /* If the card has not yet been opened, do it.  */
 static gpg_error_t
 open_card (ctrl_t ctrl)
 {
   /* If we ever got a card not present error code, return that.  Only
      the SERIALNO command and a reset are able to clear from that
      state. */
   if (ctrl->server_local->card_removed)
     return gpg_error (GPG_ERR_CARD_REMOVED);
 
   if ( IS_LOCKED (ctrl) )
     return gpg_error (GPG_ERR_LOCKED);
 
   if (ctrl->app_ctx)
     return 0;
 
   return select_application (ctrl, NULL, &ctrl->app_ctx, 0, NULL, 0);
 }
 
 /* Explicitly open a card for a specific use of APPTYPE or SERIALNO.  */
 static gpg_error_t
 open_card_with_request (ctrl_t ctrl, const char *apptype, const char *serialno)
 {
   gpg_error_t err;
   unsigned char *serialno_bin = NULL;
   size_t serialno_bin_len = 0;
   app_t app = ctrl->app_ctx;
 
   /* If we are already initialized for one specific application we
      need to check that the client didn't requested a specific
      application different from the one in use before we continue. */
   if (apptype && ctrl->app_ctx)
     return check_application_conflict (apptype, ctrl->app_ctx);
 
   /* Re-scan USB devices.  Release APP, before the scan.  */
   ctrl->app_ctx = NULL;
   release_application (app, 0);
 
   if (serialno)
     serialno_bin = hex_to_buffer (serialno, &serialno_bin_len);
 
   err = select_application (ctrl, apptype, &ctrl->app_ctx, 1,
                             serialno_bin, serialno_bin_len);
   xfree (serialno_bin);
 
   return err;
 }
 
 
 static const char hlp_serialno[] =
   "SERIALNO [--demand=<serialno>] [<apptype>]\n"
   "\n"
   "Return the serial number of the card using a status response.  This\n"
   "function should be used to check for the presence of a card.\n"
   "\n"
   "If --demand is given, an application on the card with SERIALNO is\n"
   "selected and an error is returned if no such card available.\n"
   "\n"
   "If APPTYPE is given, an application of that type is selected and an\n"
   "error is returned if the application is not supported or available.\n"
   "The default is to auto-select the application using a hardwired\n"
   "preference system.  Note, that a future extension to this function\n"
   "may enable specifying a list and order of applications to try.\n"
   "\n"
   "This function is special in that it can be used to reset the card.\n"
   "Most other functions will return an error when a card change has\n"
   "been detected and the use of this function is therefore required.\n"
   "\n"
   "Background: We want to keep the client clear of handling card\n"
   "changes between operations; i.e. the client can assume that all\n"
   "operations are done on the same card unless he calls this function.";
 static gpg_error_t
 cmd_serialno (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   struct server_local_s *sl;
   int rc = 0;
   char *serial;
   const char *demand;
 
   if ( IS_LOCKED (ctrl) )
     return gpg_error (GPG_ERR_LOCKED);
 
   if ((demand = has_option_name (line, "--demand")))
     {
       if (*demand != '=')
         return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
       line = (char *)++demand;
       for (; *line && !spacep (line); line++)
         ;
       if (*line)
         *line++ = 0;
     }
   else
     demand = NULL;
 
   line = skip_options (line);
 
   /* Clear the remove flag so that the open_card is able to reread it.  */
   if (ctrl->server_local->card_removed)
     ctrl->server_local->card_removed = 0;
 
   if ((rc = open_card_with_request (ctrl, *line? line:NULL, demand)))
     {
       ctrl->server_local->card_removed = 1;
       return rc;
     }
 
   /* Success, clear the card_removed flag for all sessions.  */
   for (sl=session_list; sl; sl = sl->next_session)
     {
       ctrl_t c = sl->ctrl_backlink;
 
       if (c != ctrl)
         c->server_local->card_removed = 0;
     }
 
   serial = app_get_serialno (ctrl->app_ctx);
   if (!serial)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   rc = assuan_write_status (ctx, "SERIALNO", serial);
   xfree (serial);
   return rc;
 }
 
 
 static const char hlp_learn[] =
   "LEARN [--force] [--keypairinfo]\n"
   "\n"
   "Learn all useful information of the currently inserted card.  When\n"
   "used without the force options, the command might do an INQUIRE\n"
   "like this:\n"
   "\n"
   "   INQUIRE KNOWNCARDP <hexstring_with_serialNumber>\n"
   "\n"
   "The client should just send an \"END\" if the processing should go on\n"
   "or a \"CANCEL\" to force the function to terminate with a Cancel\n"
   "error message.\n"
   "\n"
   "With the option --keypairinfo only KEYPARIINFO status lines are\n"
   "returned.\n"
   "\n"
   "The response of this command is a list of status lines formatted as\n"
   "this:\n"
   "\n"
   "  S APPTYPE <apptype>\n"
   "\n"
   "This returns the type of the application, currently the strings:\n"
   "\n"
   "    P15     = PKCS-15 structure used\n"
   "    DINSIG  = DIN SIG\n"
   "    OPENPGP = OpenPGP card\n"
   "    PIV     = PIV card\n"
   "    NKS     = NetKey card\n"
   "\n"
   "are implemented.  These strings are aliases for the AID\n"
   "\n"
   "  S KEYPAIRINFO <hexstring_with_keygrip> <hexstring_with_id>\n"
   "\n"
   "If there is no certificate yet stored on the card a single 'X' is\n"
   "returned as the keygrip.  In addition to the keypair info, information\n"
   "about all certificates stored on the card is also returned:\n"
   "\n"
   "  S CERTINFO <certtype> <hexstring_with_id>\n"
   "\n"
   "Where CERTTYPE is a number indicating the type of certificate:\n"
   "   0   := Unknown\n"
   "   100 := Regular X.509 cert\n"
   "   101 := Trusted X.509 cert\n"
   "   102 := Useful X.509 cert\n"
   "   110 := Root CA cert in a special format (e.g. DINSIG)\n"
   "   111 := Root CA cert as standard X509 cert.\n"
   "\n"
   "For certain cards, more information will be returned:\n"
   "\n"
   "  S KEY-FPR <no> <hexstring>\n"
   "\n"
   "For OpenPGP cards this returns the stored fingerprints of the\n"
   "keys. This can be used check whether a key is available on the\n"
   "card.  NO may be 1, 2 or 3.\n"
   "\n"
   "  S CA-FPR <no> <hexstring>\n"
   "\n"
   "Similar to above, these are the fingerprints of keys assumed to be\n"
   "ultimately trusted.\n"
   "\n"
   "  S DISP-NAME <name_of_card_holder>\n"
   "\n"
   "The name of the card holder as stored on the card; percent\n"
   "escaping takes place, spaces are encoded as '+'\n"
   "\n"
   "  S PUBKEY-URL <url>\n"
   "\n"
   "The URL to be used for locating the entire public key.\n"
   "  \n"
   "Note, that this function may even be used on a locked card.";
 static gpg_error_t
 cmd_learn (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc = 0;
   int only_keypairinfo = has_option (line, "--keypairinfo");
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   /* Unless the force option is used we try a shortcut by identifying
      the card using a serial number and inquiring the client with
      that. The client may choose to cancel the operation if he already
      knows about this card */
   if (!only_keypairinfo)
     {
       const char *reader;
       char *serial;
       app_t app = ctrl->app_ctx;
 
       if (!app)
         return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
       reader = apdu_get_reader_name (app->slot);
       if (!reader)
         return out_of_core ();
       send_status_direct (ctrl, "READER", reader);
       /* No need to free the string of READER.  */
 
       serial = app_get_serialno (ctrl->app_ctx);
       if (!serial)
 	return gpg_error (GPG_ERR_INV_VALUE);
 
       rc = assuan_write_status (ctx, "SERIALNO", serial);
       if (rc < 0)
         {
           xfree (serial);
           return out_of_core ();
         }
 
       if (!has_option (line, "--force"))
         {
           char *command;
 
           rc = gpgrt_asprintf (&command, "KNOWNCARDP %s", serial);
           if (rc < 0)
             {
               xfree (serial);
               return out_of_core ();
             }
           rc = assuan_inquire (ctx, command, NULL, NULL, 0);
           xfree (command);
           if (rc)
             {
               if (gpg_err_code (rc) != GPG_ERR_ASS_CANCELED)
                 log_error ("inquire KNOWNCARDP failed: %s\n",
                            gpg_strerror (rc));
               xfree (serial);
               return rc;
             }
           /* Not canceled, so we have to proceed.  */
         }
       xfree (serial);
     }
 
   /* Let the application print out its collection of useful status
      information. */
   if (!rc)
     rc = app_write_learn_status (ctrl->app_ctx, ctrl, only_keypairinfo);
 
   return rc;
 }
 
 
 
 static const char hlp_readcert[] =
   "READCERT <hexified_certid>|<keyid>\n"
   "\n"
   "Note, that this function may even be used on a locked card.";
 static gpg_error_t
 cmd_readcert (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   unsigned char *cert;
   size_t ncert;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   line = xstrdup (line); /* Need a copy of the line. */
   rc = app_readcert (ctrl->app_ctx, ctrl, line, &cert, &ncert);
   if (rc)
     log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
   xfree (line);
   line = NULL;
   if (!rc)
     {
       rc = assuan_send_data (ctx, cert, ncert);
       xfree (cert);
       if (rc)
         return rc;
     }
 
   return rc;
 }
 
 
 static const char hlp_readkey[] =
   "READKEY [--advanced] [--info[-only]] <keyid>\n"
   "\n"
   "Return the public key for the given cert or key ID as a standard\n"
   "S-expression.  With --advanced  the S-expression is returned in\n"
   "advanced format.  With --info a KEYPAIRINFO status line is also\n"
   "emitted; with --info-only the regular output is suppressed.";
 static gpg_error_t
 cmd_readkey (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   int advanced = 0;
   int opt_info = 0;
   int opt_nokey = 0;
   unsigned char *cert = NULL;
   size_t ncert;
   unsigned char *pk;
   size_t pklen;
   int direct_readkey = 0;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (has_option (line, "--advanced"))
     advanced = 1;
   if (has_option (line, "--info"))
     opt_info = 1;
   if (has_option (line, "--info-only"))
     opt_info = opt_nokey = 1;
 
   line = skip_options (line);
   line = xstrdup (line); /* Need a copy of the line. */
 
   /* If the application supports the READKEY function we use that.
      Otherwise we use the old way by extracting it from the
      certificate.  */
   rc = app_readkey (ctrl->app_ctx, ctrl, advanced, line, &pk, &pklen);
   if (!rc)
     direct_readkey = 1; /* Yeah, got that key - send it back.  */
   else if (gpg_err_code (rc) == GPG_ERR_UNSUPPORTED_OPERATION
            || gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
     {
       /* Fall back to certificate reading.  */
       rc = app_readcert (ctrl->app_ctx, ctrl, line, &cert, &ncert);
       if (rc)
         log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
       else
         {
           rc = app_help_pubkey_from_cert (cert, ncert, &pk, &pklen);
           if (rc)
             log_error ("failed to parse the certificate: %s\n",
                        gpg_strerror (rc));
         }
     }
   else
     log_error ("app_readkey failed: %s\n", gpg_strerror (rc));
 
   if (!rc && pk && pklen && opt_info && !direct_readkey)
     {
       char keygripstr[KEYGRIP_LEN*2+1];
       char *algostr;
 
       rc = app_help_get_keygrip_string_pk (pk, pklen,
                                            keygripstr, NULL, NULL,
                                            &algostr);
       if (rc)
         {
           log_error ("app_help_get_keygrip_string failed: %s\n",
                      gpg_strerror (rc));
           goto leave;
         }
 
       /* FIXME: Using LINE is not correct because it might be an
        * OID and has not been canonicalized (i.e. uppercased).  */
       send_status_info (ctrl, "KEYPAIRINFO",
                         keygripstr, strlen (keygripstr),
                         line, strlen (line),
                         "-", (size_t)1,
                         "-", (size_t)1,
                         algostr, strlen (algostr),
                         NULL, (size_t)0);
       xfree (algostr);
     }
 
 
   if (!rc && pk && pklen && !opt_nokey)
     rc = assuan_send_data (ctx, pk, pklen);
 
  leave:
   xfree (cert);
   xfree (pk);
   xfree (line);
   return rc;
 }
 
 
 
 static const char hlp_setdata[] =
   "SETDATA [--append] <hexstring>\n"
   "\n"
   "The client should use this command to tell us the data he want to sign.\n"
   "With the option --append, the data is appended to the data set by a\n"
   "previous SETDATA command.";
 static gpg_error_t
 cmd_setdata (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int append;
   int n, i, off;
   char *p;
   unsigned char *buf;
 
   append = (ctrl->in_data.value && has_option (line, "--append"));
 
   line = skip_options (line);
 
   if (locked_session && locked_session != ctrl->server_local)
     return gpg_error (GPG_ERR_LOCKED);
 
   /* Parse the hexstring. */
   for (p=line,n=0; hexdigitp (p); p++, n++)
     ;
   if (*p)
     return set_error (GPG_ERR_ASS_PARAMETER, "invalid hexstring");
   if (!n)
     return set_error (GPG_ERR_ASS_PARAMETER, "no data given");
   if ((n&1))
     return set_error (GPG_ERR_ASS_PARAMETER, "odd number of digits");
   n /= 2;
   if (append)
     {
       if (ctrl->in_data.valuelen + n > MAXLEN_SETDATA)
         return set_error (GPG_ERR_TOO_LARGE,
                           "limit on total size of data reached");
       buf = xtrymalloc (ctrl->in_data.valuelen + n);
     }
   else
     buf = xtrymalloc (n);
   if (!buf)
     return out_of_core ();
 
   if (append)
     {
       memcpy (buf, ctrl->in_data.value, ctrl->in_data.valuelen);
       off = ctrl->in_data.valuelen;
     }
   else
     off = 0;
   for (p=line, i=0; i < n; p += 2, i++)
     buf[off+i] = xtoi_2 (p);
 
   xfree (ctrl->in_data.value);
   ctrl->in_data.value = buf;
   ctrl->in_data.valuelen = off+n;
   return 0;
 }
 
 
 
 static gpg_error_t
 pin_cb (void *opaque, const char *info, char **retstr)
 {
   assuan_context_t ctx = opaque;
   char *command;
   int rc;
   unsigned char *value;
   size_t valuelen;
 
   if (!retstr)
     {
       /* We prompt for pinpad entry.  To make sure that the popup has
          been show we use an inquire and not just a status message.
          We ignore any value returned.  */
       if (info)
         {
           log_debug ("prompting for pinpad entry '%s'\n", info);
           rc = gpgrt_asprintf (&command, "POPUPPINPADPROMPT %s", info);
           if (rc < 0)
             return gpg_error (gpg_err_code_from_errno (errno));
           rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
           xfree (command);
         }
       else
         {
           log_debug ("dismiss pinpad entry prompt\n");
           rc = assuan_inquire (ctx, "DISMISSPINPADPROMPT",
                                &value, &valuelen, MAXLEN_PIN);
         }
       if (!rc)
         xfree (value);
       return rc;
     }
 
   *retstr = NULL;
   log_debug ("asking for PIN '%s'\n", info);
 
   rc = gpgrt_asprintf (&command, "NEEDPIN %s", info);
   if (rc < 0)
     return gpg_error (gpg_err_code_from_errno (errno));
 
   /* Fixme: Write an inquire function which returns the result in
      secure memory and check all further handling of the PIN. */
   assuan_begin_confidential (ctx);
   rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
   assuan_end_confidential (ctx);
   xfree (command);
   if (rc)
     return rc;
 
   if (!valuelen || value[valuelen-1])
     {
       /* We require that the returned value is an UTF-8 string */
       xfree (value);
       return gpg_error (GPG_ERR_INV_RESPONSE);
     }
   *retstr = (char*)value;
   return 0;
 }
 
 
 static const char hlp_pksign[] =
   "PKSIGN [--hash=[rmd160|sha{1,224,256,384,512}|md5]] <hexified_id>\n"
   "\n"
   "The --hash option is optional; the default is SHA1.";
 static gpg_error_t
 cmd_pksign (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   unsigned char *outdata;
   size_t outdatalen;
   char *keyidstr;
   int hash_algo;
 
   if (has_option (line, "--hash=rmd160"))
     hash_algo = GCRY_MD_RMD160;
   else if (has_option (line, "--hash=sha1"))
     hash_algo = GCRY_MD_SHA1;
   else if (has_option (line, "--hash=sha224"))
     hash_algo = GCRY_MD_SHA224;
   else if (has_option (line, "--hash=sha256"))
     hash_algo = GCRY_MD_SHA256;
   else if (has_option (line, "--hash=sha384"))
     hash_algo = GCRY_MD_SHA384;
   else if (has_option (line, "--hash=sha512"))
     hash_algo = GCRY_MD_SHA512;
   else if (has_option (line, "--hash=md5"))
     hash_algo = GCRY_MD_MD5;
   else if (!strstr (line, "--"))
     hash_algo = GCRY_MD_SHA1;
   else
     return set_error (GPG_ERR_ASS_PARAMETER, "invalid hash algorithm");
 
   line = skip_options (line);
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   /* We have to use a copy of the key ID because the function may use
      the pin_cb which in turn uses the assuan line buffer and thus
      overwriting the original line with the keyid */
   keyidstr = xtrystrdup (line);
   if (!keyidstr)
     return out_of_core ();
 
   rc = app_sign (ctrl->app_ctx, ctrl,
                  keyidstr, hash_algo,
                  pin_cb, ctx,
                  ctrl->in_data.value, ctrl->in_data.valuelen,
                  &outdata, &outdatalen);
 
   xfree (keyidstr);
   if (rc)
     {
       log_error ("app_sign failed: %s\n", gpg_strerror (rc));
     }
   else
     {
       rc = assuan_send_data (ctx, outdata, outdatalen);
       xfree (outdata);
       if (rc)
         return rc; /* that is already an assuan error code */
     }
 
   return rc;
 }
 
 
 static const char hlp_pkauth[] =
   "PKAUTH <hexified_id>";
 static gpg_error_t
 cmd_pkauth (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   unsigned char *outdata;
   size_t outdatalen;
   char *keyidstr;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
  /* We have to use a copy of the key ID because the function may use
      the pin_cb which in turn uses the assuan line buffer and thus
      overwriting the original line with the keyid */
   keyidstr = xtrystrdup (line);
   if (!keyidstr)
     return out_of_core ();
 
   rc = app_auth (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx,
                  ctrl->in_data.value, ctrl->in_data.valuelen,
                  &outdata, &outdatalen);
   xfree (keyidstr);
   if (rc)
     {
       log_error ("app_auth failed: %s\n", gpg_strerror (rc));
     }
   else
     {
       rc = assuan_send_data (ctx, outdata, outdatalen);
       xfree (outdata);
       if (rc)
         return rc; /* that is already an assuan error code */
     }
 
   return rc;
 }
 
 
 static const char hlp_pkdecrypt[] =
   "PKDECRYPT <hexified_id>";
 static gpg_error_t
 cmd_pkdecrypt (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   unsigned char *outdata;
   size_t outdatalen;
   char *keyidstr;
   unsigned int infoflags;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   keyidstr = xtrystrdup (line);
   if (!keyidstr)
     return out_of_core ();
   rc = app_decipher (ctrl->app_ctx, ctrl, keyidstr, pin_cb, ctx,
                      ctrl->in_data.value, ctrl->in_data.valuelen,
                      &outdata, &outdatalen, &infoflags);
 
   xfree (keyidstr);
   if (rc)
     {
       log_error ("app_decipher failed: %s\n", gpg_strerror (rc));
     }
   else
     {
       /* If the card driver told us that there is no padding, send a
          status line.  If there is a padding it is assumed that the
          caller knows what padding is used.  It would have been better
          to always send that information but for backward
          compatibility we can't do that.  */
       if ((infoflags & APP_DECIPHER_INFO_NOPAD))
         send_status_direct (ctrl, "PADDING", "0");
       rc = assuan_send_data (ctx, outdata, outdatalen);
       xfree (outdata);
       if (rc)
         return rc; /* that is already an assuan error code */
     }
 
   return rc;
 }
 
 
 static const char hlp_getattr[] =
   "GETATTR <name>\n"
   "\n"
   "This command is used to retrieve data from a smartcard.  The\n"
   "allowed names depend on the currently selected smartcard\n"
   "application.  NAME must be percent and '+' escaped.  The value is\n"
   "returned through status message, see the LEARN command for details.\n"
   "\n"
   "However, the current implementation assumes that Name is not escaped;\n"
   "this works as long as no one uses arbitrary escaping. \n"
   "\n"
   "Note, that this function may even be used on a locked card.";
 static gpg_error_t
 cmd_getattr (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   const char *keyword;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   keyword = line;
   for (; *line && !spacep (line); line++)
     ;
   if (*line)
       *line++ = 0;
 
   /* (We ignore any garbage for now.) */
 
   /* FIXME: Applications should not return sensitive data if the card
      is locked.  */
   rc = app_getattr (ctrl->app_ctx, ctrl, keyword);
 
   return rc;
 }
 
 
 static const char hlp_setattr[] =
   "SETATTR <name> <value> \n"
   "\n"
   "This command is used to store data on a smartcard.  The allowed\n"
   "names and values are depend on the currently selected smartcard\n"
   "application.  NAME and VALUE must be percent and '+' escaped.\n"
   "\n"
   "However, the current implementation assumes that NAME is not\n"
   "escaped; this works as long as no one uses arbitrary escaping.\n"
   "\n"
   "A PIN will be requested for most NAMEs.  See the corresponding\n"
   "setattr function of the actually used application (app-*.c) for\n"
   "details.";
 static gpg_error_t
 cmd_setattr (assuan_context_t ctx, char *orig_line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *keyword;
   int keywordlen;
   size_t nbytes;
   char *line, *linebuf;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   /* We need to use a copy of LINE, because PIN_CB uses the same
      context and thus reuses the Assuan provided LINE. */
   line = linebuf = xtrystrdup (orig_line);
   if (!line)
     return out_of_core ();
 
   keyword = line;
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
   if (*line)
       *line++ = 0;
   while (spacep (line))
     line++;
   nbytes = percent_plus_unescape_inplace (line, 0);
 
   rc = app_setattr (ctrl->app_ctx, ctrl, keyword, pin_cb, ctx,
                     (const unsigned char*)line, nbytes);
   xfree (linebuf);
 
   return rc;
 }
 
 
 static const char hlp_writecert[] =
   "WRITECERT <hexified_certid>\n"
   "\n"
   "This command is used to store a certifciate on a smartcard.  The\n"
   "allowed certids depend on the currently selected smartcard\n"
   "application. The actual certifciate is requested using the inquiry\n"
   "\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
   "\n"
   "In almost all cases a PIN will be requested.  See the related\n"
   "writecert function of the actually used application (app-*.c) for\n"
   "details.";
 static gpg_error_t
 cmd_writecert (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *certid;
   unsigned char *certdata;
   size_t certdatalen;
 
   line = skip_options (line);
 
   if (!*line)
     return set_error (GPG_ERR_ASS_PARAMETER, "no certid given");
   certid = line;
   while (*line && !spacep (line))
     line++;
   *line = 0;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   certid = xtrystrdup (certid);
   if (!certid)
     return out_of_core ();
 
   /* Now get the actual keydata. */
   rc = assuan_inquire (ctx, "CERTDATA",
                        &certdata, &certdatalen, MAXLEN_CERTDATA);
   if (rc)
     {
       xfree (certid);
       return rc;
     }
 
   /* Write the certificate to the card. */
   rc = app_writecert (ctrl->app_ctx, ctrl, certid,
                       pin_cb, ctx, certdata, certdatalen);
   xfree (certid);
   xfree (certdata);
 
   return rc;
 }
 
 
 static const char hlp_writekey[] =
   "WRITEKEY [--force] <keyid> \n"
   "\n"
   "This command is used to store a secret key on a smartcard.  The\n"
   "allowed keyids depend on the currently selected smartcard\n"
   "application. The actual keydata is requested using the inquiry\n"
   "\"KEYDATA\" and need to be provided without any protection.  With\n"
   "--force set an existing key under this KEYID will get overwritten.\n"
   "The keydata is expected to be the usual canonical encoded\n"
   "S-expression.\n"
   "\n"
   "A PIN will be requested for most NAMEs.  See the corresponding\n"
   "writekey function of the actually used application (app-*.c) for\n"
   "details.";
 static gpg_error_t
 cmd_writekey (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *keyid;
   int force = has_option (line, "--force");
   unsigned char *keydata;
   size_t keydatalen;
 
   line = skip_options (line);
 
   if (!*line)
     return set_error (GPG_ERR_ASS_PARAMETER, "no keyid given");
   keyid = line;
   while (*line && !spacep (line))
     line++;
   *line = 0;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   keyid = xtrystrdup (keyid);
   if (!keyid)
     return out_of_core ();
 
   /* Now get the actual keydata. */
   assuan_begin_confidential (ctx);
   rc = assuan_inquire (ctx, "KEYDATA", &keydata, &keydatalen, MAXLEN_KEYDATA);
   assuan_end_confidential (ctx);
   if (rc)
     {
       xfree (keyid);
       return rc;
     }
 
   /* Write the key to the card. */
   rc = app_writekey (ctrl->app_ctx, ctrl, keyid, force? 1:0,
                      pin_cb, ctx, keydata, keydatalen);
   xfree (keyid);
   xfree (keydata);
 
   return rc;
 }
 
 
 static const char hlp_genkey[] =
   "GENKEY [--force] [--timestamp=<isodate>] <no>\n"
   "\n"
   "Generate a key on-card identified by NO, which is application\n"
   "specific.  Return values are application specific.  For OpenPGP\n"
   "cards 3 status lines are returned:\n"
   "\n"
   "  S KEY-FPR  <hexstring>\n"
   "  S KEY-CREATED-AT <seconds_since_epoch>\n"
   "  S KEY-DATA [-|p|n] <hexdata>\n"
   "\n"
   "  'p' and 'n' are the names of the RSA parameters; '-' is used to\n"
   "  indicate that HEXDATA is the first chunk of a parameter given\n"
   "  by the next KEY-DATA.\n"
   "\n"
   "--force is required to overwrite an already existing key.  The\n"
   "KEY-CREATED-AT is required for further processing because it is\n"
   "part of the hashed key material for the fingerprint.\n"
   "\n"
   "If --timestamp is given an OpenPGP key will be created using this\n"
   "value.  The value needs to be in ISO Format; e.g.\n"
   "\"--timestamp=20030316T120000\" and after 1970-01-01 00:00:00.\n"
   "\n"
   "The public part of the key can also later be retrieved using the\n"
   "READKEY command.";
 static gpg_error_t
 cmd_genkey (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *save_line;
   int force;
   const char *s;
   time_t timestamp;
 
   force = has_option (line, "--force");
 
   if ((s=has_option_name (line, "--timestamp")))
     {
       if (*s != '=')
         return set_error (GPG_ERR_ASS_PARAMETER, "missing value for option");
       timestamp = isotime2epoch (s+1);
       if (timestamp < 1)
         return set_error (GPG_ERR_ASS_PARAMETER, "invalid time value");
     }
   else
     timestamp = 0;
 
 
   line = skip_options (line);
   if (!*line)
     {
       rc = set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
       goto leave;
     }
   save_line = line;
   while (*line && !spacep (line))
     line++;
   *line = 0;
 
   if ((rc = open_card (ctrl)))
     goto leave;
 
   if (!ctrl->app_ctx)
     {
       rc = gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
       goto leave;
     }
 
   {
     char *tmp = xtrystrdup (save_line);
     if (!tmp)
       return gpg_error_from_syserror ();
     rc = app_genkey (ctrl->app_ctx, ctrl, tmp, NULL,
                      force? APP_GENKEY_FLAG_FORCE : 0,
                      timestamp, pin_cb, ctx);
     xfree (tmp);
   }
 
  leave:
   return rc;
 }
 
 
 static const char hlp_random[] =
   "RANDOM <nbytes>\n"
   "\n"
   "Get NBYTES of random from the card and send them back as data.\n"
   "This usually involves EEPROM write on the card and thus excessive\n"
   "use of this command may destroy the card.\n"
   "\n"
   "Note, that this function may be even be used on a locked card.";
 static gpg_error_t
 cmd_random (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   size_t nbytes;
   unsigned char *buffer;
 
   if (!*line)
     return set_error (GPG_ERR_ASS_PARAMETER,
                       "number of requested bytes missing");
   nbytes = strtoul (line, NULL, 0);
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   buffer = xtrymalloc (nbytes);
   if (!buffer)
     return out_of_core ();
 
   rc = app_get_challenge (ctrl->app_ctx, ctrl, nbytes, buffer);
   if (!rc)
     {
       rc = assuan_send_data (ctx, buffer, nbytes);
       xfree (buffer);
       return rc; /* that is already an assuan error code */
     }
   xfree (buffer);
 
   return rc;
 }
 
 
 
 static const char hlp_passwd[] =
   "PASSWD [--reset] [--nullpin] [--clear] <chvno>\n"
   "\n"
   "Change the PIN or, if --reset is given, reset the retry counter of\n"
   "the card holder verification vector CHVNO.  The option --nullpin is\n"
   "used for TCOS cards to set the initial PIN.  The option --clear clears\n"
   "the security status associated with the PIN so that the PIN needs to\n"
   "be presented again. The format of CHVNO depends on the card application.";
 static gpg_error_t
 cmd_passwd (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *chvnostr;
   unsigned int flags = 0;
 
   if (has_option (line, "--reset"))
     flags |= APP_CHANGE_FLAG_RESET;
   if (has_option (line, "--nullpin"))
     flags |= APP_CHANGE_FLAG_NULLPIN;
   if (has_option (line, "--clear"))
     flags |= APP_CHANGE_FLAG_CLEAR;
 
   line = skip_options (line);
 
   if (!*line)
     return set_error (GPG_ERR_ASS_PARAMETER, "no CHV number given");
   chvnostr = line;
   while (*line && !spacep (line))
     line++;
   *line = 0;
 
   /* Do not allow other flags aside of --clear. */
   if ((flags & APP_CHANGE_FLAG_CLEAR) && (flags & ~APP_CHANGE_FLAG_CLEAR))
     return set_error (GPG_ERR_UNSUPPORTED_OPERATION,
                       "--clear used with other options");
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   chvnostr = xtrystrdup (chvnostr);
   if (!chvnostr)
     return out_of_core ();
   rc = app_change_pin (ctrl->app_ctx, ctrl, chvnostr, flags, pin_cb, ctx);
   if (rc)
     log_error ("command passwd failed: %s\n", gpg_strerror (rc));
   xfree (chvnostr);
 
   return rc;
 }
 
 
 static const char hlp_checkpin[] =
   "CHECKPIN <idstr>\n"
   "\n"
   "Perform a VERIFY operation without doing anything else.  This may\n"
   "be used to initialize a the PIN cache earlier to long lasting\n"
   "operations.  Its use is highly application dependent.\n"
   "\n"
   "For OpenPGP:\n"
   "\n"
   "   Perform a simple verify operation for CHV1 and CHV2, so that\n"
   "   further operations won't ask for CHV2 and it is possible to do a\n"
   "   cheap check on the PIN: If there is something wrong with the PIN\n"
   "   entry system, only the regular CHV will get blocked and not the\n"
   "   dangerous CHV3.  IDSTR is the usual card's serial number in hex\n"
   "   notation; an optional fingerprint part will get ignored.  There\n"
   "   is however a special mode if the IDSTR is suffixed with the\n"
   "   literal string \"[CHV3]\": In this case the Admin PIN is checked\n"
   "   if and only if the retry counter is still at 3.\n"
   "\n"
   "For Netkey:\n"
   "\n"
   "   Any of the valid PIN Ids may be used.  These are the strings:\n"
   "\n"
   "     PW1.CH       - Global password 1\n"
   "     PW2.CH       - Global password 2\n"
   "     PW1.CH.SIG   - SigG password 1\n"
   "     PW2.CH.SIG   - SigG password 2\n"
   "\n"
   "   For a definitive list, see the implementation in app-nks.c.\n"
   "   Note that we call a PW2.* PIN a \"PUK\" despite that since TCOS\n"
   "   3.0 they are technically alternative PINs used to mutally\n"
   "   unblock each other.";
 static gpg_error_t
 cmd_checkpin (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc;
   char *idstr;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   /* We have to use a copy of the key ID because the function may use
      the pin_cb which in turn uses the assuan line buffer and thus
      overwriting the original line with the keyid. */
   idstr = xtrystrdup (line);
   if (!idstr)
     return out_of_core ();
 
   rc = app_check_pin (ctrl->app_ctx, ctrl, idstr, pin_cb, ctx);
   xfree (idstr);
   if (rc)
     log_error ("app_check_pin failed: %s\n", gpg_strerror (rc));
 
   return rc;
 }
 
 
 static const char hlp_lock[] =
   "LOCK [--wait]\n"
   "\n"
   "Grant exclusive card access to this session.  Note that there is\n"
   "no lock counter used and a second lock from the same session will\n"
   "be ignored.  A single unlock (or RESET) unlocks the session.\n"
   "Return GPG_ERR_LOCKED if another session has locked the reader.\n"
   "\n"
   "If the option --wait is given the command will wait until a\n"
   "lock has been released.";
 static gpg_error_t
 cmd_lock (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc = 0;
 
  retry:
   if (locked_session)
     {
       if (locked_session != ctrl->server_local)
         rc = gpg_error (GPG_ERR_LOCKED);
     }
   else
     locked_session = ctrl->server_local;
 
 #ifdef USE_NPTH
   if (rc && has_option (line, "--wait"))
     {
       rc = 0;
       npth_sleep (1); /* Better implement an event mechanism. However,
                          for card operations this should be
                          sufficient. */
       /* Send a progress so that we can detect a connection loss.  */
       rc = send_status_printf (ctrl, "PROGRESS", "scd_locked . 0 0");
       if (!rc)
         goto retry;
     }
 #endif /*USE_NPTH*/
 
   if (rc)
     log_error ("cmd_lock failed: %s\n", gpg_strerror (rc));
   return rc;
 }
 
 
 static const char hlp_unlock[] =
   "UNLOCK\n"
   "\n"
   "Release exclusive card access.";
 static gpg_error_t
 cmd_unlock (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   int rc = 0;
 
   (void)line;
 
   if (locked_session)
     {
       if (locked_session != ctrl->server_local)
         rc = gpg_error (GPG_ERR_LOCKED);
       else
         locked_session = NULL;
     }
   else
     rc = gpg_error (GPG_ERR_NOT_LOCKED);
 
   if (rc)
     log_error ("cmd_unlock failed: %s\n", gpg_strerror (rc));
   return rc;
 }
 
 
 /* Ease reading of Assuan data ;ines by sending a physical line after
  * each LF.  */
 static gpg_error_t
 pretty_assuan_send_data (assuan_context_t ctx,
                          const void *buffer_arg, size_t size)
 {
   const char *buffer = buffer_arg;
   const char *p;
   size_t n, nbytes;
   gpg_error_t err;
 
   nbytes = size;
   do
     {
       p = memchr (buffer, '\n', nbytes);
       n = p ? (p - buffer) + 1 : nbytes;
       err = assuan_send_data (ctx, buffer, n);
       if (err)
         {
           /* We also set ERRNO in case this function is used by a
            * custom estream I/O handler.  */
           gpg_err_set_errno (EIO);
           goto leave;
         }
       buffer += n;
       nbytes -= n;
       if (nbytes && (err=assuan_send_data (ctx, NULL, 0))) /* Flush line. */
         {
           gpg_err_set_errno (EIO);
           goto leave;
         }
     }
   while (nbytes);
 
  leave:
   return err;
 }
 
 
 static const char hlp_getinfo[] =
   "GETINFO <what>\n"
   "\n"
   "Multi purpose command to return certain information.  \n"
   "Supported values of WHAT are:\n"
   "\n"
   "  version     - Return the version of the program.\n"
   "  pid         - Return the process id of the server.\n"
   "  socket_name - Return the name of the socket.\n"
   "  connections - Return number of active connections.\n"
   "  status      - Return the status of the current reader (in the future,\n"
   "                may also return the status of all readers).  The status\n"
   "                is a list of one-character flags.  The following flags\n"
   "                are currently defined:\n"
   "                  'u'  Usable card present.\n"
   "                  'r'  Card removed.  A reset is necessary.\n"
   "                These flags are exclusive.\n"
   "  reader_list - Return a list of detected card readers.\n"
   "  deny_admin  - Returns OK if admin commands are not allowed or\n"
   "                GPG_ERR_GENERAL if admin commands are allowed.\n"
   "  app_list    - Return a list of supported applications.  One\n"
   "                application per line, fields delimited by colons,\n"
   "                first field is the name.\n"
   "  card_list   - Return a list of serial numbers of active cards,\n"
   "                using a status response.";
 static gpg_error_t
 cmd_getinfo (assuan_context_t ctx, char *line)
 {
   int rc = 0;
 
   if (!strcmp (line, "version"))
     {
       const char *s = VERSION;
       rc = assuan_send_data (ctx, s, strlen (s));
     }
   else if (!strcmp (line, "pid"))
     {
       char numbuf[50];
 
       snprintf (numbuf, sizeof numbuf, "%lu", (unsigned long)getpid ());
       rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
     }
   else if (!strcmp (line, "socket_name"))
     {
       const char *s = scd_get_socket_name ();
 
       if (s)
         rc = assuan_send_data (ctx, s, strlen (s));
       else
         rc = gpg_error (GPG_ERR_NO_DATA);
     }
   else if (!strcmp (line, "connections"))
     {
       char numbuf[20];
 
       snprintf (numbuf, sizeof numbuf, "%d", get_active_connection_count ());
       rc = assuan_send_data (ctx, numbuf, strlen (numbuf));
     }
   else if (!strcmp (line, "status"))
     {
       ctrl_t ctrl = assuan_get_pointer (ctx);
       char flag;
 
       if (open_card (ctrl))
         flag = 'r';
       else
         flag = 'u';
 
       rc = assuan_send_data (ctx, &flag, 1);
     }
   else if (!strcmp (line, "reader_list"))
     {
       char *s = apdu_get_reader_list ();
       if (s)
         rc = pretty_assuan_send_data (ctx, s, strlen (s));
       else
         rc = gpg_error (GPG_ERR_NO_DATA);
       xfree (s);
     }
   else if (!strcmp (line, "deny_admin"))
     rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
   else if (!strcmp (line, "app_list"))
     {
       char *s = get_supported_applications ();
       if (s)
         rc = assuan_send_data (ctx, s, strlen (s));
       else
         rc = 0;
       xfree (s);
     }
   else if (!strcmp (line, "card_list"))
     {
       ctrl_t ctrl = assuan_get_pointer (ctx);
 
       app_send_card_list (ctrl);
     }
   else
     rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
   return rc;
 }
 
 
 static const char hlp_restart[] =
   "RESTART\n"
   "\n"
   "Restart the current connection; this is a kind of warm reset.  It\n"
   "deletes the context used by this connection but does not send a\n"
   "RESET to the card.  Thus the card itself won't get reset. \n"
   "\n"
   "This is used by gpg-agent to reuse a primary pipe connection and\n"
   "may be used by clients to backup from a conflict in the serial\n"
   "command; i.e. to select another application.";
 static gpg_error_t
 cmd_restart (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   app_t app = ctrl->app_ctx;
 
   (void)line;
 
   if (app)
     {
       ctrl->app_ctx = NULL;
       release_application (app, 0);
     }
   if (locked_session && ctrl->server_local == locked_session)
     {
       locked_session = NULL;
       log_info ("implicitly unlocking due to RESTART\n");
     }
   return 0;
 }
 
 
 static const char hlp_disconnect[] =
   "DISCONNECT\n"
   "\n"
   "Disconnect the card if the backend supports a disconnect operation.";
 static gpg_error_t
 cmd_disconnect (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
 
   (void)line;
 
   if (!ctrl->app_ctx)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   apdu_disconnect (ctrl->app_ctx->slot);
   return 0;
 }
 
 
 
 static const char hlp_apdu[] =
   "APDU [--[dump-]atr] [--more] [--exlen[=N]] [hexstring]\n"
   "\n"
   "Send an APDU to the current reader.  This command bypasses the high\n"
   "level functions and sends the data directly to the card.  HEXSTRING\n"
   "is expected to be a proper APDU.  If HEXSTRING is not given no\n"
   "commands are set to the card but the command will implictly check\n"
   "whether the card is ready for use. \n"
   "\n"
   "Using the option \"--atr\" returns the ATR of the card as a status\n"
   "message before any data like this:\n"
   "  S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1\n"
   "\n"
   "Using the option --more handles the card status word MORE_DATA\n"
   "(61xx) and concatenates all responses to one block.\n"
   "\n"
   "Using the option \"--exlen\" the returned APDU may use extended\n"
   "length up to N bytes.  If N is not given a default value is used\n"
   "(currently 4096).";
 static gpg_error_t
 cmd_apdu (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   app_t app;
   int rc;
   unsigned char *apdu;
   size_t apdulen;
   int with_atr;
   int handle_more;
   const char *s;
   size_t exlen;
 
   if (has_option (line, "--dump-atr"))
     with_atr = 2;
   else
     with_atr = has_option (line, "--atr");
   handle_more = has_option (line, "--more");
 
   if ((s=has_option_name (line, "--exlen")))
     {
       if (*s == '=')
         exlen = strtoul (s+1, NULL, 0);
       else
         exlen = 4096;
     }
   else
     exlen = 0;
 
   line = skip_options (line);
 
   if ((rc = open_card (ctrl)))
     return rc;
 
   app = ctrl->app_ctx;
   if (!app)
     return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
   if (with_atr)
     {
       unsigned char *atr;
       size_t atrlen;
       char hexbuf[400];
 
       atr = apdu_get_atr (app->slot, &atrlen);
       if (!atr || atrlen > sizeof hexbuf - 2 )
         {
           rc = gpg_error (GPG_ERR_INV_CARD);
           goto leave;
         }
       if (with_atr == 2)
         {
           char *string, *p, *pend;
 
           string = atr_dump (atr, atrlen);
           if (string)
             {
               for (rc=0, p=string; !rc && (pend = strchr (p, '\n')); p = pend+1)
                 {
                   rc = assuan_send_data (ctx, p, pend - p + 1);
                   if (!rc)
                     rc = assuan_send_data (ctx, NULL, 0);
                 }
               if (!rc && *p)
                 rc = assuan_send_data (ctx, p, strlen (p));
               es_free (string);
               if (rc)
                 goto leave;
             }
         }
       else
         {
           bin2hex (atr, atrlen, hexbuf);
           send_status_info (ctrl, "CARD-ATR", hexbuf, strlen (hexbuf), NULL, 0);
         }
       xfree (atr);
     }
 
   apdu = hex_to_buffer (line, &apdulen);
   if (!apdu)
     {
       rc = gpg_error_from_syserror ();
       goto leave;
     }
   if (apdulen)
     {
       unsigned char *result = NULL;
       size_t resultlen;
 
       rc = apdu_send_direct (app->slot, exlen,
                              apdu, apdulen, handle_more,
                              NULL, &result, &resultlen);
       if (rc)
         log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc));
       else
         {
           rc = assuan_send_data (ctx, result, resultlen);
           xfree (result);
         }
     }
   xfree (apdu);
 
  leave:
   return rc;
 }
 
 
 static const char hlp_killscd[] =
   "KILLSCD\n"
   "\n"
   "Commit suicide.";
 static gpg_error_t
 cmd_killscd (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
 
   (void)line;
 
   ctrl->server_local->stopme = 1;
   assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
   return 0;
 }
 
 
 
 /* Tell the assuan library about our commands */
 static int
 register_commands (assuan_context_t ctx)
 {
   static struct {
     const char *name;
     assuan_handler_t handler;
     const char * const help;
   } table[] = {
     { "SERIALNO",     cmd_serialno, hlp_serialno },
     { "LEARN",        cmd_learn,    hlp_learn },
     { "READCERT",     cmd_readcert, hlp_readcert },
     { "READKEY",      cmd_readkey,  hlp_readkey },
     { "SETDATA",      cmd_setdata,  hlp_setdata },
     { "PKSIGN",       cmd_pksign,   hlp_pksign },
     { "PKAUTH",       cmd_pkauth,   hlp_pkauth },
     { "PKDECRYPT",    cmd_pkdecrypt,hlp_pkdecrypt },
     { "INPUT",        NULL },
     { "OUTPUT",       NULL },
     { "GETATTR",      cmd_getattr,  hlp_getattr },
     { "SETATTR",      cmd_setattr,  hlp_setattr },
     { "WRITECERT",    cmd_writecert,hlp_writecert },
     { "WRITEKEY",     cmd_writekey, hlp_writekey },
     { "GENKEY",       cmd_genkey,   hlp_genkey },
     { "RANDOM",       cmd_random,   hlp_random },
     { "PASSWD",       cmd_passwd,   hlp_passwd },
     { "CHECKPIN",     cmd_checkpin, hlp_checkpin },
     { "LOCK",         cmd_lock,     hlp_lock },
     { "UNLOCK",       cmd_unlock,   hlp_unlock },
     { "GETINFO",      cmd_getinfo,  hlp_getinfo },
     { "RESTART",      cmd_restart,  hlp_restart },
     { "DISCONNECT",   cmd_disconnect,hlp_disconnect },
     { "APDU",         cmd_apdu,     hlp_apdu },
     { "KILLSCD",      cmd_killscd,  hlp_killscd },
     { NULL }
   };
   int i, rc;
 
   for (i=0; table[i].name; i++)
     {
       rc = assuan_register_command (ctx, table[i].name, table[i].handler,
                                     table[i].help);
       if (rc)
         return rc;
     }
   assuan_set_hello_line (ctx, "GNU Privacy Guard's Smartcard server ready");
 
   assuan_register_reset_notify (ctx, reset_notify);
   assuan_register_option_handler (ctx, option_handler);
   return 0;
 }
 
 
 /* Startup the server.  If FD is given as -1 this is simple pipe
    server, otherwise it is a regular server.  Returns true if there
    are no more active asessions.  */
 int
 scd_command_handler (ctrl_t ctrl, int fd)
 {
   int rc;
   assuan_context_t ctx = NULL;
   int stopme;
 
   rc = assuan_new (&ctx);
   if (rc)
     {
       log_error ("failed to allocate assuan context: %s\n",
                  gpg_strerror (rc));
       scd_exit (2);
     }
 
   if (fd == -1)
     {
       assuan_fd_t filedes[2];
 
       filedes[0] = assuan_fdopen (0);
       filedes[1] = assuan_fdopen (1);
       rc = assuan_init_pipe_server (ctx, filedes);
     }
   else
     {
       rc = assuan_init_socket_server (ctx, INT2FD(fd),
                                       ASSUAN_SOCKET_SERVER_ACCEPTED);
     }
   if (rc)
     {
       log_error ("failed to initialize the server: %s\n",
                  gpg_strerror(rc));
       scd_exit (2);
     }
   rc = register_commands (ctx);
   if (rc)
     {
       log_error ("failed to register commands with Assuan: %s\n",
                  gpg_strerror(rc));
       scd_exit (2);
     }
   assuan_set_pointer (ctx, ctrl);
 
   /* Allocate and initialize the server object.  Put it into the list
      of active sessions. */
   ctrl->server_local = xcalloc (1, sizeof *ctrl->server_local);
   ctrl->server_local->next_session = session_list;
   session_list = ctrl->server_local;
   ctrl->server_local->ctrl_backlink = ctrl;
   ctrl->server_local->assuan_ctx = ctx;
 
   /* Command processing loop. */
   for (;;)
     {
       rc = assuan_accept (ctx);
       if (rc == -1)
         {
           break;
         }
       else if (rc)
         {
           log_info ("Assuan accept problem: %s\n", gpg_strerror (rc));
           break;
         }
 
       rc = assuan_process (ctx);
       if (rc)
         {
           log_info ("Assuan processing failed: %s\n", gpg_strerror (rc));
           continue;
         }
     }
 
   /* Cleanup.  We don't send an explicit reset to the card.  */
   do_reset (ctrl, 0, 0);
 
   /* Release the server object.  */
   if (session_list == ctrl->server_local)
     session_list = ctrl->server_local->next_session;
   else
     {
       struct server_local_s *sl;
 
       for (sl=session_list; sl->next_session; sl = sl->next_session)
         if (sl->next_session == ctrl->server_local)
           break;
       if (!sl->next_session)
           BUG ();
       sl->next_session = ctrl->server_local->next_session;
     }
   stopme = ctrl->server_local->stopme;
   xfree (ctrl->server_local);
   ctrl->server_local = NULL;
 
   /* Release the Assuan context.  */
   assuan_release (ctx);
 
   if (stopme)
     scd_exit (0);
 
   /* If there are no more sessions return true.  */
   return !session_list;
 }
 
 
 
 /* Send a keyinfo string.  If DATA is true the string is emitted as a
  * data line, else as a status line.  */
 void
 send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
-              const char *serialno, const char *idstr)
+              const char *serialno, const char *idstr, const char *usage)
 {
   char *string;
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
-  string = xtryasprintf ("%s T %s %s%s", keygrip_str,
+  string = xtryasprintf ("%s T %s %s %s%s", keygrip_str,
                          serialno? serialno : "-",
                          idstr? idstr : "-",
+                         usage? usage : "-",
                          data? "\n" : "");
 
   if (!string)
     return;
 
   if (!data)
     assuan_write_status (ctx, "KEYINFO", string);
   else
     assuan_send_data (ctx, string, strlen (string));
 
   xfree (string);
   return;
 }
 
 
 /* Send a line with status information via assuan and escape all given
    buffers. The variable elements are pairs of (char *, size_t),
    terminated with a (NULL, 0). */
 void
 send_status_info (ctrl_t ctrl, const char *keyword, ...)
 {
   va_list arg_ptr;
   const unsigned char *value;
   size_t valuelen;
   char buf[950], *p;
   size_t n;
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
   va_start (arg_ptr, keyword);
 
   p = buf;
   n = 0;
   while ( (value = va_arg (arg_ptr, const unsigned char *))
            && n < DIM (buf)-2 )
     {
       valuelen = va_arg (arg_ptr, size_t);
       if (!valuelen)
         continue; /* empty buffer */
       if (n)
         {
           *p++ = ' ';
           n++;
         }
       for ( ; valuelen && n < DIM (buf)-2; n++, valuelen--, value++)
         {
           if (*value == '+' || *value == '\"' || *value == '%'
               || *value < ' ')
             {
               sprintf (p, "%%%02X", *value);
               p += 3;
               n += 2;
             }
           else if (*value == ' ')
             *p++ = '+';
           else
             *p++ = *value;
         }
     }
   *p = 0;
   assuan_write_status (ctx, keyword, buf);
 
   va_end (arg_ptr);
 }
 
 
 /* Send a ready formatted status line via assuan.  */
 gpg_error_t
 send_status_direct (ctrl_t ctrl, const char *keyword, const char *args)
 {
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
   if (strchr (args, '\n'))
     {
       log_error ("error: LF detected in status line - not sending\n");
       return gpg_error (GPG_ERR_INTERNAL);
     }
   return assuan_write_status (ctx, keyword, args);
 }
 
 
 /* This status functions expects a printf style format string.  No
  * filtering of the data is done instead the orintf formatted data is
  * send using assuan_send_status. */
 gpg_error_t
 send_status_printf (ctrl_t ctrl, const char *keyword, const char *format, ...)
 {
   gpg_error_t err;
   va_list arg_ptr;
   assuan_context_t ctx;
 
   if (!ctrl || !ctrl->server_local || !(ctx = ctrl->server_local->assuan_ctx))
     return 0;
 
   va_start (arg_ptr, format);
   err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
   va_end (arg_ptr);
   return err;
 }
 
 
 void
 popup_prompt (void *opaque, int on)
 {
   ctrl_t ctrl = opaque;
 
   if (ctrl)
     {
       assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
       if (ctx)
         {
           const char *cmd;
           gpg_error_t err;
           unsigned char *value;
           size_t valuelen;
 
           if (on)
             cmd = "POPUPPINPADPROMPT --ack";
           else
             cmd = "DISMISSPINPADPROMPT";
           err = assuan_inquire (ctx, cmd, &value, &valuelen, 100);
           if (!err)
             xfree (value);
         }
     }
 }
 
 
 /* Helper to send the clients a status change notification.  */
 void
 send_client_notifications (app_t app, int removal)
 {
   struct {
     pid_t pid;
 #ifdef HAVE_W32_SYSTEM
     HANDLE handle;
 #else
     int signo;
 #endif
   } killed[50];
   int killidx = 0;
   int kidx;
   struct server_local_s *sl;
 
   for (sl=session_list; sl; sl = sl->next_session)
     if (sl->ctrl_backlink && sl->ctrl_backlink->app_ctx == app)
       {
         pid_t pid;
 #ifdef HAVE_W32_SYSTEM
         HANDLE handle;
 #else
         int signo;
 #endif
 
         if (removal)
           {
             sl->ctrl_backlink->app_ctx = NULL;
             sl->card_removed = 1;
             release_application (app, 1);
           }
 
         if (!sl->event_signal || !sl->assuan_ctx)
           continue;
 
         pid = assuan_get_pid (sl->assuan_ctx);
 
 #ifdef HAVE_W32_SYSTEM
         handle = sl->event_signal;
         for (kidx=0; kidx < killidx; kidx++)
           if (killed[kidx].pid == pid
               && killed[kidx].handle == handle)
             break;
         if (kidx < killidx)
           log_info ("event %p (%p) already triggered for client %d\n",
                     sl->event_signal, handle, (int)pid);
         else
           {
             log_info ("triggering event %p (%p) for client %d\n",
                       sl->event_signal, handle, (int)pid);
             if (!SetEvent (handle))
               log_error ("SetEvent(%p) failed: %s\n",
                          sl->event_signal, w32_strerror (-1));
             if (killidx < DIM (killed))
               {
                 killed[killidx].pid = pid;
                 killed[killidx].handle = handle;
                 killidx++;
               }
           }
 #else /*!HAVE_W32_SYSTEM*/
         signo = sl->event_signal;
 
         if (pid != (pid_t)(-1) && pid && signo > 0)
           {
             for (kidx=0; kidx < killidx; kidx++)
               if (killed[kidx].pid == pid
                   && killed[kidx].signo == signo)
                 break;
             if (kidx < killidx)
               log_info ("signal %d already sent to client %d\n",
                         signo, (int)pid);
             else
               {
                 log_info ("sending signal %d to client %d\n",
                           signo, (int)pid);
                 kill (pid, signo);
                 if (killidx < DIM (killed))
                   {
                     killed[killidx].pid = pid;
                     killed[killidx].signo = signo;
                     killidx++;
                   }
               }
           }
 #endif /*!HAVE_W32_SYSTEM*/
       }
 }
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index bb7c1b025..bb7e04c61 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -1,145 +1,146 @@
 /* scdaemon.h - Global definitions for the SCdaemon
  *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef SCDAEMON_H
 #define SCDAEMON_H
 
 #ifdef GPG_ERR_SOURCE_DEFAULT
 #error GPG_ERR_SOURCE_DEFAULT already defined
 #endif
 #define GPG_ERR_SOURCE_DEFAULT  GPG_ERR_SOURCE_SCD
 #include <gpg-error.h>
 
 #include <time.h>
 #include <gcrypt.h>
 #include "../common/util.h"
 #include "../common/sysutils.h"
 #include "app-common.h"
 
 
 /* To convey some special hash algorithms we use algorithm numbers
    reserved for application use. */
 #ifndef GCRY_MODULE_ID_USER
 #define GCRY_MODULE_ID_USER 1024
 #endif
 #define MD_USER_TLS_MD5SHA1 (GCRY_MODULE_ID_USER+1)
 
 /* Maximum length of a digest.  */
 #define MAX_DIGEST_LEN 64
 
 
 
 /* A large struct name "opt" to keep global flags. */
 EXTERN_UNLESS_MAIN_MODULE
 struct
 {
   unsigned int debug; /* Debug flags (DBG_foo_VALUE). */
   int verbose;        /* Verbosity level. */
   int quiet;          /* Be as quiet as possible. */
   int dry_run;        /* Don't change any persistent data. */
   int batch;          /* Batch mode. */
   const char *ctapi_driver; /* Library to access the ctAPI. */
   const char *pcsc_driver;  /* Library to access the PC/SC system. */
   const char *reader_port;  /* NULL or reder port to use. */
   int disable_ccid;    /* Disable the use of the internal CCID driver. */
   int disable_pinpad;  /* Do not use a pinpad. */
   int enable_pinpad_varlen;  /* Use variable length input for pinpad. */
   int allow_admin;     /* Allow the use of admin commands for certain
                           cards. */
   int pcsc_shared;     /* Use shared PC/SC access.  */
   strlist_t disabled_applications;  /* Card applications we do not
                                        want to use. */
   unsigned long card_timeout; /* Disconnect after N seconds of inactivity.  */
 } opt;
 
 
 #define DBG_MPI_VALUE	  2	/* debug mpi details */
 #define DBG_CRYPTO_VALUE  4	/* debug low level crypto */
 #define DBG_CARD_VALUE    16    /* debug card info  */
 #define DBG_MEMORY_VALUE  32	/* debug memory allocation stuff */
 #define DBG_CACHE_VALUE   64	/* debug the caching */
 #define DBG_MEMSTAT_VALUE 128	/* show memory statistics */
 #define DBG_HASHING_VALUE 512	/* debug hashing operations */
 #define DBG_IPC_VALUE     1024
 #define DBG_CARD_IO_VALUE 2048  /* debug card I/O (e.g. APDUs).  */
 #define DBG_READER_VALUE  4096  /* Trace reader related functions.  */
 
 #define DBG_CRYPTO  (opt.debug & DBG_CRYPTO_VALUE)
 #define DBG_MEMORY  (opt.debug & DBG_MEMORY_VALUE)
 #define DBG_CACHE   (opt.debug & DBG_CACHE_VALUE)
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_IPC     (opt.debug & DBG_IPC_VALUE)
 #define DBG_CARD    (opt.debug & DBG_CARD_VALUE)
 #define DBG_CARD_IO (opt.debug & DBG_CARD_IO_VALUE)
 #define DBG_READER  (opt.debug & DBG_READER_VALUE)
 
 struct server_local_s;
 struct app_ctx_s;
 
 struct server_control_s
 {
   /* Private data used to fire up the connection thread.  We use this
      structure do avoid an extra allocation for just a few bytes. */
   struct {
     gnupg_fd_t fd;
   } thread_startup;
 
   /* Local data of the server; used only in command.c. */
   struct server_local_s *server_local;
 
   /* The application context used with this connection or NULL if none
      associated.  Note that this is shared with the other connections:
      All connections accessing the same reader are using the same
      application context. */
   struct app_ctx_s *app_ctx;
 
   /* Helper to store the value we are going to sign */
   struct
   {
     unsigned char *value;
     int valuelen;
   } in_data;
 };
 
 
 /*-- scdaemon.c --*/
 void scd_exit (int rc);
 const char *scd_get_socket_name (void);
 
 /*-- command.c --*/
 gpg_error_t initialize_module_command (void);
 int  scd_command_handler (ctrl_t, int);
 void send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
-                   const char *serialno, const char *idstr);
+                   const char *serialno, const char *idstr,
+                   const char *usage);
 void send_status_info (ctrl_t ctrl, const char *keyword, ...)
      GPGRT_ATTR_SENTINEL(1);
 gpg_error_t send_status_direct (ctrl_t ctrl, const char *keyword,
                                 const char *args);
 gpg_error_t send_status_printf (ctrl_t ctrl, const char *keyword,
                                 const char *format, ...) GPGRT_ATTR_PRINTF(3,4);
 
 void popup_prompt (void *opaque, int on);
 void send_client_notifications (app_t app, int removal);
 void scd_kick_the_loop (void);
 int get_active_connection_count (void);
 
 /*-- app.c --*/
 int scd_update_reader_status_file (void);
 
 #endif /*SCDAEMON_H*/