diff options
| author | Marcus Brinkmann <[email protected]> | 2012-01-02 21:15:00 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-01-02 21:15:00 +0000 |
| commit | a2d9e48fcca6cfc2dfadef6dbd3579a30314676b (patch) | |
| tree | f379d06676984a965c6daacbc6fed119dca14f4f /agent/gpg-agent.c | |
| parent | Use the longest key ID available when talking to a HKP server. (diff) | |
| download | gnupg-a2d9e48fcca6cfc2dfadef6dbd3579a30314676b.tar.gz gnupg-a2d9e48fcca6cfc2dfadef6dbd3579a30314676b.zip | |
Only set gcrypt thread callback for older version of gcrypt.
* agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
(USE_GCRY_THREAD_CBS): New macro, defined if
GCRY_THREAD_OPTION_VERSION is 0.
(fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
(main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
Diffstat (limited to '')
| -rw-r--r-- | agent/gpg-agent.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 6dcde26af..f98d821ae 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -289,11 +289,18 @@ static int check_for_running_agent (int silent, int mode); /* Pth wrapper function definitions. */ ASSUAN_SYSTEM_PTH_IMPL; +#if defined(GCRY_THREAD_OPTION_VERSION) && (GCRY_THREAD_OPTION_VERSION == 0) +#define USE_GCRY_THREAD_CBS 1 +#endif + +#ifdef USE_GCRY_THREAD_CBS GCRY_THREAD_OPTION_PTH_IMPL; + static int fixed_gcry_pth_init (void) { return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; } +#endif #ifndef PTH_HAVE_PTH_THREAD_ID @@ -618,6 +625,7 @@ main (int argc, char **argv ) init_common_subsystems (&argc, &argv); +#ifdef USE_GCRY_THREAD_CBS /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ gcry_threads_pth.init = fixed_gcry_pth_init; @@ -627,6 +635,7 @@ main (int argc, char **argv ) log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } +#endif /* Check that the libraries are suitable. Do it here because |