chiark / gitweb /
gpg: Only print out TOFU statistics for conflicts in interactive mode
authorNeal H. Walfield <neal@g10code.com>
Thu, 2 Feb 2017 12:24:57 +0000 (13:24 +0100)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 18 Sep 2017 20:41:12 +0000 (21:41 +0100)
commitcc96fc5f4a3d4199d5b410859ea1a58d6bcc0385
treea12840f7306e72c99bc9f96e49c401e5b0424e85
parent3db09e6f8b3b39fecc4533049719b3bab2ed77d3
gpg: Only print out TOFU statistics for conflicts in interactive mode

* g10/tofu.c (get_trust): Add arguments POLICYP and CONFLICT_SETP.  If
they are not NULL, return the policy and conflict set (if there is
one), respectively.  Update callers.  If MAY_ASK is FALSE, don't print
out the statistics.
(tofu_register_encryption): If there is a conflict and we haven't yet
printed the statistics about the conflicting bindings, do so now.
(tofu_get_validity): Likewise.

Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 2914
(cherry picked from commit 027b81b35fe36692005b8dba22d9eb2db05e8c80)

Gbp-Pq: Name 0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
g10/tofu.c