commit d2377e7e781ad3f8bfa3611d8f054a15064a2070
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 13 13:58:56 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 13 13:58:56 2015 +0200
tree 378ca701333570372ff4521f3fa201da7c838365
parent 0c89035d4d45140979d8fd63794c6b7d3be88a26

ssl_client/server2 shouln't depend on timing.c

Would break test-ref-configs.pl.

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 3ed0d29..89ef2c2 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -38,14 +38,12 @@
 
 #if !defined(MBEDTLS_ENTROPY_C) || \
     !defined(MBEDTLS_SSL_TLS_C) || !defined(MBEDTLS_SSL_CLI_C) || \
-    !defined(MBEDTLS_NET_C) || !defined(MBEDTLS_CTR_DRBG_C) || \
-    !defined(MBEDTLS_TIMING_C)
+    !defined(MBEDTLS_NET_C) || !defined(MBEDTLS_CTR_DRBG_C)
 int main( void )
 {
     mbedtls_printf("MBEDTLS_ENTROPY_C and/or "
            "MBEDTLS_SSL_TLS_C and/or MBEDTLS_SSL_CLI_C and/or "
-           "MBEDTLS_NET_C and/or MBEDTLS_CTR_DRBG_C and/or "
-           "MBEDTLS_TIMING_C not defined.\n");
+           "MBEDTLS_NET_C and/or MBEDTLS_CTR_DRBG_C and/or not defined.\n");
     return( 0 );
 }
 #else
@@ -392,7 +390,9 @@
     mbedtls_ssl_context ssl;
     mbedtls_ssl_config conf;
     mbedtls_ssl_session saved_session;
+#if defined(MBEDTLS_TIMING_C)
     mbedtls_timing_delay_context timer;
+#endif
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     uint32_t flags;
     mbedtls_x509_crt cacert;
@@ -1188,8 +1188,10 @@
 #endif
                 );
 
+#if defined(MBEDTLS_TIMING_C)
     mbedtls_ssl_set_timer_cb( &ssl, &timer, mbedtls_timing_set_delay,
                                             mbedtls_timing_get_delay );
+#endif
 
     mbedtls_printf( " ok\n" );
 
@@ -1488,8 +1490,10 @@
 
         mbedtls_net_close( server_fd );
 
+#if defined(MBEDTLS_TIMING_C)
         if( opt.reco_delay > 0 )
             mbedtls_timing_m_sleep( 1000 * opt.reco_delay );
+#endif
 
         mbedtls_printf( "  . Reconnecting with saved session..." );
         fflush( stdout );
@@ -1580,4 +1584,4 @@
 }
 #endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C && MBEDTLS_SSL_TLS_C &&
           MBEDTLS_SSL_CLI_C && MBEDTLS_NET_C && MBEDTLS_RSA_C &&
-          MBEDTLS_CTR_DRBG_C && MBEDTLS_TIMING_C */
+          MBEDTLS_CTR_DRBG_C MBEDTLS_TIMING_C */

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 7a947ed..bef88cd 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -38,14 +38,12 @@
 
 #if !defined(MBEDTLS_ENTROPY_C) || \
     !defined(MBEDTLS_SSL_TLS_C) || !defined(MBEDTLS_SSL_SRV_C) || \
-    !defined(MBEDTLS_NET_C) || !defined(MBEDTLS_CTR_DRBG_C) || \
-    !defined(MBEDTLS_TIMING_C)
+    !defined(MBEDTLS_NET_C) || !defined(MBEDTLS_CTR_DRBG_C)
 int main( void )
 {
     mbedtls_printf("MBEDTLS_ENTROPY_C and/or "
            "MBEDTLS_SSL_TLS_C and/or MBEDTLS_SSL_SRV_C and/or "
-           "MBEDTLS_NET_C and/or MBEDTLS_CTR_DRBG_C and/or "
-           "MBEDTLS_TIMING_C not defined.\n");
+           "MBEDTLS_NET_C and/or MBEDTLS_CTR_DRBG_C and/or not defined.\n");
     return( 0 );
 }
 #else
@@ -720,7 +718,9 @@
     mbedtls_ctr_drbg_context ctr_drbg;
     mbedtls_ssl_context ssl;
     mbedtls_ssl_config conf;
+#if defined(MBEDTLS_TIMING_C)
     mbedtls_timing_delay_context timer;
+#endif
 #if defined(MBEDTLS_SSL_RENEGOTIATION)
     unsigned char renego_period[8] = { 0 };
 #endif
@@ -1751,8 +1751,10 @@
 #endif
                 );
 
+#if defined(MBEDTLS_TIMING_C)
     mbedtls_ssl_set_timer_cb( &ssl, &timer, mbedtls_timing_set_delay,
                                             mbedtls_timing_get_delay );
+#endif
 
     mbedtls_printf( " ok\n" );
 
@@ -2228,4 +2230,4 @@
 }
 #endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C && MBEDTLS_SSL_TLS_C &&
           MBEDTLS_SSL_SRV_C && MBEDTLS_NET_C && MBEDTLS_RSA_C &&
-          MBEDTLS_CTR_DRBG_C && MBEDTLS_TIMING_C */
+          MBEDTLS_CTR_DRBG_C */