From a014829024caf4bd3d89883511ae5deec45aba77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 18 Sep 2014 16:06:04 +0200 Subject: [PATCH] Use ssl_set_bio_timeout() in test client/server --- programs/ssl/ssl_client2.c | 10 ++++++++-- programs/ssl/ssl_server2.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 117792698..4666ad829 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -942,9 +942,15 @@ int main( int argc, char *argv[] ) ssl_set_dbg( &ssl, my_debug, stdout ); if( opt.nbio == 2 ) - ssl_set_bio( &ssl, my_recv, &server_fd, my_send, &server_fd ); + ssl_set_bio_timeout( &ssl, &server_fd, my_send, my_recv, NULL, 0 ); else - ssl_set_bio( &ssl, net_recv, &server_fd, net_send, &server_fd ); + ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv, +#if defined(POLARSSL_HAVE_TIME) + net_recv_timeout, +#else + NULL, +#endif + 0 ); #if defined(POLARSSL_SSL_SESSION_TICKETS) if( ( ret = ssl_set_session_tickets( &ssl, opt.tickets ) ) != 0 ) diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 160a71e46..a81c9257f 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -1591,9 +1591,15 @@ reset: } if( opt.nbio == 2 ) - ssl_set_bio( &ssl, my_recv, &client_fd, my_send, &client_fd ); + ssl_set_bio_timeout( &ssl, &client_fd, my_send, my_recv, NULL, 0 ); else - ssl_set_bio( &ssl, net_recv, &client_fd, net_send, &client_fd ); + ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv, +#if defined(POLARSSL_HAVE_TIME) + net_recv_timeout, +#else + NULL, +#endif + 0 ); #if defined(POLARSSL_SSL_DTLS_HELLO_VERIFY) if( opt.transport == SSL_TRANSPORT_DATAGRAM )