diff options
| author | Werner Koch <[email protected]> | 2018-03-06 15:26:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-06 15:26:26 +0000 |
| commit | f574aabeeb873f14a586f80cac16b857e6088534 (patch) | |
| tree | e84428513719a4e50cb1df1be509c12d34eb434a /g10/card-util.c | |
| parent | gpg: Avoid writing a zero length last chunk in AEAD mode. (diff) | |
| parent | agent: Also evict cached items via a timer. (diff) | |
| download | gnupg-f574aabeeb873f14a586f80cac16b857e6088534.tar.gz gnupg-f574aabeeb873f14a586f80cac16b857e6088534.zip | |
Merge branch 'STABLE-BRANCH-2-2' into wk-master
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index 4c1ab03a1..f8a1bb831 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -264,6 +264,21 @@ print_sha1_fpr_colon (estream_t fp, const unsigned char *fpr) static void +print_keygrip (estream_t fp, const unsigned char *grp) +{ + int i; + + if (opt.with_keygrip) + { + tty_fprintf (fp, " keygrip ....: "); + for (i=0; i < 20 ; i++, grp++) + es_fprintf (fp, "%02X", *grp); + tty_fprintf (fp, "\n"); + } +} + + +static void print_name (estream_t fp, const char *text, const char *name) { tty_fprintf (fp, "%s", text); @@ -517,6 +532,11 @@ current_card_status (ctrl_t ctrl, estream_t fp, es_fprintf (fp, "fprtime:%lu:%lu:%lu:\n", (unsigned long)info.fpr1time, (unsigned long)info.fpr2time, (unsigned long)info.fpr3time); + es_fputs ("grp:", fp); + print_sha1_fpr_colon (fp, info.grp1); + print_sha1_fpr_colon (fp, info.grp2); + print_sha1_fpr_colon (fp, info.grp3); + es_putc ('\n', fp); } else { @@ -593,18 +613,27 @@ current_card_status (ctrl_t ctrl, estream_t fp, tty_fprintf (fp, "Signature key ....:"); print_sha1_fpr (fp, info.fpr1valid? info.fpr1:NULL); if (info.fpr1valid && info.fpr1time) - tty_fprintf (fp, " created ....: %s\n", - isotimestamp (info.fpr1time)); + { + tty_fprintf (fp, " created ....: %s\n", + isotimestamp (info.fpr1time)); + print_keygrip (fp, info.grp1); + } tty_fprintf (fp, "Encryption key....:"); print_sha1_fpr (fp, info.fpr2valid? info.fpr2:NULL); if (info.fpr2valid && info.fpr2time) - tty_fprintf (fp, " created ....: %s\n", - isotimestamp (info.fpr2time)); + { + tty_fprintf (fp, " created ....: %s\n", + isotimestamp (info.fpr2time)); + print_keygrip (fp, info.grp2); + } tty_fprintf (fp, "Authentication key:"); print_sha1_fpr (fp, info.fpr3valid? info.fpr3:NULL); if (info.fpr3valid && info.fpr3time) - tty_fprintf (fp, " created ....: %s\n", - isotimestamp (info.fpr3time)); + { + tty_fprintf (fp, " created ....: %s\n", + isotimestamp (info.fpr3time)); + print_keygrip (fp, info.grp2); + } tty_fprintf (fp, "General key info..: "); thefpr = (info.fpr1valid? info.fpr1 : info.fpr2valid? info.fpr2 : |