Changeset 797:36821971d47b in freeDiameter

Timestamp:

Aug 21, 2012, 5:16:21 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Renamed GNUTLS_NEW_VERSION and added GNUTLS_VERSION_300 to prepare for API change in gnutls

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)
+#  GNUTLS_VERSION_210 - true if GnuTLS version is >= 2.10.0 (does not require additional separate gcrypt initialization)
+#  GNUTLS_VERSION_300 - true if GnuTLS version is >= 3.00.0 (x509 verification functions changed)
 
 if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES)
@@ -39 +40 @@
 
 # Now check if the library is recent. gnutls_hash was added in 2.10.0.
+# Also test library is even more recent. gnutls_x509_trust_list_verify_crt was added in 3.00.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)
+  MESSAGE(STATUS "Rechecking GNUTLS_VERSION_210 and GNUTLS_VERSION_300")
+  UNSET(GNUTLS_VERSION_210)
+  UNSET(GNUTLS_VERSION_210 CACHE)
+  UNSET(GNUTLS_VERSION_300)
+  UNSET(GNUTLS_VERSION_300 CACHE)
   GET_FILENAME_COMPONENT(GNUTLS_PATH ${GNUTLS_LIBRARY} PATH)
-  CHECK_LIBRARY_EXISTS(gnutls gnutls_hash ${GNUTLS_PATH} GNUTLS_NEW_VERSION) 
+  CHECK_LIBRARY_EXISTS(gnutls gnutls_hash ${GNUTLS_PATH} GNUTLS_VERSION_210) 
+  CHECK_LIBRARY_EXISTS(gnutls gnutls_x509_trust_list_verify_crt ${GNUTLS_PATH} GNUTLS_VERSION_300) 
   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 GNUTLS_VERSION_210
+#cmakedefine GNUTLS_VERSION_300
 
 #cmakedefine ERRORS_ON_TODO

libfdcore/core.c

@@ -184 +184 @@
         
         /* Initialize gcrypt and gnutls */
-        #ifndef GNUTLS_NEW_VERSION
+        #ifndef GNUTLS_VERSION_210
         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 */
+        #endif /* GNUTLS_VERSION_210 */
         CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL );
         if ( ! gnutls_check_version(GNUTLS_VERSION) ) {
@@ -193 +193 @@
                 return EINVAL;
         } else {
-        #ifdef GNUTLS_NEW_VERSION
+        #ifdef GNUTLS_VERSION_210
                 TRACE_DEBUG(INFO, "libgnutls '%s' initialized.", gnutls_check_version(NULL) );
-        #else /* GNUTLS_NEW_VERSION */
+        #else /* GNUTLS_VERSION_210 */
                 TRACE_DEBUG(INFO, "libgnutls '%s', libgcrypt '%s', initialized.", gnutls_check_version(NULL), gcry_check_version(NULL) );
-        #endif /* GNUTLS_NEW_VERSION */
+        #endif /* GNUTLS_VERSION_210 */
         }