security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Remove -I option to common.

Browse source 
* dirmngr/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* g10/Makefile.am (AM_CPPFLAGS): Ditto.
* g13/Makefile.am (AM_CPPFLAGS): Ditto.
* kbx/Makefile.am (AM_CPPFLAGS): Ditto.
* scd/Makefile.am (AM_CPPFLAGS): Ditto.
* sm/Makefile.am (AM_CPPFLAGS): Ditto.
* tools/Makefile.am (AM_CPPFLAGS): Ditto.
* Throughout: Follow the change.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-03-07 20:21:23 +09:00
parent de3838372a
commit 70aca95d68
164 changed files with 446 additions and 451 deletions
Download patch file Download diff file Expand all files Collapse all files

2
g10/Makefile.am
View file

@ -23,7 +23,7 @@ EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
t-keydb-get-keyblock.gpg t-stutter-data.asc
AM_CPPFLAGS = -I$(top_srcdir)/common
AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am

9
g10/armor.c
View file

@ -26,15 +26,14 @@
#include <ctype.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/i18n.h"
#define MAX_LINELEN 20000

10
g10/build-packet.c
View file

@ -25,13 +25,13 @@
#include <ctype.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/i18n.h"
#include "options.h"
#include "host2net.h"
#include "../common/host2net.h"
static int do_user_id( IOBUF out, int ctb, PKT_user_id *uid );
static int do_key (iobuf_t out, int ctb, PKT_public_key *pk);

14
g10/call-agent.c
View file

@ -31,16 +31,16 @@
#include "gpg.h"
#include <assuan.h>
#include "util.h"
#include "membuf.h"
#include "../common/util.h"
#include "../common/membuf.h"
#include "options.h"
#include "i18n.h"
#include "asshelp.h"
#include "sysutils.h"
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
#include "call-agent.h"
#include "status.h"
#include "../common/status.h"
#include "../common/shareddefs.h"
#include "host2net.h"
#include "../common/host2net.h"
#define CONTROL_D ('D' - 'A' + 1)

12
g10/call-dirmngr.c
View file

@ -31,13 +31,13 @@
#include "gpg.h"
#include <assuan.h>
#include "util.h"
#include "membuf.h"
#include "../common/util.h"
#include "../common/membuf.h"
#include "options.h"
#include "i18n.h"
#include "asshelp.h"
#include "keyserver.h"
#include "status.h"
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/keyserver.h"
#include "../common/status.h"
#include "call-dirmngr.h"

8
g10/card-util.c
View file

@ -31,10 +31,10 @@
#if GNUPG_MAJOR_VERSION != 1
# include "gpg.h"
#endif /*GNUPG_MAJOR_VERSION != 1*/
#include "util.h"
#include "i18n.h"
#include "ttyio.h"
#include "status.h"
#include "../common/util.h"
#include "../common/i18n.h"
#include "../common/ttyio.h"
#include "../common/status.h"
#include "options.h"
#include "main.h"
#include "keyserver-internal.h"

8
g10/cipher.c
View file

@ -25,14 +25,14 @@
#include <errno.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
#include "status.h"
#include "../common/status.h"
#define MIN_PARTIAL_SIZE 512

2
g10/compress-bz2.c
View file

@ -23,7 +23,7 @@
#include <bzlib.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "filter.h"
#include "main.h"

2
g10/compress.c
View file

@ -38,7 +38,7 @@
#endif
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "filter.h"
#include "main.h"

8
g10/cpr.c
View file

@ -29,12 +29,12 @@
#endif
#include "gpg.h"
#include "util.h"
#include "status.h"
#include "ttyio.h"
#include "../common/util.h"
#include "../common/status.h"
#include "../common/ttyio.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
#define CONTROL_D ('D' - 'A' + 1)

8
g10/dearmor.c
View file

