gpg: Re-format some tofu messages.
d73e83c3b678Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

gpg: Re-format some tofu messages.

* common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
(STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
* g10/tofu.c (NO_WARNING_THRESHOLD): New.
(record_binding, tofu_register): Take care of --dry-run.
(show_statistics): Print STATUS_TOFU_USER.  Reformat some messages.
Fix the ngettext/strcmp thing.  Use log_string instead of log_info.
Use NO_WARNING_THRESHOLD constant.
(get_trust): Use format_text and print a compact fingerprint.

The use of log_string makes long messages better readable; instead of

gpg: Warning: if you think you've seen more[...]
key, then this key might be a forgery!  Car[...]
address for small variations.  If the key i[...]

we now have

gpg: Warning: if you think you've seen more[...]
     key, then this key might be a forgery![...]
     address for small variations.  If the [...]

We also put the key information after the message and not between the
user id and the last used info like here:

gpg: Verified 7 messages signed by "Werner Koch <werner@eifzilla.de>"
     in the past 4 days, 16 hours.
     The most recent message was verified 3 days, 13 hours ago.
     (key: 8061 5870 F5BA D690 3336  [...] 1E42 B367, policy: auto)

This also makes the key info a separate translatable string.

Further a compact version of the fingerprint (hex w/o spaces) is
printed in some messages.