* eet_lib: Prevent double init of gcry.

SVN revision: 39716
This commit is contained in:
Cedric BAIL 2009-03-25 16:26:46 +00:00
parent 749e8b1e74
commit c392637d27
1 changed files with 21 additions and 18 deletions

View File

@ -733,7 +733,9 @@ eet_init(void)
#ifdef HAVE_GNUTLS
if (gnutls_global_init())
return --eet_initcount;
/* Before the library can be used, it must initialize itself. */
/* Before the library can be used, it must initialize itself if needed. */
if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P) == 0)
{
gcry_check_version(NULL);
/* Disable warning messages about problems with the secure memory subsystem.
This command should be run right after gcry_check_version. */
@ -753,6 +755,7 @@ eet_init(void)
gnutls_global_deinit();
return --eet_initcount;
}
}
#endif
#ifdef HAVE_OPENSSL
ERR_load_crypto_strings();