@ -24,14 +24,14 @@
#include <errno.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "filter.h"
#include "packet.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
/****************
* Take an armor file and write it out without armor

6
g10/decrypt-data.c
View file

@ -24,11 +24,11 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "options.h"
#include "i18n.h"
#include "status.h"
#include "../common/i18n.h"
#include "../common/status.h"
static int mdc_decode_filter ( void *opaque, int control, IOBUF a,

10
g10/decrypt.c
View file

@ -27,13 +27,13 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
/* Assume that the input is an encrypted message and decrypt
* (and if signed, verify the signature on) it.

11
g10/delkey.c
View file

@ -29,16 +29,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
#include "filter.h"
#include "ttyio.h"
#include "status.h"
#include "i18n.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
#include "call-agent.h"

2
g10/ecdh.c
View file

@ -24,7 +24,7 @@
#include <errno.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "pkglue.h"
#include "main.h"
#include "options.h"

10
g10/encrypt.c
View file

@ -28,15 +28,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "filter.h"
#include "trustdb.h"
#include "i18n.h"
#include "status.h"
#include "../common/i18n.h"
#include "../common/status.h"
#include "pkglue.h"

10
g10/exec.c
View file

@ -45,11 +45,11 @@
#include "gpg.h"
#include "options.h"
#include "i18n.h"
#include "iobuf.h"
#include "util.h"
#include "membuf.h"
#include "sysutils.h"
#include "../common/i18n.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "../common/membuf.h"
#include "../common/sysutils.h"
#include "exec.h"
#ifdef NO_EXEC

18
g10/export.c
View file

@ -28,17 +28,17 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "i18n.h"
#include "membuf.h"
#include "host2net.h"
#include "zb32.h"
#include "recsel.h"
#include "mbox-util.h"
#include "init.h"
#include "../common/i18n.h"
#include "../common/membuf.h"
#include "../common/host2net.h"
#include "../common/zb32.h"
#include "../common/recsel.h"
#include "../common/mbox-util.h"
#include "../common/init.h"
#include "trustdb.h"
#include "call-agent.h"

2
g10/filter.h
View file

@ -20,7 +20,7 @@
#ifndef G10_FILTER_H
#define G10_FILTER_H
#include "types.h"
#include "../common/types.h"
#include "dek.h"
typedef struct {

2
g10/free-packet.c
View file

@ -24,7 +24,7 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "../common/iobuf.h"
#include "options.h"

12
g10/getkey.c
View file

@ -26,19 +26,19 @@
#include <ctype.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "options.h"
#include "main.h"
#include "trustdb.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "host2net.h"
#include "mbox-util.h"
#include "status.h"
#include "../common/host2net.h"
#include "../common/mbox-util.h"
#include "../common/status.h"
#define MAX_PK_CACHE_ENTRIES PK_UID_CACHE_SIZE
#define MAX_UID_CACHE_ENTRIES PK_UID_CACHE_SIZE

16
g10/gpg.c
View file

@ -41,22 +41,22 @@
#include "gpg.h"
#include <assuan.h>
#include "../common/iobuf.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "membuf.h"
#include "../common/membuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
#include "ttyio.h"
#include "i18n.h"
#include "sysutils.h"
#include "status.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "../common/status.h"
#include "keyserver-internal.h"
#include "exec.h"
#include "gc-opt-flags.h"
#include "asshelp.h"
#include "../common/gc-opt-flags.h"
#include "../common/asshelp.h"
#include "call-dirmngr.h"
#include "tofu.h"
#include "../common/init.h"

4
g10/gpgsql.c
View file

@ -23,8 +23,8 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "logging.h"
#include "../common/util.h"
#include "../common/logging.h"
#include "gpgsql.h"

12
g10/gpgv.c
View file

@ -35,18 +35,18 @@
#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
#include "ttyio.h"
#include "i18n.h"
#include "sysutils.h"
#include "status.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "../common/status.h"
#include "call-agent.h"
#include "../common/init.h"

6
g10/helptext.c
View file

@ -24,10 +24,10 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "ttyio.h"
#include "../common/util.h"
#include "../common/ttyio.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"

11
g10/import.c
View file

@ -27,15 +27,14 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "trustdb.h"
#include "main.h"
#include "i18n.h"
#include "ttyio.h"
#include "status.h"
#include "recsel.h"
#include "../common/i18n.h"
#include "../common/ttyio.h"
#include "../common/recsel.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "../common/membuf.h"

2
g10/kbnode.c
View file

@ -24,7 +24,7 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "../common/init.h"
#include "packet.h"
#include "keydb.h"

4
g10/keydb.c
View file

@ -28,14 +28,14 @@
#include <unistd.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "main.h" /*try_make_homedir ()*/
#include "packet.h"
#include "keyring.h"
#include "../kbx/keybox.h"
#include "keydb.h"
#include "i18n.h"
#include "../common/i18n.h"
static int active_handles;

4
g10/keydb.h
View file

@ -22,8 +22,8 @@
#ifndef G10_KEYDB_H
#define G10_KEYDB_H
#include "types.h"
#include "util.h"
#include "../common/types.h"
#include "../common/util.h"
#include "packet.h"
/* What qualifies as a certification (rather than a signature?) */

