From 62fb86c6589f7f74dad4741db31b3aefa0848420 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 10 Feb 2014 17:05:54 +0100 Subject: gpg: Allow building without any trust model support. * configure.ac: Add option --disable-trust-models (NO_TRUST_MODELS): New ac_define and am_conditional. * g10/Makefile.am (trust_source): New. (gpg2_SOURCES): Factor some files out to above. Add trust.c. * g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust, --import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb, --list-trustdb, --trustdb-name, --auto-check-trustdb, --no-auto-check-trustdb, and --force-ownertrust. (parse_trust_model) [NO_TRUST_MODELS]: Do not build. (main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all trustdb related option code. * g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust", "enable", and "disable". * g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print "tru" record. * g10/trust.c: New. * g10/trustdb.c (struct key_item): Move to trustdb.h. (register_trusted_keyid): Rename to tdb_register_trusted_keyid. (register_trusted_key): Rename to tdb_register_trusted_key. (trust_letter, uid_trust_string_fixed, trust_value_to_string) (string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info) (get_ownertrust_string, get_validity_info, get_validity_string) (clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c. (mark_usable_uid_certs): Move to trust.c and make global. (is_in_klist): Move as inline to trustdb.h. (trustdb_check_or_update): Rename to tdb_check_or_update (revalidation_mark): Rename to tdb_revalidation_mark. (get_ownertrust): Rename to tdb_get_ownertrust. (get_min_ownertrust): Rename to tdb_get_min_ownertrust. (update_ownertrust): Rename to tdb_update_ownertrust. (clear_ownertrusts): Rename to tdb_clear_ownertrusts. (cache_disabled_value): Rename to tdb_cache_disabled_value. (check_trustdb_stale): Rename to tdb_check_trustdb_stale. (get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and factor some code out to ... * trust.c (get_validity): ...new. (check_or_update_trustdb): New wrapper. (revalidation_mark): New wrapper. (get_ownertrust): New wrapper. (get_ownertrust_with_min): New wrapper. (update_ownertrust): New wrapper. (clear_ownertrusts): New wrapper. (cache_disabled_value): New wrapper. (check_trustdb_stale): New wrapper. * tests/openpgp/defs.inc (opt_always): New. Use in all tests instead of --always-trust. --- g10/pkclist.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'g10/pkclist.c') diff --git a/g10/pkclist.c b/g10/pkclist.c index d94f59e11..a6d687a0f 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -176,6 +176,7 @@ show_revocation_reason( PKT_public_key *pk, int mode ) * 0 = nothing changed * 1 = new ownertrust now in new_trust */ +#ifndef NO_TRUST_MODELS static int do_edit_ownertrust (PKT_public_key *pk, int mode, unsigned *new_trust, int defer_help ) @@ -187,7 +188,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, int show=0; int min_num; int did_help=defer_help; - unsigned int minimum=get_min_ownertrust(pk); + unsigned int minimum = tdb_get_min_ownertrust (pk); char pkstrbuf[PUBKEY_STRING_SIZE]; switch(minimum) @@ -365,12 +366,15 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, xfree(p); return show? -2: quit? -1 : changed; } +#endif /*!NO_TRUST_MODELS*/ + /* * Display a menu to change the ownertrust of the key PK (which should * be a primary key). * For mode values see do_edit_ownertrust () */ +#ifndef NO_TRUST_MODELS int edit_ownertrust (PKT_public_key *pk, int mode ) { @@ -396,6 +400,7 @@ edit_ownertrust (PKT_public_key *pk, int mode ) } } } +#endif /*!NO_TRUST_MODELS*/ /**************** -- cgit v1.2.3