diff options
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index b1f57c5b5..3f91fe78f 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -385,7 +385,9 @@ current_card_status (ctrl_t ctrl, estream_t fp, || strlen (info.serialno) != 32 ) { const char *name1, *name2; - if (info.apptype && !strcmp (info.apptype, "NKS")) + if (info.apptype && !strcmp (info.apptype, "openpgp")) + goto openpgp; + else if (info.apptype && !strcmp (info.apptype, "NKS")) { name1 = "netkey"; name2 = "NetKey"; @@ -425,7 +427,7 @@ current_card_status (ctrl_t ctrl, estream_t fp, xfree (pk); return; } - + openpgp: if (!serialno) ; else if (strlen (info.serialno)+1 > serialnobuflen) @@ -1253,8 +1255,7 @@ get_info_for_key_operation (struct agent_card_info_s *info) memset (info, 0, sizeof *info); rc = agent_scd_getattr ("SERIALNO", info); - if (rc || !info->serialno || strncmp (info->serialno, "D27600012401", 12) - || strlen (info->serialno) != 32 ) + if (rc || !info->apptype || strcmp (info->apptype, "openpgp")) { log_error (_("key operation not possible: %s\n"), rc ? gpg_strerror (rc) : _("not an OpenPGP card")); |