Changeset 803:d5a4b5e175c2 in freeDiameter

Timestamp:

Aug 22, 2012, 7:18:15 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Add timeout in gnutls_handshake for version 3.1.x

Files:

• extensions/app_diameap/diameap_tls.c (modified) (1 diff)
• libfdcore/cnxctx.c (modified) (5 diffs)
• libfdcore/sctps.c (modified) (1 diff)

extensions/app_diameap/diameap_tls.c

@@ -456 +456 @@
 
         data->p_length = data->tlsResp.datalength;
+        #ifdef GNUTLS_VERSION_310
+        gnutls_handshake_set_timeout( data->session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
+        #endif /* GNUTLS_VERSION_310 */
+
         ret = gnutls_handshake(data->session);
 

libfdcore/cnxctx.c

@@ -842 +842 @@
                         switch (ret) {
                                 case GNUTLS_E_REHANDSHAKE: 
-                                        if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING))
+                                        if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING)) {
+                                                #ifdef GNUTLS_VERSION_310
+                                                GNUTLS_TRACE( gnutls_handshake_set_timeout( session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));
+                                                #endif /* GNUTLS_VERSION_310 */
                                                 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
                                                         {
@@ -850 +853 @@
                                                                 goto end;
                                                         } );
+                                        }
 
                                 case GNUTLS_E_AGAIN:
@@ -886 +890 @@
                         switch (ret) {
                                 case GNUTLS_E_REHANDSHAKE: 
-                                        if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING))
+                                        if (!fd_cnx_teststate(conn, CC_STATUS_CLOSING)) {
+                                                #ifdef GNUTLS_VERSION_310
+                                                GNUTLS_TRACE( gnutls_handshake_set_timeout( session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));
+                                                #endif /* GNUTLS_VERSION_310 */
+
                                                 CHECK_GNUTLS_DO( ret = gnutls_handshake(session),
                                                         {
@@ -894 +902 @@
                                                                 goto end;
                                                         } );
+                                        }
 
                                 case GNUTLS_E_AGAIN:
@@ -1287 +1296 @@
         {
                 int ret;
-                
+                #ifdef GNUTLS_VERSION_310
+                GNUTLS_TRACE( gnutls_handshake_set_timeout( conn->cc_tls_para.session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));
+                #endif /* GNUTLS_VERSION_310 */
+
                 /* When gnutls 2.10.1 is around, we should use gnutls_certificate_set_verify_function and fd_tls_verify_credentials, so that handshake fails directly. */
                 

libfdcore/sctps.c

@@ -463 +463 @@
         
         TRACE_DEBUG(FULL, "Starting TLS resumed handshake on stream %hu", ctx->strid);
+#ifdef GNUTLS_VERSION_310
+        GNUTLS_TRACE( gnutls_handshake_set_timeout( ctx->session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT));
+#endif /* GNUTLS_VERSION_310 */
         CHECK_GNUTLS_DO( gnutls_handshake( ctx->session ), return NULL);