diff options
author | Werner Koch <wk@gnupg.org> | 2017-02-28 20:28:56 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2017-02-28 20:30:48 +0100 |
commit | e182542e90cbeff4f2ac6c8d71061356d7cdcdea (patch) | |
tree | bb6b89c7dad607f50868749daea1af29411e0f8b /g10/mainproc.c | |
parent | gpgscm: Improve parsing. (diff) | |
download | gnupg2-e182542e90cbeff4f2ac6c8d71061356d7cdcdea.tar.xz gnupg2-e182542e90cbeff4f2ac6c8d71061356d7cdcdea.zip |
gpg: Do not require a trustdb for decryption.
* g10/trustdb.c (init_trustdb): Add and implement arg NO_CREATE.
Change to return an error code. Change all callers to to pass False
for NO_CREATE.
(tdb_get_ownertrust): New arg NO_CREATE. Call init_trustdb to test
for a non-existing trustdb. Change all callers to to pass False for
NO_CREATE.
(tdb_get_min_ownertrust): Ditto.
* g10/trust.c (get_ownertrust_with_min): Add arg NO_CREATE. Call
init_trustdb for a quick check.
(get_ownertrust_info): Add arg NO_CREATE.
(get_ownertrust_string): Ditto.
* g10/gpgv.c (get_ownertrust_info): Adjust stub.
* g10/test-stubs.c (get_ownertrust_info): Ditto.
* g10/mainproc.c (list_node): Call get_ownertrust_info with NO_CREATE
set.
* g10/pubkey-enc.c (get_it): Ditto.
--
Fixes-commit: effa80e0b5fd8cf9e31a984afe391c2406edee8b
For details see mails on Feb 27 and 28 by dkg, gniibe, and Justus to
gnupg-devel 'test failure on git master with
decrypt-session-key.scm (and: continuous integration?)'
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r-- | g10/mainproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 8e2989187..4f8d0be3f 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1032,7 +1032,7 @@ list_node (CTX c, kbnode_t node) colon_datestr_from_pk( pk ), colon_strtime (pk->expiredate) ); if (pk->flags.primary && !opt.fast_list_mode) - es_putc (get_ownertrust_info (pk), es_stdout); + es_putc (get_ownertrust_info (pk, 1), es_stdout); es_putc (':', es_stdout); es_putc ('\n', es_stdout); } |