14
g10/keyedit.c
View file

@ -33,20 +33,20 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "photoid.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
#include "filter.h"
#include "ttyio.h"
#include "status.h"
#include "i18n.h"
#include "../common/ttyio.h"
#include "../common/status.h"
#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "host2net.h"
#include "../common/host2net.h"
#include "tofu.h"
static void show_prefs (PKT_user_id * uid, PKT_signature * selfsig,

12
g10/keygen.c
View file

@ -29,21 +29,21 @@
#include <unistd.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "packet.h"
#include "ttyio.h"
#include "../common/ttyio.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
#include "keyserver-internal.h"
#include "call-agent.h"
#include "pkglue.h"
#include "../common/shareddefs.h"
#include "host2net.h"
#include "mbox-util.h"
#include "../common/host2net.h"
#include "../common/mbox-util.h"
/* The default algorithms. If you change them remember to change them

6
g10/keyid.c
View file

@ -28,14 +28,14 @@
#include <time.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "packet.h"
#include "options.h"
#include "keydb.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "rmd160.h"
#include "host2net.h"
#include "../common/host2net.h"
#define KEYID_STR_SIZE 19

14
g10/keylist.c
View file

@ -31,18 +31,18 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "photoid.h"
#include "util.h"
#include "ttyio.h"
#include "../common/util.h"
#include "../common/ttyio.h"
#include "trustdb.h"
#include "main.h"
#include "i18n.h"
#include "status.h"
#include "../common/i18n.h"
#include "../common/status.h"
#include "call-agent.h"
#include "mbox-util.h"
#include "zb32.h"
#include "../common/mbox-util.h"
#include "../common/zb32.h"
#include "tofu.h"

4
g10/keyring.c
View file

@ -28,13 +28,13 @@
#include <sys/stat.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "keyring.h"
#include "packet.h"
#include "keydb.h"
#include "options.h"
#include "main.h" /*for check_key_signature()*/
#include "i18n.h"
#include "../common/i18n.h"
#include "../kbx/keybox.h"

2
g10/keyserver-internal.h
View file

@ -23,7 +23,7 @@
#include <time.h>
#include "../common/keyserver.h"
#include "../common/iobuf.h"
#include "types.h"
#include "../common/types.h"
int parse_keyserver_options(char *options);
void free_keyserver_spec(struct keyserver_spec *keyserver);

14
g10/keyserver.c
View file

@ -27,21 +27,21 @@
#include <errno.h>
#include "gpg.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "filter.h"
#include "keydb.h"
#include "status.h"
#include "../common/status.h"
#include "exec.h"
#include "main.h"
#include "i18n.h"
#include "ttyio.h"
#include "../common/i18n.h"
#include "../common/ttyio.h"
#include "options.h"
#include "packet.h"
#include "trustdb.h"
#include "keyserver-internal.h"
#include "util.h"
#include "membuf.h"
#include "mbox-util.h"
#include "../common/util.h"
#include "../common/membuf.h"
#include "../common/mbox-util.h"
#include "call-dirmngr.h"
#ifdef HAVE_W32_SYSTEM

6
g10/main.h
View file

@ -20,10 +20,10 @@
#ifndef G10_MAIN_H
#define G10_MAIN_H
#include "types.h"
#include "iobuf.h"
#include "../common/types.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
/* It could be argued that the default cipher should be 3DES rather
than AES128, and the default compression should be 0

10
g10/mainproc.c
View file

@ -25,19 +25,19 @@
#include <time.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "options.h"
#include "keydb.h"
#include "filter.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
#include "trustdb.h"
#include "keyserver-internal.h"
#include "photoid.h"
#include "mbox-util.h"
#include "../common/mbox-util.h"
#include "call-dirmngr.h"
/* Put an upper limit on nested packets. The 32 is an arbitrary

6
g10/mdfilter.c
View file

@ -24,9 +24,9 @@
#include <errno.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "filter.h"

2
g10/migrate.c
View file

@ -27,7 +27,7 @@
#include "gpg.h"
#include "options.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "call-agent.h"

8
g10/misc.c
View file

@ -59,15 +59,15 @@
#include "gpg.h"
#ifdef HAVE_W32_SYSTEM
# include "status.h"
# include "../common/status.h"
#endif /*HAVE_W32_SYSTEM*/
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "photoid.h"
#include "options.h"
#include "call-agent.h"
#include "i18n.h"
#include "zb32.h"
#include "../common/i18n.h"
#include "../common/zb32.h"
#ifdef ENABLE_SELINUX_HACKS

8
g10/openfile.c
View file

@ -29,12 +29,12 @@
#include <unistd.h>
#include "gpg.h"
#include "util.h"
#include "ttyio.h"
#include "../common/util.h"
#include "../common/ttyio.h"
#include "options.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
#ifdef USE_ONLY_8DOT3
#define SKELEXT ".skl"

2
g10/options.h
View file

@ -22,7 +22,7 @@
#define G10_OPTIONS_H
#include <sys/types.h>
#include <types.h>
#include "../common/types.h"
#include <stdint.h>
#include "main.h"
#include "packet.h"

4
g10/packet.h
View file

@ -22,14 +22,14 @@
#ifndef G10_PACKET_H
#define G10_PACKET_H
#include "types.h"
#include "../common/types.h"
#include "../common/iobuf.h"
#include "../common/strlist.h"
#include "dek.h"
#include "filter.h"
#include "../common/openpgpdefs.h"
#include "../common/userids.h"
#include "util.h"
#include "../common/util.h"
#define DEBUG_PARSE_PACKET 1

8
g10/parse-packet.c
View file

@ -26,15 +26,15 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "filter.h"
#include "photoid.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "host2net.h"
#include "../common/i18n.h"
#include "../common/host2net.h"
/* Maximum length of packets to avoid excessive memory allocation. */

8
g10/passphrase.c
View file

@ -33,13 +33,13 @@
#endif
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "ttyio.h"
#include "../common/ttyio.h"
#include "keydb.h"
#include "main.h"
#include "i18n.h"
#include "status.h"
#include "../common/i18n.h"
#include "../common/status.h"
#include "call-agent.h"
#include "../common/shareddefs.h"

10
g10/photoid.c
View file

@ -32,17 +32,17 @@
#endif
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "exec.h"
#include "keydb.h"
#include "i18n.h"
#include "iobuf.h"
#include "../common/i18n.h"
#include "../common/iobuf.h"
#include "options.h"
#include "main.h"
#include "photoid.h"
#include "ttyio.h"
#include "../common/ttyio.h"
#include "trustdb.h"
/* Generate a new photo id packet, or return NULL if canceled.

10
g10/pkclist.c
View file

@ -27,15 +27,15 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "trustdb.h"
#include "ttyio.h"
#include "status.h"
#include "../common/ttyio.h"
#include "../common/status.h"
#include "photoid.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "tofu.h"
#define CONTROL_D ('D' - 'A' + 1)

2
g10/pkglue.c
View file

@ -25,7 +25,7 @@
#include <errno.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "pkglue.h"
#include "main.h"
#include "options.h"

8
g10/plaintext.c
View file

@ -29,14 +29,14 @@
#endif
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "packet.h"
#include "ttyio.h"
#include "../common/ttyio.h"
#include "filter.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
/* Get the output filename. On success, the actual filename that is

6
g10/progress.c
View file

@ -21,10 +21,10 @@
#include <stdio.h>
#include "gpg.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "filter.h"
#include "status.h"
#include "util.h"
#include "../common/status.h"
#include "../common/util.h"
#include "options.h"
/* Create a new context for use with the progress filter. We need to

8
g10/pubkey-enc.c
View file

@ -24,17 +24,17 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "keydb.h"
#include "trustdb.h"
#include "status.h"
#include "../common/status.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "pkglue.h"
#include "call-agent.h"
#include "host2net.h"
#include "../common/host2net.h"
static gpg_error_t get_it (PKT_pubkey_enc *k,

9
g10/revoke.c
View file

@ -28,13 +28,12 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "ttyio.h"
#include "status.h"
#include "i18n.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
#include "call-agent.h"
struct revocation_reason_info {

6
g10/server.c
View file

@ -29,12 +29,12 @@
#include "gpg.h"
#include <assuan.h>
#include "util.h"
#include "i18n.h"
#include "../common/util.h"
#include "../common/i18n.h"
#include "options.h"
#include "../common/server-help.h"
#include "../common/sysutils.h"
#include "status.h"
#include "../common/status.h"
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))

4
g10/seskey.c
View file

@ -24,10 +24,10 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
/* Generate a new session key in *DEK that is appropriate for the

6
g10/sig-check.c
View file

@ -25,12 +25,12 @@
#include <string.h>
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "keydb.h"
#include "main.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
#include "options.h"
#include "pkglue.h"

16
g10/sign.c
View file

@ -27,20 +27,20 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "filter.h"
#include "ttyio.h"
#include "../common/ttyio.h"
#include "trustdb.h"
#include "status.h"
#include "i18n.h"
#include "../common/status.h"
#include "../common/i18n.h"
#include "pkglue.h"
#include "sysutils.h"
#include "../common/sysutils.h"
#include "call-agent.h"
#include "mbox-util.h"
#include "../common/mbox-util.h"
#ifdef HAVE_DOSISH_SYSTEM
#define LF "\r\n"

6
g10/skclist.c
View file

@ -27,10 +27,10 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "../common/status.h"
#include "keydb.h"
#include "util.h"
#include "i18n.h"
#include "../common/util.h"
#include "../common/i18n.h"
/* Return true if Libgcrypt's RNG is in faked mode. */

2
g10/t-stutter.c
View file

@ -54,7 +54,7 @@
#include "gpg.h"
#include "main.h"
#include "../common/types.h"
#include "util.h"
#include "../common/util.h"
#include "dek.h"
#include "../common/logging.h"

8
g10/tdbdump.c
View file

@ -29,15 +29,15 @@
#include <unistd.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "trustdb.h"
#include "options.h"
#include "packet.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "tdbio.h"

8
g10/tdbio.c
View file

@ -29,12 +29,12 @@
#include <unistd.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "options.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "trustdb.h"
#include "tdbio.h"

2
g10/tdbio.h
View file

@ -20,7 +20,7 @@
#ifndef G10_TDBIO_H
#define G10_TDBIO_H
#include "host2net.h"
#include "../common/host2net.h"
#define TRUST_RECORD_LEN 40
#define SIGS_PER_RECORD ((TRUST_RECORD_LEN-10)/5)

12
g10/test-stubs.c
View file

@ -28,18 +28,18 @@
#define INCLUDED_BY_MAIN_MODULE 1
#include "gpg.h"
#include "util.h"
#include "../common/util.h"
#include "packet.h"
#include "iobuf.h"
#include "../common/iobuf.h"
#include "main.h"
#include "options.h"
#include "keydb.h"
#include "trustdb.h"
#include "filter.h"
#include "ttyio.h"
#include "i18n.h"
#include "sysutils.h"
#include "status.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "../common/status.h"
#include "call-agent.h"
int g10_errors_seen;

10
g10/textfilter.c
View file

@ -24,13 +24,13 @@
#include <errno.h>
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "util.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "../common/util.h"
#include "filter.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "options.h"
#include "status.h"
#include "../common/status.h"
#ifdef HAVE_DOSISH_SYSTEM
#define LF "\r\n"

16
g10/tofu.c
View file

@ -31,17 +31,17 @@
#include <time.h>
#include "gpg.h"
#include "types.h"
#include "logging.h"
#include "stringhelp.h"
#include "../common/types.h"
#include "../common/logging.h"
#include "../common/stringhelp.h"
#include "options.h"
#include "mbox-util.h"
#include "i18n.h"
#include "ttyio.h"
#include "../common/mbox-util.h"
#include "../common/i18n.h"
#include "../common/ttyio.h"
#include "trustdb.h"
#include "mkdir_p.h"
#include "../common/mkdir_p.h"
#include "gpgsql.h"
#include "status.h"
#include "../common/status.h"
#include "sqrtu32.h"
#include "tofu.h"

6
g10/trust.c
View file

@ -26,13 +26,13 @@
#include "gpg.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "packet.h"
#include "main.h"
#include "i18n.h"
#include "../common/i18n.h"
#include "trustdb.h"
#include "host2net.h"
#include "../common/host2net.h"
/* Return true if key is disabled. Note that this is usually used via

10
g10/trustdb.c
View file

@ -29,15 +29,15 @@
#endif /* !DISABLE_REGEX */
#include "gpg.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "options.h"
#include "packet.h"
#include "main.h"
#include "mbox-util.h"
#include "i18n.h"
#include "../common/mbox-util.h"
#include "../common/i18n.h"
#include "tdbio.h"
#include "trustdb.h"
#include "tofu.h"

11
g10/verify.c
View file

@ -27,15 +27,14 @@
#include "gpg.h"
#include "options.h"
#include "packet.h"
#include "status.h"
#include "iobuf.h"
#include "../common/status.h"
#include "../common/iobuf.h"
#include "keydb.h"
#include "util.h"
#include "../common/util.h"
#include "main.h"
#include "status.h"
#include "filter.h"
#include "ttyio.h"
#include "i18n.h"
#include "../common/ttyio.h"
#include "../common/i18n.h"
/****************