diff options
| author | Neal H. Walfield <[email protected]> | 2016-11-29 13:33:29 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-11-29 13:55:59 +0000 |
| commit | 2f27cb12e30c9f6e780354eecc3ff0039ed52c63 (patch) | |
| tree | 79fd55149e6d51c321a832c4deb810e58d25f695 /g10/tofu.c | |
| parent | tests: Add test for '--decrypt --multifile'. (diff) | |
| download | gnupg-2f27cb12e30c9f6e780354eecc3ff0039ed52c63.tar.gz gnupg-2f27cb12e30c9f6e780354eecc3ff0039ed52c63.zip | |
g10: Extend TOFU_STATS to always show the validity
* doc/DETAILS (TOFU_STATS): Rename the VALIDITY field to SUMMARY. Add
a new field called VALIDITY.
* g10/tofu.c (write_stats_status): Update output accordingly.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Change TOFU_STATS as discussed offline with Werner, Justus and Andre.
Diffstat (limited to 'g10/tofu.c')
| -rw-r--r-- | g10/tofu.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/g10/tofu.c b/g10/tofu.c index 85759479d..bf2a0484d 100644 --- a/g10/tofu.c +++ b/g10/tofu.c @@ -2897,7 +2897,8 @@ write_stats_status (estream_t fp, unsigned long encryption_first_done, unsigned long encryption_most_recent) { - const char *validity; + int summary; + int validity; unsigned long messages; /* Use the euclidean distance (m = sqrt(a^2 + b^2)) rather then the @@ -2907,34 +2908,41 @@ write_stats_status (estream_t fp, + encryption_count * encryption_count); if (messages < 1) - validity = "1"; /* Key without history. */ + validity = 1; /* Key without history. */ else if (messages < 2 * BASIC_TRUST_THRESHOLD) - validity = "2"; /* Key with too little history. */ + validity = 2; /* Key with too little history. */ else if (messages < 2 * FULL_TRUST_THRESHOLD) - validity = "3"; /* Key with enough history for basic trust. */ + validity = 3; /* Key with enough history for basic trust. */ else - validity = "4"; /* Key with a lot of history. */ + validity = 4; /* Key with a lot of history. */ + + if (policy == TOFU_POLICY_ASK) + summary = 0; /* Key requires attention. */ + else + summary = validity; if (fp) { - es_fprintf (fp, "tfs:1:%s:%lu:%lu:%s:%lu:%lu:%lu:%lu:\n", - validity, signature_count, encryption_count, + es_fprintf (fp, "tfs:1:%d:%lu:%lu:%s:%lu:%lu:%lu:%lu:%d:\n", + summary, signature_count, encryption_count, tofu_policy_str (policy), signature_first_seen, signature_most_recent, - encryption_first_done, encryption_most_recent); + encryption_first_done, encryption_most_recent, + validity); } else { write_status_printf (STATUS_TOFU_STATS, - "%s %lu %lu %s %lu %lu %lu %lu", - validity, + "%d %lu %lu %s %lu %lu %lu %lu %d", + summary, signature_count, encryption_count, tofu_policy_str (policy), signature_first_seen, signature_most_recent, encryption_first_done, - encryption_most_recent); + encryption_most_recent, + validity); } } |