diff options
| author | NIIBE Yutaka <[email protected]> | 2019-07-19 04:26:49 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-07-19 04:26:49 +0000 |
| commit | 98f4eff7ffde106ae4f60739d1104282430ac14f (patch) | |
| tree | 9081ccd95ce9027221d9a31bc605407f92ed4472 /g10/card-util.c | |
| parent | scd: Support "[CHV3]" attribute for keyid string. (diff) | |
| download | gnupg-98f4eff7ffde106ae4f60739d1104282430ac14f.tar.gz gnupg-98f4eff7ffde106ae4f60739d1104282430ac14f.zip | |
card: Fix showing KDF object attribute.
* g10/call-agent.c (learn_status_cb): Parse the KDF DO.
* g10/card-util.c (current_card_status): Show it correctly.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index a95cc121a..fbb941915 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -521,7 +521,16 @@ current_card_status (ctrl_t ctrl, estream_t fp, es_fprintf (fp, "sigcount:%lu:::\n", info.sig_counter); if (info.extcap.kdf) { - es_fprintf (fp, "kdf:%s:\n", info.kdf_do_enabled ? "on" : "off"); + const char *setup; + + if (info.kdf_do_enabled == 0) + setup = "off"; + else if (info.kdf_do_enabled == 1) + setup = "single"; + else + setup = "on"; + + es_fprintf (fp, "kdf:%s:\n", setup); } if (info.extcap.bt) { @@ -636,8 +645,16 @@ current_card_status (ctrl_t ctrl, estream_t fp, 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"); + const char *setup; + + if (info.kdf_do_enabled == 0) + setup = "off"; + else if (info.kdf_do_enabled == 1) + setup = "single"; + else + setup = "on"; + + tty_fprintf (fp, "KDF setting ......: %s\n", setup); } if (info.extcap.bt) { |