Changeset 17:ab3c58d88be3 in freeDiameter

Timestamp:

Oct 5, 2009, 2:03:05 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added proper gcrypt initializer

Files:

• freeDiameter/CMakeLists.txt (modified) (1 diff)
• freeDiameter/config.c (modified) (2 diffs)
• freeDiameter/main.c (modified) (2 diffs)
• include/freeDiameter/CMakeLists.txt (modified) (1 diff)
• include/freeDiameter/freeDiameter.h (modified) (1 diff)

freeDiameter/CMakeLists.txt

@@ -31 +31 @@
 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
 SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES})
+find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
+If ( NOT GCRYPT_INCLUDE_DIR )
+        MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
+Endif ( NOT GCRYPT_INCLUDE_DIR )
+INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
 
 # Building the executable

freeDiameter/config.c

@@ -122 +122 @@
         fd_log_debug("          - Pref. proto .. : %s\n", fd_g_config->cnf_flags.pr_tcp ? "TCP" : "SCTP");
         fd_log_debug("          - TLS method ... : %s\n", fd_g_config->cnf_flags.tls_alg ? "INBAND" : "Separate port");
+        fd_log_debug("  TLS :   - Certificate .. : %s\n", fd_g_config->cnf_sec_data.cert_file ?: "(none)");
+        fd_log_debug("          - Private key .. : %s\n", fd_g_config->cnf_sec_data.key_file ?: "(none)");
+        fd_log_debug("          - CA ........... : %s\n", fd_g_config->cnf_sec_data.ca_file ?: "(none)");
+        fd_log_debug("          - CRL .......... : %s\n", fd_g_config->cnf_sec_data.crl_file ?: "(none)");
+        fd_log_debug("          - Priority ..... : %s\n", fd_g_config->cnf_sec_data.prio_string ?: "(default)");
         fd_log_debug("  Origin-State-Id ........ : %u\n", fd_g_config->cnf_orstateid);
 }
@@ -203 +208 @@
         }
         
+        /* TLS parameters */
+        CHECK_GNUTLS_DO( gnutls_certificate_allocate_credentials (&fd_g_config->cnf_sec_data.credentials), return ENOMEM );
+        
+        CHECK_GNUTLS_DO( gnutls_dh_params_init (&fd_g_config->cnf_sec_data.dh_cache), return ENOMEM );
+
+        
         return 0;
 }

freeDiameter/main.c

@@ -39 +39 @@
 #include <getopt.h>
 #include <locale.h>
-
-#ifdef GCRY_THREAD_OPTION_PTHREAD_IMPL
+#include <gcrypt.h>
+
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif /* GCRY_THREAD_OPTION_PTHREAD_IMPL */
-
 
 /* forward declarations */
@@ -80 +78 @@
         
         /* Initialize gnutls */
+        (void) gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
         CHECK_GNUTLS_DO( gnutls_global_init(), return EINVAL );
         if ( ! gnutls_check_version(GNUTLS_VERSION) ) {

include/freeDiameter/CMakeLists.txt

@@ -12 +12 @@
 OPTION(DISABLE_SCTP "Disable SCTP support?")
 
-# Disable SCTP support completly ?
+# Find TODO items in the code easily ?
 OPTION(ERRORS_ON_TODO "(development) Generate compilation errors on TODO items ?" OFF)
 

include/freeDiameter/freeDiameter.h

@@ -90 +90 @@
         
         struct {
-                        /* GNUTLS global state */
-                        /* Server credential(s) */
+                /* Credentials parameters */
+                char *                                  key_file;
+                char *                                  cert_file;
+                char *                                  ca_file;
+                char *                                  crl_file;
+                char *                                  prio_string;
+                /* GNUTLS server credential(s) (created from previous files) */
+                gnutls_certificate_credentials_t        credentials;
+                /* Other GNUTLS global parameters */
+                gnutls_priority_t                       prio_cache;
+                gnutls_dh_params_t                      dh_cache;
         }                cnf_sec_data;