aboutsummaryrefslogtreecommitdiffstats
path: root/common/status.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-05-02 07:48:19 +0000
committerWerner Koch <[email protected]>2016-05-02 11:18:20 +0000
commitd73e83c3b678add11a5754e199e528aeb39ec8ce (patch)
treeaf62ca3b9dd11c4d2a31ae36d3285f65e65dbdcc /common/status.h
parentdoc: Add a comment about the goals of the agent. (diff)
downloadgnupg-d73e83c3b678add11a5754e199e528aeb39ec8ce.tar.gz
gnupg-d73e83c3b678add11a5754e199e528aeb39ec8ce.zip
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 <[email protected]>" 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. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/status.h')
-rw-r--r--common/status.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/status.h b/common/status.h
index e50827fe0..730a75cfc 100644
--- a/common/status.h
+++ b/common/status.h
@@ -133,6 +133,11 @@ enum
STATUS_PKA_TRUST_BAD,
STATUS_PKA_TRUST_GOOD,
+ STATUS_TOFU_USER,
+ STATUS_TOFU_STATS,
+ STATUS_TOFU_STATS_SHORT,
+ STATUS_TOFU_STATS_LONG,
+
STATUS_TRUNCATED,
STATUS_MOUNTPOINT,