mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-01 20:18:44 +01:00
f77913e0ff
* configure.ac: Check for sqlite3. (SQLITE3_CFLAGS): AC_SUBST it. (SQLITE3_LIBS): Likewise. * g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS). (gpg2_SOURCES): Add tofu.h and tofu.c. (gpg2_LDADD): Add $(SQLITE3_LIBS). * g10/tofu.c: New file. * g10/tofu.h: New file. * g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP. (tofu_db_format): Define. * g10/packet.h (PKT_signature): Add fields digest and digest_len. * g10/gpg.c: Include "tofu.h". (cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy, oTOFUDBFormat. (opts): Add them. (parse_trust_model): Recognize the tofu and tofu+pgp trust models. (parse_tofu_policy): New function. (parse_tofu_db_format): New function. (main): Initialize opt.tofu_default_policy and opt.tofu_db_format. Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat. * g10/mainproc.c (do_check_sig): If the signature is good, copy the hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately. * g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update callers. (tdb_get_validity_core): Add arguments sig and may_ask. Update callers. * g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them to tdb_get_validity_core. * g10/trustdb.c: Include "tofu.h". (trust_model_string): Handle TM_TOFU and TM_TOFU_PGP. (tdb_get_validity_core): Add arguments sig and may_ask. If OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust level. Combine it with the computed PGP trust level, if appropriate. * g10/keyedit.c: Include "tofu.h". (show_key_with_all_names_colon): If the trust mode is tofu or tofu+pgp, then show the trust policy. * g10/keylist.c: Include "tofu.h". (public_key_list): Also show the PGP stats if the trust model is TM_TOFU_PGP. (list_keyblock_colon): If the trust mode is tofu or tofu+pgp, then show the trust policy. * g10/pkclist.c: Include "tofu.h". * g10/gpgv.c (get_validity): Add arguments sig and may_ask. (enum tofu_policy): Define. (tofu_get_policy): New stub. (tofu_policy_str): Likewise. * g10/test-stubs.c (get_validity): Add arguments sig and may_ask. (enum tofu_policy): Define. (tofu_get_policy): New stub. (tofu_policy_str): Likewise. * doc/DETAILS: Describe the TOFU Policy field. * doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu, --trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format. * tests/openpgp/Makefile.am (TESTS): Add tofu.test. (TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc, tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt. (CLEANFILES): Add tofu.db. (clean-local): Add tofu.d. * tests/openpgp/tofu.test: New file. * tests/openpgp/tofu-2183839A-1.txt: New file. * tests/openpgp/tofu-BC15C85A-1.txt: New file. * tests/openpgp/tofu-EE37CF96-1.txt: New file. * tests/openpgp/tofu-keys.asc: New file. * tests/openpgp/tofu-keys-secret.asc: New file. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>. |
||
|---|---|---|
| .. | ||
| privkeys | ||
| samplekeys | ||
| 4gb-packet.asc | ||
| 4gb-packet.test | ||
| armdetach.test | ||
| armdetachm.test | ||
| armencrypt.test | ||
| armencryptp.test | ||
| armor.test | ||
| armsignencrypt.test | ||
| armsigs.test | ||
| bug537-test.data.asc | ||
| bug894-test.asc | ||
| bug1223-bogus.asc | ||
| bug1223-good.asc | ||
| ChangeLog-2011 | ||
| clearsig.test | ||
| conventional-mdc.test | ||
| conventional.test | ||
| decrypt-dsa.test | ||
| decrypt.test | ||
| defs.inc | ||
| detach.test | ||
| detachm.test | ||
| ecc.test | ||
| encrypt-dsa.test | ||
| encrypt.test | ||
| encryptp.test | ||
| finish.test | ||
| genkey1024.test | ||
| gpg-agent.conf.tmpl | ||
| gpg.conf.tmpl | ||
| import.test | ||
| Makefile.am | ||
| mds.test | ||
| mkdemodirs | ||
| multisig.test | ||
| pgp263-test.pub.asc | ||
| pgp263-test.sec.asc | ||
| pinentry.sh | ||
| plain-1-pgp.asc | ||
| plain-1.asc | ||
| plain-1o.asc | ||
| plain-2.asc | ||
| plain-2o.asc | ||
| plain-3.asc | ||
| plain-3o.asc | ||
| pubdemo.asc | ||
| pubring.asc | ||
| pubring.pkr.asc | ||
| seat.test | ||
| secdemo.asc | ||
| secring.asc | ||
| secring.skr.asc | ||
| signdemokey | ||
| signencrypt-dsa.test | ||
| signencrypt.test | ||
| sigs-dsa.test | ||
| sigs.test | ||
| tofu-2183839A-1.txt | ||
| tofu-BC15C85A-1.txt | ||
| tofu-EE37CF96-1.txt | ||
| tofu-keys-secret.asc | ||
| tofu-keys.asc | ||
| tofu.test | ||
| verify.test | ||
| version.test | ||