security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

tools: Fix for --disable-tpm2d.

Browse Source 
* tools/gpgconf-comp.c: Conditionalize with BUILD_WITH_TPM2D.

--

GnuPG-bug-id: 5408
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2021-04-23 11:10:04 +09:00
parent 4237a2b0a5
commit 97ba94e52b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/gpgconf-comp.c
View File

@ -93,7 +93,9 @@ gc_error (int status, int errnum, const char *fmt, ...)
/* Forward declaration. */ /* Forward declaration. */
static void gpg_agent_runtime_change (int killflag); static void gpg_agent_runtime_change (int killflag);
static void scdaemon_runtime_change (int killflag); static void scdaemon_runtime_change (int killflag);
#ifdef BUILD_WITH_TPM2D
static void tpm2daemon_runtime_change (int killflag); static void tpm2daemon_runtime_change (int killflag);
#endif
static void dirmngr_runtime_change (int killflag); static void dirmngr_runtime_change (int killflag);
static void keyboxd_runtime_change (int killflag); static void keyboxd_runtime_change (int killflag);
@ -379,6 +381,7 @@ static known_option_t known_options_scdaemon[] =
{ NULL } { NULL }
}; };
#ifdef BUILD_WITH_TPM2D
/* The known options of the GC_COMPONENT_TPM2DAEMON component. */ /* The known options of the GC_COMPONENT_TPM2DAEMON component. */
static known_option_t known_options_tpm2daemon[] = static known_option_t known_options_tpm2daemon[] =
{ {
@ -393,6 +396,7 @@ static known_option_t known_options_tpm2daemon[] =
{ NULL } { NULL }
}; };
#endif
/* The known options of the GC_COMPONENT_GPG component. */ /* The known options of the GC_COMPONENT_GPG component. */
@ -666,9 +670,11 @@ static struct
GNUPG_MODULE_NAME_SCDAEMON, SCDAEMON_NAME ".conf", GNUPG_MODULE_NAME_SCDAEMON, SCDAEMON_NAME ".conf",
known_options_scdaemon, NULL, scdaemon_runtime_change}, known_options_scdaemon, NULL, scdaemon_runtime_change},
#ifdef BUILD_WITH_TPM2D
{ TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"), { TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"),
GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf", GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf",
known_options_tpm2daemon, NULL, tpm2daemon_runtime_change}, known_options_tpm2daemon, NULL, tpm2daemon_runtime_change},
#endif
{ DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg", N_("Network"), { DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg", N_("Network"),
GNUPG_MODULE_NAME_DIRMNGR, DIRMNGR_NAME ".conf", GNUPG_MODULE_NAME_DIRMNGR, DIRMNGR_NAME ".conf",
@ -802,6 +808,7 @@ scdaemon_runtime_change (int killflag)
} }
#ifdef BUILD_WITH_TPM2D
static void static void
tpm2daemon_runtime_change (int killflag) tpm2daemon_runtime_change (int killflag)
{ {
@ -844,6 +851,7 @@ tpm2daemon_runtime_change (int killflag)
pgmname, argv[cmdidx], gpg_strerror (err)); pgmname, argv[cmdidx], gpg_strerror (err));
gnupg_release_process (pid); gnupg_release_process (pid);
} }
#endif
static void static void