2010-10-14 16:34:31 +00:00
|
|
|
# Makefile.am - For tests/openpgp
|
|
|
|
|
# Copyright (C) 1998, 1999, 2000, 2001, 2003,
|
|
|
|
|
# 2010 Free Software Foundation, Inc.
|
2006-08-21 20:20:23 +00:00
|
|
|
#
|
|
|
|
|
# This file is part of GnuPG.
|
|
|
|
|
#
|
|
|
|
|
# GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
2006-08-21 20:20:23 +00:00
|
|
|
# (at your option) any later version.
|
2011-02-10 20:16:06 +01:00
|
|
|
#
|
2006-08-21 20:20:23 +00:00
|
|
|
# GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
2011-02-10 20:16:06 +01:00
|
|
|
#
|
2006-08-21 20:20:23 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2006-08-21 20:20:23 +00:00
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
|
|
|
|
|
|
|
2010-01-08 19:18:49 +00:00
|
|
|
# Programs required before we can run these tests.
|
2016-04-04 17:42:24 +02:00
|
|
|
required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \
|
2016-01-12 11:43:06 +01:00
|
|
|
../../tools/gpg-connect-agent$(EXEEXT) \
|
|
|
|
|
../../tools/mk-tdata$(EXEEXT)
|
2010-01-08 19:18:49 +00:00
|
|
|
|
2016-01-22 11:47:58 +01:00
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/common
|
|
|
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
|
|
|
|
|
|
AM_CFLAGS =
|
|
|
|
|
|
|
|
|
|
noinst_PROGRAMS = fake-pinentry
|
|
|
|
|
|
|
|
|
|
fake_pinentry_SOURCES = fake-pinentry.c
|
|
|
|
|
|
2010-10-14 08:32:55 +00:00
|
|
|
TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
|
2010-06-07 15:11:35 +00:00
|
|
|
|
2015-11-23 12:39:22 +01:00
|
|
|
if SQLITE3
|
|
|
|
|
sqlite3_dependent_tests = tofu.test
|
|
|
|
|
else
|
|
|
|
|
sqlite3_dependent_tests =
|
|
|
|
|
endif
|
|
|
|
|
|
2010-10-14 16:34:31 +00:00
|
|
|
# Note: version.test needs to be the first test to run and finish.test
|
|
|
|
|
# the last one
|
2006-08-21 20:20:23 +00:00
|
|
|
TESTS = version.test mds.test \
|
|
|
|
|
decrypt.test decrypt-dsa.test \
|
|
|
|
|
sigs.test sigs-dsa.test \
|
|
|
|
|
encrypt.test encrypt-dsa.test \
|
|
|
|
|
seat.test clearsig.test encryptp.test detach.test \
|
|
|
|
|
armsigs.test armencrypt.test armencryptp.test \
|
|
|
|
|
signencrypt.test signencrypt-dsa.test \
|
|
|
|
|
armsignencrypt.test armdetach.test \
|
|
|
|
|
armdetachm.test detachm.test genkey1024.test \
|
|
|
|
|
conventional.test conventional-mdc.test \
|
2008-03-20 15:31:43 +00:00
|
|
|
multisig.test verify.test armor.test \
|
2015-11-23 12:39:22 +01:00
|
|
|
import.test ecc.test 4gb-packet.test \
|
|
|
|
|
$(sqlite3_dependent_tests) \
|
2015-12-22 14:21:18 +01:00
|
|
|
gpgtar.test use-exact-key.test default-key.test \
|
g10: Add TOFU support.
* 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>.
2015-10-18 18:44:05 +02:00
|
|
|
finish.test
|
2006-08-21 20:20:23 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
|
|
|
|
|
plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
|
2016-04-04 18:38:53 +02:00
|
|
|
plain-largeo.asc \
|
2006-08-21 20:20:23 +00:00
|
|
|
pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
|
2010-05-11 18:00:31 +00:00
|
|
|
gpg.conf.tmpl gpg-agent.conf.tmpl \
|
|
|
|
|
bug537-test.data.asc bug894-test.asc \
|
g10: Add TOFU support.
* 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>.
2015-10-18 18:44:05 +02:00
|
|
|
bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
|
|
|
|
|
tofu-keys.asc tofu-keys-secret.asc \
|
|
|
|
|
tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt
|
2006-08-21 20:20:23 +00:00
|
|
|
|
2010-10-14 16:34:31 +00:00
|
|
|
data_files = data-500 data-9000 data-32000 data-80000 plain-large
|
|
|
|
|
|
|
|
|
|
priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
|
|
|
|
|
privkeys/7E201E28B6FEB2927B321F443205F4724EBE637E.asc \
|
|
|
|
|
privkeys/13FDB8809B17C5547779F9D205C45F47CE0217CE.asc \
|
|
|
|
|
privkeys/343D8AF79796EE107D645A2787A9D9252F924E6F.asc \
|
|
|
|
|
privkeys/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.asc \
|
|
|
|
|
privkeys/0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255.asc \
|
|
|
|
|
privkeys/FD692BD59D6640A84C8422573D469F84F3B98E53.asc \
|
|
|
|
|
privkeys/76F7E2B35832976B50A27A282D9B87E44577EB66.asc \
|
2014-09-12 11:31:49 +02:00
|
|
|
privkeys/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD.asc \
|
2015-05-16 12:20:02 +02:00
|
|
|
privkeys/0DD40284FF992CD24DC4AAC367037E066FCEE26A.asc \
|
|
|
|
|
privkeys/2BC997C0B8691D41D29A4EC81CCBCF08454E4961.asc \
|
|
|
|
|
privkeys/3C9D5ECA70130C2DBB1FC6AC0076BEEEC197716F.asc \
|
|
|
|
|
privkeys/449E644892C951A37525654730DD32C202079926.asc \
|
|
|
|
|
privkeys/58FFE844087634E62440224908BDE44BEA7EB730.asc \
|
|
|
|
|
privkeys/4DF9172D6FF428C97A0E9AA96F03E8BCE3B2F188.asc \
|
|
|
|
|
privkeys/9D7CD8F53F2F14C3E2177D1E9D1D11F39513A4A4.asc \
|
|
|
|
|
privkeys/6E6B7ED0BD4425018FFC54F3921D5467A3AE00EB.asc \
|
|
|
|
|
privkeys/C905D0AB6AE9655C5A35975939997BBF3325D6DD.asc \
|
|
|
|
|
privkeys/B2BAA7144303DF19BB6FDE23781DD3FDD97918D4.asc \
|
|
|
|
|
privkeys/CF60965BF51F67CF80DECE853E0D2D343468571D.asc \
|
2015-12-02 20:51:52 +01:00
|
|
|
privkeys/DF00E361D34F80868D06879AC21D7A7D4E4FAD76.asc \
|
|
|
|
|
privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc \
|
|
|
|
|
privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc \
|
|
|
|
|
privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc \
|
|
|
|
|
privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc \
|
|
|
|
|
privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc
|
2015-05-16 12:20:02 +02:00
|
|
|
|
2010-10-14 16:34:31 +00:00
|
|
|
|
2011-02-10 20:16:06 +01:00
|
|
|
sample_keys = samplekeys/ecc-sample-1-pub.asc \
|
|
|
|
|
samplekeys/ecc-sample-2-pub.asc \
|
|
|
|
|
samplekeys/ecc-sample-3-pub.asc \
|
|
|
|
|
samplekeys/ecc-sample-1-sec.asc \
|
|
|
|
|
samplekeys/ecc-sample-2-sec.asc \
|
2014-09-12 11:31:49 +02:00
|
|
|
samplekeys/ecc-sample-3-sec.asc \
|
|
|
|
|
samplekeys/eddsa-sample-1-pub.asc \
|
2014-10-13 13:56:47 +02:00
|
|
|
samplekeys/eddsa-sample-1-sec.asc \
|
|
|
|
|
samplekeys/dda252ebb8ebe1af-1.asc \
|
2015-05-16 12:20:02 +02:00
|
|
|
samplekeys/dda252ebb8ebe1af-2.asc \
|
2015-10-05 10:58:00 +02:00
|
|
|
samplekeys/whats-new-in-2.1.asc \
|
|
|
|
|
samplekeys/e2e-p256-1-clr.asc \
|
2015-12-02 20:51:52 +01:00
|
|
|
samplekeys/e2e-p256-1-prt.asc \
|
|
|
|
|
samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc
|
2006-08-21 20:20:23 +00:00
|
|
|
|
2011-12-01 10:51:36 +01:00
|
|
|
EXTRA_DIST = defs.inc pinentry.sh $(TESTS) $(TEST_FILES) ChangeLog-2011 \
|
2011-02-10 20:16:06 +01:00
|
|
|
mkdemodirs signdemokey $(priv_keys) $(sample_keys)
|
2010-05-11 18:00:31 +00:00
|
|
|
|
2010-10-14 16:34:31 +00:00
|
|
|
CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
|
2006-08-21 20:20:23 +00:00
|
|
|
plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
|
2010-05-11 18:00:31 +00:00
|
|
|
*.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
|
2014-10-03 13:02:06 +02:00
|
|
|
pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
|
|
|
|
|
secring.gpg pubring.pkr secring.skr \
|
g10: Add TOFU support.
* 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>.
2015-10-18 18:44:05 +02:00
|
|
|
gnupg-test.stop random_seed gpg-agent.log tofu.db
|
2010-10-15 09:16:39 +00:00
|
|
|
|
|
|
|
|
clean-local:
|
2015-11-25 18:32:09 +01:00
|
|
|
-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d
|
2006-10-02 11:54:35 +00:00
|
|
|
|
2006-08-21 20:20:23 +00:00
|
|
|
|
2010-01-08 19:18:49 +00:00
|
|
|
# We need to depend on a couple of programs so that the tests don't
|
|
|
|
|
# start before all programs are built.
|
2010-10-14 16:34:31 +00:00
|
|
|
all-local: $(required_pgms)
|