diff options
| author | NIIBE Yutaka <[email protected]> | 2018-11-15 03:19:02 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-12-06 08:05:03 +0000 |
| commit | 751ff784e5316470f266750d299ae857ad7840d8 (patch) | |
| tree | 14162ac10cb429da4b7d898626c9eff6c534cb0e /g10/card-util.c | |
| parent | g10: Fix memory leak for --card-status. (diff) | |
| download | gnupg-751ff784e5316470f266750d299ae857ad7840d8.tar.gz gnupg-751ff784e5316470f266750d299ae857ad7840d8.zip | |
card: Display if KDF is enabled or not.
* g10/call-agent.h (kdf_do_enabled): New field.
* g10/call-agent.c (learn_status_cb): Set kdf_do_enabled if available.
* g10/card-util.c (current_card_status): Inform the availability.
--
Cherry pick of master commit: a5542a4a702c2210facf58a98bc8d3d16089b6ab
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index dc4c0e646..45ae3ddb4 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -612,6 +612,11 @@ current_card_status (ctrl_t ctrl, estream_t fp, tty_fprintf (fp, "PIN retry counter : %d %d %d\n", info.chvretry[0], info.chvretry[1], info.chvretry[2]); tty_fprintf (fp, "Signature counter : %lu\n", info.sig_counter); + if (info.extcap.kdf) + { + tty_fprintf (fp, "KDF setting ......: %s\n", + info.kdf_do_enabled ? "on" : "off"); + } tty_fprintf (fp, "Signature key ....:"); print_sha1_fpr (fp, info.fpr1valid? info.fpr1:NULL); if (info.fpr1valid && info.fpr1time) |