From 545102ef1dde5357314f0d8808866bc4be36fff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 13 May 2015 17:28:43 +0200
Subject: [PATCH] No timer -> to timeout (optional for TLS)

---
 library/ssl_tls.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f4c0c56b56..26476a38d7 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -95,7 +95,7 @@ static void ssl_set_timer( mbedtls_ssl_context *ssl, uint32_t millisecs )
 static int ssl_check_timer( mbedtls_ssl_context *ssl )
 {
     if( ssl->f_get_timer == NULL )
-        return( -2 );
+        return( 0 );
 
     if( ssl->f_get_timer( ssl->p_timer ) == 2 )
     {
@@ -6071,8 +6071,11 @@ int mbedtls_ssl_read( mbedtls_ssl_context *ssl, unsigned char *buf, size_t len )
     if( ssl->in_offt == NULL )
     {
         /* Start timer if not already running */
-        if( ssl->f_get_timer( ssl->p_timer ) == -1 )
+        if( ssl->f_get_timer != NULL &&
+            ssl->f_get_timer( ssl->p_timer ) == -1 )
+        {
             ssl_set_timer( ssl, ssl->conf->read_timeout );
+        }
 
         if( ! record_read )
         {