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

Remove thread callbacks for libgcrypt >= 1.6.

Browse Source 
* agent/gpg-agent.c (GCRY_THREAD_OPTION_PTH_IMPL): Do not use with
libgcrypt >= 1.6.
(main): Ditto.
* scd/scdaemon.c (GCRY_THREAD_OPTION_PTH_IMPL): Ditto.
(main): Ditto.
--

This is not anymore needed but kept for compatibility with Libgcrypt <
1.6.
This commit is contained in:
Werner Koch 2014-06-24 10:56:19 +02:00
parent 2daa112a74
commit aacb43a730
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/gpg-agent.c
View File

@ -308,6 +308,7 @@ static int check_for_running_agent (int silent, int mode);
/* Pth wrapper function definitions. */ /* Pth wrapper function definitions. */
ASSUAN_SYSTEM_PTH_IMPL; ASSUAN_SYSTEM_PTH_IMPL;
#if GCRYPT_VERSION_NUMBER < 0x010600
GCRY_THREAD_OPTION_PTH_IMPL; GCRY_THREAD_OPTION_PTH_IMPL;
#if GCRY_THREAD_OPTION_VERSION < 1 #if GCRY_THREAD_OPTION_VERSION < 1
static int fixed_gcry_pth_init (void) static int fixed_gcry_pth_init (void)
@ -315,6 +316,7 @@ static int fixed_gcry_pth_init (void)
return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
} }
#endif #endif
#endif /*GCRYPT_VERSION_NUMBER < 0x10600*/
#ifndef PTH_HAVE_PTH_THREAD_ID #ifndef PTH_HAVE_PTH_THREAD_ID
static unsigned long pth_thread_id (void) static unsigned long pth_thread_id (void)
@ -625,7 +627,8 @@ main (int argc, char **argv )
init_common_subsystems (); init_common_subsystems ();
/* Libgcrypt requires us to register the threading model first. #if GCRYPT_VERSION_NUMBER < 0x010600
/* Libgcrypt < 1.6 requires us to register the threading model first.
Note that this will also do the pth_init. */ Note that this will also do the pth_init. */
#if GCRY_THREAD_OPTION_VERSION < 1 #if GCRY_THREAD_OPTION_VERSION < 1
gcry_threads_pth.init = fixed_gcry_pth_init; gcry_threads_pth.init = fixed_gcry_pth_init;
@ -636,6 +639,7 @@ main (int argc, char **argv )
log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
gpg_strerror (err)); gpg_strerror (err));
} }
#endif /*GCRYPT_VERSION_NUMBER < 0x010600*/
/* Check that the libraries are suitable. Do it here because /* Check that the libraries are suitable. Do it here because

11
scd/scdaemon.c
View File

@ -212,6 +212,7 @@ static void handle_connections (int listen_fd);
/* Pth wrapper function definitions. */ /* Pth wrapper function definitions. */
ASSUAN_SYSTEM_PTH_IMPL; ASSUAN_SYSTEM_PTH_IMPL;
#if GCRYPT_VERSION_NUMBER < 0x010600
GCRY_THREAD_OPTION_PTH_IMPL; GCRY_THREAD_OPTION_PTH_IMPL;
#if GCRY_THREAD_OPTION_VERSION < 1 #if GCRY_THREAD_OPTION_VERSION < 1
static int fixed_gcry_pth_init (void) static int fixed_gcry_pth_init (void)
@ -219,6 +220,7 @@ static int fixed_gcry_pth_init (void)
return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0;
} }
#endif #endif
#endif /*GCRYPT_VERSION_NUMBER < 0x010600*/
static char * static char *
@ -380,7 +382,6 @@ main (int argc, char **argv )
{ {
ARGPARSE_ARGS pargs; ARGPARSE_ARGS pargs;
int orig_argc; int orig_argc;
gpg_error_t err;
char **orig_argv; char **orig_argv;
FILE *configfp = NULL; FILE *configfp = NULL;
char *configname = NULL; char *configname = NULL;
@ -415,17 +416,23 @@ main (int argc, char **argv )
init_common_subsystems (); init_common_subsystems ();
/* Libgcrypt requires us to register the threading model first. #if GCRYPT_VERSION_NUMBER < 0x010600
/* Libgcrypt < 1.6 requires us to register the threading model first.
Note that this will also do the pth_init. */ Note that this will also do the pth_init. */
{
gpg_error_t err;
#if GCRY_THREAD_OPTION_VERSION < 1 #if GCRY_THREAD_OPTION_VERSION < 1
gcry_threads_pth.init = fixed_gcry_pth_init; gcry_threads_pth.init = fixed_gcry_pth_init;
#endif #endif
err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
if (err) if (err)
{ {
log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
gpg_strerror (err)); gpg_strerror (err));
} }
}
#endif /*GCRYPT_VERSION_NUMBER < 0x010600*/
/* Check that the libraries are suitable. Do it here because /* Check that the libraries are suitable. Do it here because
the option parsing may need services of the library */ the option parsing may need services of the library */