diff options
| author | Werner Koch <[email protected]> | 2017-02-28 19:28:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-02-28 19:30:48 +0000 |
| commit | e182542e90cbeff4f2ac6c8d71061356d7cdcdea (patch) | |
| tree | bb6b89c7dad607f50868749daea1af29411e0f8b /g10/keyedit.c | |
| parent | gpgscm: Improve parsing. (diff) | |
| download | gnupg-e182542e90cbeff4f2ac6c8d71061356d7cdcdea.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keyedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index ab66d0163..892da1ad5 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3679,7 +3679,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock) (ulong) pk->timestamp, (ulong) pk->expiredate); if (node->pkt->pkttype == PKT_PUBLIC_KEY && !(opt.fast_list_mode || opt.no_expensive_trust_checks)) - es_putc (get_ownertrust_info (pk), fp); + es_putc (get_ownertrust_info (pk, 0), fp); es_putc (':', fp); es_putc (':', fp); es_putc (':', fp); @@ -3896,7 +3896,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp, static int did_warn = 0; trust = get_validity_string (ctrl, pk, NULL); - otrust = get_ownertrust_string (pk); + otrust = get_ownertrust_string (pk, 0); /* Show a warning once */ if (!did_warn |