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/trustdb.h | |
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 '')
-rw-r--r-- | g10/trustdb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/trustdb.h b/g10/trustdb.h index 6081d1088..3088063aa 100644 --- a/g10/trustdb.h +++ b/g10/trustdb.h @@ -127,7 +127,7 @@ void update_trustdb (ctrl_t ctrl); int setup_trustdb( int level, const char *dbname ); void how_to_fix_the_trustdb (void); const char *trust_model_string (int model); -void init_trustdb( void ); +gpg_error_t init_trustdb (int no_create); void tdb_check_trustdb_stale (ctrl_t ctrl); void sync_trustdb( void ); @@ -152,10 +152,10 @@ void read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck, byte *marginals,byte *completes,byte *cert_depth, byte *min_cert_level); -unsigned int tdb_get_ownertrust (PKT_public_key *pk); -unsigned int tdb_get_min_ownertrust (PKT_public_key *pk); -int get_ownertrust_info (PKT_public_key *pk); -const char *get_ownertrust_string (PKT_public_key *pk); +unsigned int tdb_get_ownertrust (PKT_public_key *pk, int no_create); +unsigned int tdb_get_min_ownertrust (PKT_public_key *pk, int no_create); +int get_ownertrust_info (PKT_public_key *pk, int no_create); +const char *get_ownertrust_string (PKT_public_key *pk, int no_create); void tdb_update_ownertrust (PKT_public_key *pk, unsigned int new_trust); int tdb_clear_ownertrusts (PKT_public_key *pk); |