security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
NIIBE Yutaka 2023-07-24 13:56:35 +09:00
parent 5cad5f903e
commit 0821ceebfb
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
9 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/gpg-agent.c
View File

@ -520,9 +520,6 @@ static void handle_connections (gnupg_fd_t listen_fd,
static void check_own_socket (void); static void check_own_socket (void);
static int check_for_running_agent (int silent); static int check_for_running_agent (int silent);
/* Pth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
/* /*
Functions. Functions.
@ -1053,7 +1050,6 @@ static void
initialize_modules (void) initialize_modules (void)
{ {
thread_init_once (); thread_init_once ();
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
initialize_module_cache (); initialize_module_cache ();
initialize_module_call_pinentry (); initialize_module_call_pinentry ();
initialize_module_daemon (); initialize_module_daemon ();
@ -1113,7 +1109,6 @@ main (int argc, char **argv)
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_sock_init (); assuan_sock_init ();
assuan_sock_set_system_hooks (ASSUAN_SYSTEM_NPTH);
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);
setup_libgcrypt_logging (); setup_libgcrypt_logging ();

4
dirmngr/dirmngr.c
View File

@ -453,9 +453,6 @@ static void handle_connections (assuan_fd_t listen_fd);
static void gpgconf_versions (void); static void gpgconf_versions (void);
/* NPth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static const char * static const char *
my_strusage( int level ) my_strusage( int level )
{ {
@ -983,7 +980,6 @@ static void
thread_init (void) thread_init (void)
{ {
npth_init (); npth_init ();
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
/* Now with NPth running we can set the logging callback. Our /* Now with NPth running we can set the logging callback. Our

5
g10/gpg.c
View File

@ -1079,10 +1079,6 @@ static void read_sessionkey_from_fd (int fd);
/* NPth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static char * static char *
make_libversion (const char *libname, const char *(*getfnc)(const char*)) make_libversion (const char *libname, const char *(*getfnc)(const char*))
{ {
@ -3864,7 +3860,6 @@ main (int argc, char **argv)
/* Init threading which is used by some helper functions. */ /* Init threading which is used by some helper functions. */
npth_init (); npth_init ();
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
if (logfile) if (logfile)

1
g13/g13-syshelp.c
View File

@ -306,7 +306,6 @@ main (int argc, char **argv)
/* Prepare libassuan. */ /* Prepare libassuan. */
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
/*assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);*/
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);
/* Setup a default control structure for command line mode. */ /* Setup a default control structure for command line mode. */

6
g13/g13.c
View File

@ -226,10 +226,6 @@ static void set_cmd (enum cmd_and_opt_values *ret_cmd,
static void start_idle_task (void); static void start_idle_task (void);
static void join_idle_task (void); static void join_idle_task (void);
/* Begin NPth wrapper functions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static const char * static const char *
my_strusage( int level ) my_strusage( int level )
@ -377,6 +373,7 @@ main (int argc, char **argv)
init_common_subsystems (&argc, &argv); init_common_subsystems (&argc, &argv);
npth_init (); npth_init ();
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
/* Take extra care of the random pool. */ /* Take extra care of the random pool. */
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
@ -435,7 +432,6 @@ main (int argc, char **argv)
/* Prepare libassuan. */ /* Prepare libassuan. */
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);
/* Setup a default control structure for command line mode. */ /* Setup a default control structure for command line mode. */

6
kbx/keyboxd.c
View File

@ -257,10 +257,6 @@ static void kbxd_deinit_default_ctrl (ctrl_t ctrl);
static void handle_connections (gnupg_fd_t listen_fd); static void handle_connections (gnupg_fd_t listen_fd);
static void check_own_socket (void); static void check_own_socket (void);
static int check_for_running_kbxd (int silent); static int check_for_running_kbxd (int silent);
/* Pth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
/* /*
* Functions. * Functions.
@ -447,7 +443,6 @@ static void
initialize_modules (void) initialize_modules (void)
{ {
thread_init_once (); thread_init_once ();
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
} }
@ -497,7 +492,6 @@ main (int argc, char **argv )
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_sock_init (); assuan_sock_init ();
assuan_sock_set_system_hooks (ASSUAN_SYSTEM_NPTH);
setup_libassuan_logging (&opt.debug, kbxd_assuan_log_monitor); setup_libassuan_logging (&opt.debug, kbxd_assuan_log_monitor);
setup_libgcrypt_logging (); setup_libgcrypt_logging ();

4
scd/scdaemon.c
View File

@ -272,9 +272,6 @@ static gnupg_fd_t create_server_socket (const char *name,
static void *start_connection_thread (void *arg); static void *start_connection_thread (void *arg);
static void handle_connections (gnupg_fd_t listen_fd); static void handle_connections (gnupg_fd_t listen_fd);
/* Pth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static int active_connections; static int active_connections;
@ -480,7 +477,6 @@ main (int argc, char **argv )
malloc_hooks.free = gcry_free; malloc_hooks.free = gcry_free;
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
assuan_sock_init (); assuan_sock_init ();
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);

5
sm/gpgsm.c
View File

@ -596,10 +596,6 @@ our_md_test_algo (int algo)
} }
/* nPth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static char * static char *
make_libversion (const char *libname, const char *(*getfnc)(const char*)) make_libversion (const char *libname, const char *(*getfnc)(const char*))
{ {
@ -1588,7 +1584,6 @@ main ( int argc, char **argv)
log_info (_("WARNING: program may create a core file!\n")); log_info (_("WARNING: program may create a core file!\n"));
npth_init (); npth_init ();
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
/* if (opt.qualsig_approval && !opt.quiet) */ /* if (opt.qualsig_approval && !opt.quiet) */

4
tpm2d/tpm2daemon.c
View File

@ -192,9 +192,6 @@ static gnupg_fd_t create_server_socket (const char *name,
static void *start_connection_thread (void *arg); static void *start_connection_thread (void *arg);
static void handle_connections (gnupg_fd_t listen_fd); static void handle_connections (gnupg_fd_t listen_fd);
/* Pth wrapper function definitions. */
ASSUAN_SYSTEM_NPTH_IMPL;
static int active_connections; static int active_connections;
@ -368,7 +365,6 @@ main (int argc, char **argv )
malloc_hooks.free = gcry_free; malloc_hooks.free = gcry_free;
assuan_set_malloc_hooks (&malloc_hooks); assuan_set_malloc_hooks (&malloc_hooks);
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
assuan_sock_init (); assuan_sock_init ();
setup_libassuan_logging (&opt.debug, NULL); setup_libassuan_logging (&opt.debug, NULL);