commit 462906f955b2c2b825fd6e4bea26569df70a7ff0
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Jul 21 17:37:01 2014 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Aug 14 11:34:35 2014 +0200
tree 47672564b52425b25d470113b2c34b75ffad0681
parent a39416ff38f3096411283f4db76fdba7b76a4088

Do no test net_usleep() when not defined

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 51c435a..fb3d546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
    * Fix net_accept() regarding non-blocking sockets (found by Luca Pesce).
    * Don't print uninitialised buffer in ssl_mail_client (found by Marc Abel).
    * Fix warnings from Clang's scan-build (contributed by Alfred Klomp).
+   * Fix compile error in timing.c when POLARSSL_NET_C and POLARSSL_SELFTEST
+     are defined but not POLARSSL_HAVE_TIME (found by Stephane Di Vito).
 
 Changes
    * Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no

library/timing.c

diff --git a/library/timing.c b/library/timing.c
index 19ccb9a..94be0ad 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -333,7 +333,7 @@
 #if defined(POLARSSL_SELF_TEST)
 
 /* To test net_usleep against our functions */
-#if defined(POLARSSL_NET_C)
+#if defined(POLARSSL_NET_C) && defined(POLARSSL_HAVE_TIME)
 #include "polarssl/net.h"
 #endif
 
@@ -465,7 +465,7 @@
     if( verbose != 0 )
         polarssl_printf( "passed\n" );
 
-#if defined(POLARSSL_NET_C)
+#if defined(POLARSSL_NET_C) && defined(POLARSSL_HAVE_TIME)
     if( verbose != 0 )
         polarssl_printf( "  TIMING test #4 (net_usleep/ get_timer): " );