security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

agent: Improve concurrency when Libgcrypt 1.8 is used.

Browse Source 
* agent/gpg-agent.c (thread_init_once): Tell Libgcrypt to reinit the
system call clamp.
(agent_libgcrypt_progress_cb): Do not sleep if Libgcrypt is recent
enough.
--

This patch prepares for a feature comming with Libgcrypt 1.8.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-11-12 11:02:48 +01:00
parent 4473db1ef2
commit 6bf6981972
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
agent/gpg-agent.c
View File

@ -901,6 +901,14 @@ thread_init_once (void)
npth_init (); npth_init ();
} }
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
/* Now that we have set the syscall clamp we need to tell Libgcrypt
* that it should get them from libgpg-error. Note that Libgcrypt
* has already been initialized but at that point nPth was not
* initialized and thus Libgcrypt could not set its system call
* clamp. */
#if GCRYPT_VERSION_NUMBER >= 0x010800 /* 1.8.0 */
gcry_control (GCRYCTL_REINIT_SYSCALL_CLAMP, 0, 0);
#endif
} }
@ -1748,16 +1756,14 @@ agent_libgcrypt_progress_cb (void *data, const char *what, int printchar,
if (dispatch && dispatch->cb) if (dispatch && dispatch->cb)
dispatch->cb (dispatch->ctrl, what, printchar, current, total); dispatch->cb (dispatch->ctrl, what, printchar, current, total);
/* If Libgcrypt tells us that it needs more entropy, we better take /* Libgcrypt < 1.8 does not know about nPth and thus when it reads
* a nap to give other threads a chance to run. Note that Libgcrypt * from /dev/random this will block the process. To mitigate this
* does not know about nPth and thus when it selects and reads from * problem we take a short nap when Libgcrypt tells us that it needs
* /dev/random this will block the process. Maybe we should add a * more entropy. This way other threads have chance to run. */
* function similar to gpgrt_set_syscall_clamp to Libgcrypt or use #if GCRYPT_VERSION_NUMBER < 0x010800 /* 1.8.0 */
* those clamps directly. For now sleeping for 100ms seems to be
* appropriate. */
if (what && !strcmp (what, "need_entropy")) if (what && !strcmp (what, "need_entropy"))
npth_usleep (100000); npth_usleep (100000); /* 100ms */
#endif
} }