security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

Cast npth_self result for safety.

Browse Source
This commit is contained in:
Marcus Brinkmann 2011-10-13 17:50:10 +02:00
parent 7629ac332c
commit 0e5d57cc6d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/ChangeLog
View File

@ -1,5 +1,9 @@
2011-10-13 Marcus Brinkmann <marcus@g10code.com> 2011-10-13 Marcus Brinkmann <marcus@g10code.com>
* gpg-agent.c (start_connection_thread)
(start_connection_thread_ssh): Cast npth_self result to unsigned
long for safety.
* cache.c (new_data): Fix error check. * cache.c (new_data): Fix error check.
* cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c, * cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c,

10
agent/gpg-agent.c
View File

@ -1778,19 +1778,19 @@ start_connection_thread (void *arg)
if (check_nonce (ctrl, &socket_nonce)) if (check_nonce (ctrl, &socket_nonce))
{ {
log_error ("handler 0x%lx nonce check FAILED\n", npth_self()); log_error ("handler 0x%lx nonce check FAILED\n", (unsigned long) npth_self());
return NULL; return NULL;
} }
agent_init_default_ctrl (ctrl); agent_init_default_ctrl (ctrl);
if (opt.verbose) if (opt.verbose)
log_info (_("handler 0x%lx for fd %d started\n"), log_info (_("handler 0x%lx for fd %d started\n"),
npth_self(), FD2INT(ctrl->thread_startup.fd)); (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd); start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
if (opt.verbose) if (opt.verbose)
log_info (_("handler 0x%lx for fd %d terminated\n"), log_info (_("handler 0x%lx for fd %d terminated\n"),
npth_self(), FD2INT(ctrl->thread_startup.fd)); (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
agent_deinit_default_ctrl (ctrl); agent_deinit_default_ctrl (ctrl);
xfree (ctrl); xfree (ctrl);
@ -1810,12 +1810,12 @@ start_connection_thread_ssh (void *arg)
agent_init_default_ctrl (ctrl); agent_init_default_ctrl (ctrl);
if (opt.verbose) if (opt.verbose)
log_info (_("ssh handler 0x%lx for fd %d started\n"), log_info (_("ssh handler 0x%lx for fd %d started\n"),
npth_self(), FD2INT(ctrl->thread_startup.fd)); (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
start_command_handler_ssh (ctrl, ctrl->thread_startup.fd); start_command_handler_ssh (ctrl, ctrl->thread_startup.fd);
if (opt.verbose) if (opt.verbose)
log_info (_("ssh handler 0x%lx for fd %d terminated\n"), log_info (_("ssh handler 0x%lx for fd %d terminated\n"),
npth_self(), FD2INT(ctrl->thread_startup.fd)); (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
agent_deinit_default_ctrl (ctrl); agent_deinit_default_ctrl (ctrl);
xfree (ctrl); xfree (ctrl);