mirror of git://git.gnupg.org/gnupg.git
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>. |
||
|---|---|---|
| .. | ||
| examples | ||
| ChangeLog-2011 | ||
| DCO | ||
| DETAILS | ||
| FAQ | ||
| HACKING | ||
| KEYSERVER | ||
| Makefile.am | ||
| Notes | ||
| OpenPGP | ||
| TRANSLATE | ||
| a-decade-of-gnupg.txt | ||
| announce-2.0.txt | ||
| announce-2.1.txt | ||
| com-certs.pem | ||
| contrib.texi | ||
| debugging.texi | ||
| dirmngr.texi | ||
| faq.org | ||
| fdl.texi | ||
| glossary.texi | ||
| gnupg-badge-openpgp.eps | ||
| gnupg-badge-openpgp.jpg | ||
| gnupg-badge-openpgp.pdf | ||
| gnupg-card-architecture.fig | ||
| gnupg-logo-tr.png | ||
| gnupg-logo.eps | ||
| gnupg-logo.pdf | ||
| gnupg-logo.png | ||
| gnupg.texi | ||
| gnupg7.texi | ||
| gpg-agent.texi | ||
| gpg.texi | ||
| gpgsm.texi | ||
| gpgv.texi | ||
| gpl.texi | ||
| help.be.txt | ||
| help.ca.txt | ||
| help.cs.txt | ||
| help.da.txt | ||
| help.de.txt | ||
| help.el.txt | ||
| help.eo.txt | ||
| help.es.txt | ||
| help.et.txt | ||
| help.fi.txt | ||
| help.fr.txt | ||
| help.gl.txt | ||
| help.hu.txt | ||
| help.id.txt | ||
| help.it.txt | ||
| help.ja.txt | ||
| help.nb.txt | ||
| help.pl.txt | ||
| help.pt.txt | ||
| help.pt_BR.txt | ||
| help.ro.txt | ||
| help.ru.txt | ||
| help.sk.txt | ||
| help.sv.txt | ||
| help.tr.txt | ||
| help.txt | ||
| help.zh_CN.txt | ||
| help.zh_TW.txt | ||
| howto-create-a-server-cert.texi | ||
| howtos.texi | ||
| instguide.texi | ||
| mkdefsinc.c | ||
| mksamplekeys | ||
| opt-homedir.texi | ||
| qualified.txt | ||
| samplekeys.asc | ||
| scdaemon.texi | ||
| see-also-note.texi | ||
| specify-user-id.texi | ||
| sysnotes.texi | ||
| texi.css | ||
| tools.texi | ||
| vuln-announce-2007-multiple-message.txt | ||
| vuln-announce-2010-kbx-realloc.txt | ||
| vuln-announce-cve-2006-6235.txt | ||
| whats-new-in-2.1.txt | ||
| yat2m.c | ||
