diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/command.c | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 19 | ||||
| -rw-r--r-- | agent/pksign.c | 6 |
3 files changed, 0 insertions, 29 deletions
diff --git a/agent/command.c b/agent/command.c index 2cac9cc43..8642498d6 100644 --- a/agent/command.c +++ b/agent/command.c @@ -3172,7 +3172,6 @@ cmd_getinfo (assuan_context_t ctx, char *line) } else if (!strcmp (line, "jent_active")) { -#if GCRYPT_VERSION_NUMBER >= 0x010800 char *buf; char *fields[5]; @@ -3184,9 +3183,6 @@ cmd_getinfo (assuan_context_t ctx, char *line) else rc = gpg_error (GPG_ERR_FALSE); gcry_free (buf); -#else - rc = gpg_error (GPG_ERR_FALSE); -#endif } else if (!strcmp (line, "s2k_count_cal")) { diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index bb9ddb3cb..22f8b9439 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -984,9 +984,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 } @@ -1864,23 +1862,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 } diff --git a/agent/pksign.c b/agent/pksign.c index f54af0817..ed2f133a0 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -473,12 +473,6 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce, if (err) goto leave; - if (dsaalgo == 0 && GCRYPT_VERSION_NUMBER < 0x010700) - { - /* It's RSA and Libgcrypt < 1.7 */ - check_signature = 1; - } - if (DBG_CRYPTO) { gcry_log_debugsxp ("skey", s_skey); |