aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-01-19 09:33:03 +0000
committerWerner Koch <[email protected]>2021-01-19 09:33:03 +0000
commit9500432b7ae10d98b30c58de4357e2ffb93bf795 (patch)
tree63ebc784ad1b417a75df15ccda1d2b335add61c9 /agent/gpg-agent.c
parenttools: Add option --clock to watchgnupg (diff)
downloadgnupg-9500432b7ae10d98b30c58de4357e2ffb93bf795.tar.gz
gnupg-9500432b7ae10d98b30c58de4357e2ffb93bf795.zip
Require Libgcrypt 1.9
* configure.ac: Require at least Libgcrypt 1.9.0. Remove all GCRYPT_VERSION_NUMBER dependent code. -- Only Libgcrypt 1.9 implements EAX which is a mandatory algorithm in RFC4880bis. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
-rw-r--r--agent/gpg-agent.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 546af81a0..b3a0c230c 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1007,9 +1007,7 @@ thread_init_once (void)
* 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
}
@@ -1817,23 +1815,6 @@ agent_libgcrypt_progress_cb (void *data, const char *what, int printchar,
break;
if (dispatch && dispatch->cb)
dispatch->cb (dispatch->ctrl, what, printchar, current, total);
-
- /* Libgcrypt < 1.8 does not know about nPth and thus when it reads
- * from /dev/random this will block the process. To mitigate this
- * problem we yield the thread when Libgcrypt tells us that it needs
- * more entropy. This way other threads have chance to run. */
-#if GCRYPT_VERSION_NUMBER < 0x010800 /* 1.8.0 */
- if (what && !strcmp (what, "need_entropy"))
- {
-#if GPGRT_VERSION_NUMBER < 0x011900 /* 1.25 */
- /* In older gpg-error versions gpgrt_yield is buggy for use with
- * nPth and thus we need to resort to a sleep call. */
- npth_usleep (1000); /* 1ms */
-#else
- gpgrt_yield ();
-#endif
- }
-#endif
}