diff options
| author | Werner Koch <[email protected]> | 2013-03-20 09:00:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-03-20 09:00:12 +0000 |
| commit | eaa6dc3a8b4f31525650cd4785d6bafab86d68b7 (patch) | |
| tree | 6552e846c825e2dae78d5ceefebee0e2acaeb27f /g10/card-util.c | |
| parent | Add code to allow for late memory cleanup. (diff) | |
| parent | gpg: Print indicator for unknown key capability. (diff) | |
| download | gnupg-key-storage-work.tar.gz gnupg-key-storage-work.zip | |
Merge branch 'master' into key-storage-workkey-storage-work
--
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index 75208cc86..add8eed09 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -550,7 +550,9 @@ card_status (estream_t fp, char *serialno, size_t serialnobuflen) tty_fprintf (fp, " %u%c", info.key_attr[i].nbits, info.key_attr[i].algo == 1? 'R': - info.key_attr[i].algo == 17? 'D': '?'); + info.key_attr[i].algo == 17? 'D': + info.key_attr[i].algo == 18? 'e': + info.key_attr[i].algo == 19? 'E': '?'); tty_fprintf (fp, "\n"); } tty_fprintf (fp, "Max. PIN lengths .: %d %d %d\n", @@ -1560,7 +1562,7 @@ card_store_subkey (KBNODE node, int use) nbits = nbits_from_pk (pk); - if (!is_RSA (pk->pubkey_algo) || (!info.is_v2 && nbits != 1024) ) + if (!info.is_v2 && nbits != 1024) { tty_printf ("You may only store a 1024 bit RSA key on the card\n"); tty_printf ("\n"); |