Mercurial > hg > freeDiameter
diff libfdcore/core.c @ 746:96c75744d3c4
Attempt to support newer GNU TLS libraries. Need more work...
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Thu, 28 Jul 2011 23:49:17 +0200 |
| parents | 4a9f08d6b6ba |
| children | 36821971d47b |
line wrap: on
line diff
--- a/libfdcore/core.c Fri May 27 17:17:03 2011 +0900 +++ b/libfdcore/core.c Thu Jul 28 23:49:17 2011 +0200 @@ -183,14 +183,20 @@ fd_log_threadname("Main"); /* Initialize gcrypt and gnutls */ + #ifndef GNUTLS_NEW_VERSION GNUTLS_TRACE( (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread) ); GNUTLS_TRACE( (void) gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0) ); + #endif /* GNUTLS_NEW_VERSION */ CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL ); if ( ! gnutls_check_version(GNUTLS_VERSION) ) { fprintf(stderr, "The GNUTLS library is too old; found '%s', need '" GNUTLS_VERSION "'\n", gnutls_check_version(NULL)); return EINVAL; } else { + #ifdef GNUTLS_NEW_VERSION + TRACE_DEBUG(INFO, "libgnutls '%s' initialized.", gnutls_check_version(NULL) ); + #else /* GNUTLS_NEW_VERSION */ TRACE_DEBUG(INFO, "libgnutls '%s', libgcrypt '%s', initialized.", gnutls_check_version(NULL), gcry_check_version(NULL) ); + #endif /* GNUTLS_NEW_VERSION */ } /* Initialize the config with default values */