mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-08 23:37:47 +02: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>.
186 lines
4.7 KiB
Makefile
186 lines
4.7 KiB
Makefile
# Copyright (C) 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2006, 2010 Free Software Foundation, Inc.
|
|
#
|
|
# 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
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
|
|
ChangeLog-2011 gpg-w32info.rc \
|
|
gpg.w32-manifest.in test.c t-keydb-keyring.kbx
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/common
|
|
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
|
|
$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
|
|
|
|
needed_libs = ../kbx/libkeybox.a $(libcommon)
|
|
|
|
bin_PROGRAMS = gpg2
|
|
if !HAVE_W32CE_SYSTEM
|
|
bin_PROGRAMS += gpgv2
|
|
endif
|
|
noinst_PROGRAMS = $(module_tests)
|
|
TESTS = $(module_tests)
|
|
|
|
if ENABLE_BZIP2_SUPPORT
|
|
bzip2_source = compress-bz2.c
|
|
else
|
|
bzip2_source =
|
|
endif
|
|
|
|
if ENABLE_CARD_SUPPORT
|
|
card_source = card-util.c
|
|
else
|
|
card_source =
|
|
endif
|
|
|
|
if NO_TRUST_MODELS
|
|
trust_source =
|
|
else
|
|
trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h
|
|
endif
|
|
|
|
|
|
if HAVE_W32_SYSTEM
|
|
resource_objs += gpg-w32info.o
|
|
|
|
gpg-w32info.o : gpg.w32-manifest
|
|
|
|
endif
|
|
|
|
common_source = \
|
|
gpg.h \
|
|
dek.h \
|
|
build-packet.c \
|
|
compress.c \
|
|
$(bzip2_source) \
|
|
filter.h \
|
|
free-packet.c \
|
|
getkey.c \
|
|
keydb.c keydb.h \
|
|
keyring.c keyring.h \
|
|
seskey.c \
|
|
kbnode.c \
|
|
main.h \
|
|
mainproc.c \
|
|
armor.c \
|
|
mdfilter.c \
|
|
textfilter.c \
|
|
progress.c \
|
|
misc.c \
|
|
rmd160.c rmd160.h \
|
|
options.h \
|
|
openfile.c \
|
|
keyid.c \
|
|
packet.h \
|
|
parse-packet.c \
|
|
cpr.c \
|
|
plaintext.c \
|
|
sig-check.c \
|
|
keylist.c \
|
|
pkglue.c pkglue.h \
|
|
ecdh.c
|
|
|
|
gpg2_SOURCES = gpg.c \
|
|
server.c \
|
|
$(common_source) \
|
|
pkclist.c \
|
|
skclist.c \
|
|
pubkey-enc.c \
|
|
passphrase.c \
|
|
decrypt.c \
|
|
decrypt-data.c \
|
|
cipher.c \
|
|
encrypt.c \
|
|
sign.c \
|
|
verify.c \
|
|
revoke.c \
|
|
keyedit.c \
|
|
dearmor.c \
|
|
import.c \
|
|
export.c \
|
|
migrate.c \
|
|
delkey.c \
|
|
keygen.c \
|
|
helptext.c \
|
|
keyserver.c \
|
|
keyserver-internal.h \
|
|
call-dirmngr.c call-dirmngr.h \
|
|
photoid.c photoid.h \
|
|
call-agent.c call-agent.h \
|
|
trust.c $(trust_source) \
|
|
$(card_source) \
|
|
exec.c exec.h \
|
|
tofu.h tofu.c
|
|
|
|
gpgv2_SOURCES = gpgv.c \
|
|
$(common_source) \
|
|
verify.c
|
|
|
|
#gpgd_SOURCES = gpgd.c \
|
|
# ks-proto.h \
|
|
# ks-proto.c \
|
|
# ks-db.c \
|
|
# ks-db.h \
|
|
# $(common_source)
|
|
|
|
LDADD = $(needed_libs) ../common/libgpgrl.a \
|
|
$(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
|
|
gpg2_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
|
|
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBICONV) $(resource_objs) $(extra_sys_libs)
|
|
gpg2_LDFLAGS = $(extra_bin_ldflags)
|
|
gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
|
|
$(GPG_ERROR_LIBS) \
|
|
$(LIBICONV) $(resource_objs) $(extra_sys_libs)
|
|
gpgv2_LDFLAGS = $(extra_bin_ldflags)
|
|
|
|
t_common_ldadd =
|
|
module_tests = t-rmd160 t-keydb
|
|
t_rmd160_SOURCES = t-rmd160.c rmd160.c
|
|
t_rmd160_LDADD = $(t_common_ldadd)
|
|
t_keydb_SOURCES = t-keydb.c test-stubs.c $(common_source)
|
|
t_keydb_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBICONV) $(t_common_ldadd)
|
|
|
|
|
|
$(PROGRAMS): $(needed_libs) ../common/libgpgrl.a
|
|
|
|
install-data-local:
|
|
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
|
$(INSTALL_DATA) $(srcdir)/options.skel \
|
|
$(DESTDIR)$(pkgdatadir)/gpg-conf.skel
|
|
$(INSTALL_DATA) $(srcdir)/dirmngr-conf.skel \
|
|
$(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
|
|
$(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
|
|
$(DESTDIR)$(pkgdatadir)/distsigkey.gpg
|
|
|
|
uninstall-local:
|
|
-@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
|
|
-@rm $(DESTDIR)$(pkgdatadir)/dirmngr-conf.skel
|
|
-@rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
|
|
|
|
|
|
# There has never been a gpg for WindowsCE, thus we don't need a gpg2 here
|
|
if HAVE_W32CE_SYSTEM
|
|
install-exec-hook:
|
|
mv -f $(DESTDIR)$(bindir)/gpg2$(EXEEXT) \
|
|
$(DESTDIR)$(bindir)/gpg$(EXEEXT)
|
|
endif
|