diff options
| author | Werner Koch <[email protected]> | 2016-08-25 07:26:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-08-25 07:37:56 +0000 |
| commit | 19d12be3cea5b4ee8153287a2f2442913a5e07a1 (patch) | |
| tree | 1a75c09e6b44995832b02c2a5adad5a10a40ae22 /tests | |
| parent | gpg: Change TOFU_STATS to return timestamps. (diff) | |
| download | gnupg-19d12be3cea5b4ee8153287a2f2442913a5e07a1.tar.gz gnupg-19d12be3cea5b4ee8153287a2f2442913a5e07a1.zip | |
gpg: New option --with-tofu-info.
* g10/gpg.c (oWithTofuInfo): New.
(opts): Add --with-tofu-info.
(main): Set opt.with_tofu_info.
* g10/options.h (struct opt): Add field WITH_TOFU_INFO.
* g10/tofu.c (show_statistics): Add optional arg OUTFP and enter
special mode if not NULL. Change all callers.
(tofu_write_tfs_record): New.
* g10/keylist.c (list_keyblock_colon): Do not print the tofu policy as
part of the "uid" record. Print a new "tfs" record if the new option
is set.
* tests/openpgp/tofu.scm (getpolicy): Change from UID to TFS record.
--
A separate option is required to avoid slowing down key listings.
Foer example the current code takes for a keylisting in tofu+pgp mode
17 seconds while it takes more than 5 minutes if the option is used.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/openpgp/tofu.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm index 2b302baaa..448c253c9 100755 --- a/tests/openpgp/tofu.scm +++ b/tests/openpgp/tofu.scm @@ -46,11 +46,11 @@ ;; This function only supports keys with a single user id. (define (getpolicy keyid format . args) (let ((policy - (list-ref (assoc "uid" (gpg-with-colons + (list-ref (assoc "tfs" (gpg-with-colons `(--tofu-db-format ,format - --trust-model=tofu + --trust-model=tofu --with-tofu-info ,@args - --list-keys ,keyid))) 17))) + --list-keys ,keyid))) 5))) (unless (member policy '("auto" "good" "unknown" "bad" "ask")) (error "Bad policy:" policy)) policy)) |