diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2023-07-24 06:56:35 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-08-03 09:34:00 +0200 |
| commit | 0821ceebfb7ad018b7d6067d01f3ccee8e27df08 (patch) | |
| tree | 2667995470d2531548e2d1df0f76919f8641ffd4 /g13 | |
| parent | agent,dirmngr,kbx,scdaemon: Use assuan_sock_accept. (diff) | |
| download | gnupg2-0821ceebfb7ad018b7d6067d01f3ccee8e27df08.tar.xz gnupg2-0821ceebfb7ad018b7d6067d01f3ccee8e27df08.zip | |
agent,dirmgr,gpg,g13,kbx,scd,sm,tmp2d: Remove ASSUAN_SYSTEM_NPTH.
* agent/gpg-agent.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(initialize_modules): Don't call assuan_set_system_hooks.
(main): Don't call assuan_sock_set_system_hooks.
* dirmngr/dirmngr.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(thread_init): Don't call assuan_set_system_hooks.
* g10/gpg.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(main): Don't call assuan_set_system_hooks.
* g13/g13.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(main): Set the syscall clamp with gpgrt_set_syscall_clamp.
Don't call assuan_set_system_hooks.
* kbx/keyboxd.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(initialize_modules): Don't call assuan_set_system_hooks.
(main): Don't call assuan_sock_set_system_hooks.
* scd/scdaemon.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(main): Don't call assuan_set_system_hooks.
* sm/gpgsm.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(main): Don't call assuan_set_system_hooks.
* tpm2d/tpm2daemon.c (ASSUAN_SYSTEM_NPTH_IMPL): Remove.
(main): Don't call assuan_set_system_hooks.
--
GnuPG-bug-id: 6606
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'g13')
| -rw-r--r-- | g13/g13-syshelp.c | 1 | ||||
| -rw-r--r-- | g13/g13.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c index 6a4d3a446..6d0d1a659 100644 --- a/g13/g13-syshelp.c +++ b/g13/g13-syshelp.c @@ -306,7 +306,6 @@ main (int argc, char **argv) /* Prepare libassuan. */ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); - /*assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);*/ setup_libassuan_logging (&opt.debug, NULL); /* Setup a default control structure for command line mode. */ @@ -227,10 +227,6 @@ static void start_idle_task (void); static void join_idle_task (void); -/* Begin NPth wrapper functions. */ -ASSUAN_SYSTEM_NPTH_IMPL; - - static const char * my_strusage( int level ) { @@ -377,6 +373,7 @@ main (int argc, char **argv) init_common_subsystems (&argc, &argv); npth_init (); + gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); /* Take extra care of the random pool. */ gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); @@ -435,7 +432,6 @@ main (int argc, char **argv) /* Prepare libassuan. */ assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); - assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH); setup_libassuan_logging (&opt.debug, NULL); /* Setup a default control structure for command line mode. */ |