Changeset 807:09f8f0c4f4a4 in freeDiameter for tests/testcnx.c

Timestamp:

Aug 24, 2012, 7:15:48 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Several changes to support GnuTLS 3.x in a more efficient way

File:

• tests/testcnx.c (modified) (7 diffs)

tests/testcnx.c

@@ -614 +614 @@
         CHECK( 1, ret );
         
+        #ifdef GNUTLS_VERSION_300
+        {
+                /* We import these CA in the trust list */
+                gnutls_x509_crt_t * calist;
+                unsigned int cacount = 0;
+                
+                CHECK_GNUTLS_DO( ret = gnutls_x509_crt_list_import2(&calist, &cacount, &ca, GNUTLS_X509_FMT_PEM, 
+                                                        GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED), );
+                CHECK( 1, cacount );
+
+                CHECK_GNUTLS_DO( ret = gnutls_x509_trust_list_add_cas (fd_g_config->cnf_sec_data.trustlist, calist, cacount, 0), );
+                CHECK( 1, ret );
+        }
+                
+        /* Use certificate verification during the handshake */
+        gnutls_certificate_set_verify_function (fd_g_config->cnf_sec_data.credentials, fd_tls_verify_credentials_2);
+        
+        #endif /* GNUTLS_VERSION_300 */
+                                                        
+        
         /* Set the server credentials (in config) */
         CHECK_GNUTLS_DO( ret = gnutls_certificate_set_x509_key_mem( fd_g_config->cnf_sec_data.credentials,
@@ -1201 +1221 @@
         
         /* Basic operation tested successfully, now test we detect error conditions */
-        
+
         /* Untrusted certificate, TCP */
         {
@@ -1238 +1258 @@
                 CHECK( 0, pthread_create(&thr, NULL, handshake_thr, &hf) );
                 CHECK( EINVAL, fd_cnx_handshake(server_side, GNUTLS_SERVER, NULL, NULL) );
+                fd_cnx_destroy(server_side);
+                
                 CHECK( 0, pthread_join(thr, NULL) );
                 
                 /* Now close the connection */
                 CHECK( 0, pthread_create(&thr, NULL, destroy_thr, client_side) );
-                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
@@ -1267 +1288 @@
                 /* Set the CA */
                 CHECK_GNUTLS_DO( ret = gnutls_certificate_set_x509_trust_mem( hf.creds, &notrust_ca, GNUTLS_X509_FMT_PEM), );
-                /* TODO: fix me.
-                 We should not get stuck when the server fails the handshake but the client succeeds.
-                 However, at the moment we do get stuck.
-                 FFS, is this a test problem or a problem in the code?
-                 
-                 CHECK_GNUTLS_DO( ret = gnutls_certificate_set_x509_trust_mem( hf.creds, &ca, GNUTLS_X509_FMT_PEM), );
-                 */
+                CHECK_GNUTLS_DO( ret = gnutls_certificate_set_x509_trust_mem( hf.creds, &ca, GNUTLS_X509_FMT_PEM), );
                 CHECK( 1, ret );
                 /* Set the key */
@@ -1294 +1309 @@
                 CHECK( 0, pthread_create(&thr, NULL, handshake_thr, &hf) );
                 CHECK( EINVAL, fd_cnx_handshake(server_side, GNUTLS_SERVER, NULL, NULL) );
+                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
                 /* Now close the connection */
                 CHECK( 0, pthread_create(&thr, NULL, destroy_thr, client_side) );
-                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
@@ -1343 +1358 @@
                 CHECK( 0, pthread_create(&thr, NULL, handshake_thr, &hf) );
                 CHECK( EINVAL, fd_cnx_handshake(server_side, GNUTLS_SERVER, NULL, NULL) );
+                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
                 /* Now close the connection */
                 CHECK( 0, pthread_create(&thr, NULL, destroy_thr, client_side) );
-                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
@@ -1421 +1436 @@
                 CHECK( 0, pthread_create(&thr, NULL, handshake_thr, &hf) );
                 CHECK( EINVAL, fd_cnx_handshake(server_side, GNUTLS_SERVER, NULL, NULL) );
+                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );
                 
                 /* Now close the connection */
                 CHECK( 0, pthread_create(&thr, NULL, destroy_thr, client_side) );
-                fd_cnx_destroy(server_side);
                 CHECK( 0, pthread_join(thr, NULL) );