commit 8e704f0f74e77dbcd74d0031a094bb5f5bfaa189
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Oct 14 20:03:35 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:32:56 2014 +0200
tree 7a1182fa2ad8454bb80c4e0cd9da48327e6674f3
parent e698f59a258d98c8f50c6b23389108ab90c574a9

DTLS depends on TIMING_C for now

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 7cb1442..bfaefd4 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -79,10 +79,7 @@
 }
 
 
-/*
- * Timers (WIP)
- */
-#if defined(POLARSSL_TIMING_C)
+#if defined(POLARSSL_SSL_PROTO_DTLS)
 /*
  * Start a timer.
  * Passing millisecs = 0 cancels a running timer.
@@ -107,9 +104,7 @@
 
     return( 0 );
 }
-#endif
 
-#if defined(POLARSSL_SSL_PROTO_DTLS)
 /*
  * Double the retransmit timeout value, within the allowed range,
  * returning -1 if the maximum value has already been reached.
@@ -5755,7 +5750,7 @@
 
     if( ssl->in_offt == NULL )
     {
-#if defined(POLARSSL_TIMING_C)
+#if defined(POLARSSL_SSL_PROTO_DTLS)
         /* Start timer if not already running */
         if( ssl->time_limit == 0 )
             ssl_set_timer( ssl, ssl->read_timeout );
@@ -5912,7 +5907,7 @@
 
         ssl->in_offt = ssl->in_msg;
 
-#if defined(POLARSSL_TIMING_C)
+#if defined(POLARSSL_SSL_PROTO_DTLS)
         /* We're going to return something now, cancel timer,
          * except if handshake (renegotiation) is in progress */
         if( ssl->state == SSL_HANDSHAKE_OVER )