Changeset 746:96c75744d3c4 in freeDiameter for libfdcore/core.c

Timestamp:

Jul 29, 2011, 6:49:17 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Attempt to support newer GNU TLS libraries. Need more work...

File:

• libfdcore/core.c (modified) (2 diffs)

libfdcore/core.c

@@ -184 +184 @@
         
         /* 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) ) {
@@ -191 +193 @@
                 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 */
         }