Changeset 746:96c75744d3c4 in freeDiameter

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...

Files:

• cmake/Modules/FindGnuTLS.cmake (modified) (2 diffs)
• include/freeDiameter/freeDiameter-host.h.in (modified) (1 diff)
• libfdcore/core.c (modified) (2 diffs)

cmake/Modules/FindGnuTLS.cmake

@@ -5 +5 @@
 #  GNUTLS_INCLUDE_DIR - where to find gnutls.h, etc.
 #  GNUTLS_LIBRARIES - List of libraries when using gnutls.
+#  GNUTLS_NEW_VERSION - true if GnuTLS version is <= 2.10.0 (does not require additional separate gcrypt initialization)
 
 if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES)
@@ -36 +37 @@
 # only show up under the advanced options in the gui cmake applications.
 MARK_AS_ADVANCED( GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR )
+
+# Now check if the library is recent. gnutls_hash was added in 2.10.0.
+IF( NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" ))
+  INCLUDE (CheckLibraryExists) 
+  MESSAGE(STATUS "Rechecking GNUTLS_NEW_VERSION")
+  UNSET(GNUTLS_NEW_VERSION)
+  UNSET(GNUTLS_NEW_VERSION CACHE)
+  GET_FILENAME_COMPONENT(GNUTLS_PATH ${GNUTLS_LIBRARY} PATH)
+  CHECK_LIBRARY_EXISTS(gnutls gnutls_hash ${GNUTLS_PATH} GNUTLS_NEW_VERSION) 
+  SET( GNUTLS_VERSION_TEST_FOR ${GNUTLS_LIBRARY} CACHE INTERNAL "Version the test was made against" )
+ENDIF (NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" ))

include/freeDiameter/freeDiameter-host.h.in

@@ -51 +51 @@
 #cmakedefine DIAMID_IDNA_IGNORE
 #cmakedefine DIAMID_IDNA_REJECT
+#cmakedefine GNUTLS_NEW_VERSION
 
 #cmakedefine ERRORS_ON_TODO

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 */
         }