From 8b2608b6c2a5368ff09f35e41d294fd4de592be0 Mon Sep 17 00:00:00 2001 From: Jarno Lamsa Date: Thu, 13 Jun 2019 12:22:50 +0300 Subject: [PATCH] Fix style issues --- programs/ssl/ssl_client2.c | 22 +++++++++++++--------- programs/ssl/ssl_server2.c | 23 ++++++++++++++--------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index ccf379ef8..9e0dea23e 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -2393,7 +2393,8 @@ send_request: goto exit; } - if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, buf_len, &buf_len ) ) != 0 ) + if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, + buf_len, &buf_len ) ) != 0 ) { mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned " "-0x%x\n\n", -ret ); @@ -2409,28 +2410,31 @@ send_request: if( ( ret = mbedtls_ssl_setup( &ssl, &conf ) ) != 0 ) { - mbedtls_printf( " failed\n ! mbedtls_ssl_setup returned -0x%x\n\n", - -ret ); + mbedtls_printf( " failed\n ! mbedtls_ssl_setup returned " + " -0x%x\n\n", -ret ); goto exit; } if( opt.nbio == 2 ) - mbedtls_ssl_set_bio( &ssl, &server_fd, my_send, my_recv, NULL ); + mbedtls_ssl_set_bio( &ssl, &server_fd, my_send, my_recv, + NULL ); else mbedtls_ssl_set_bio( &ssl, &server_fd, - mbedtls_net_send, mbedtls_net_recv, - opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL ); + mbedtls_net_send, mbedtls_net_recv, + opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL ); #if defined(MBEDTLS_TIMING_C) if( opt.nbio != 0 && opt.read_timeout != 0 ) - mbedtls_ssl_set_timer_cb( &ssl, &timer, mbedtls_timing_set_delay, - mbedtls_timing_get_delay ); + mbedtls_ssl_set_timer_cb( &ssl, &timer, + mbedtls_timing_set_delay, + mbedtls_timing_get_delay ); #endif /* MBEDTLS_TIMING_C */ } mbedtls_printf( " Deserializing connection..." ); - if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, buf_len ) ) != 0 ) + if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, + buf_len ) ) != 0 ) { mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned " "-0x%x\n\n", -ret ); diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 685439743..31bc0374e 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -3378,7 +3378,8 @@ data_exchange: goto exit; } - if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, buf_len, &buf_len ) ) != 0 ) + if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, + buf_len, &buf_len ) ) != 0 ) { mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned " "-0x%x\n\n", -ret ); @@ -3394,27 +3395,31 @@ data_exchange: if( ( ret = mbedtls_ssl_setup( &ssl, &conf ) ) != 0 ) { - mbedtls_printf( " failed\n ! mbedtls_ssl_setup returned -0x%x\n\n", - -ret ); + mbedtls_printf( " failed\n ! mbedtls_ssl_setup returned " + "-0x%x\n\n", -ret ); goto exit; } if( opt.nbio == 2 ) - mbedtls_ssl_set_bio( &ssl, &client_fd, my_send, my_recv, NULL ); + mbedtls_ssl_set_bio( &ssl, &client_fd, my_send, my_recv, + NULL ); else - mbedtls_ssl_set_bio( &ssl, &client_fd, mbedtls_net_send, mbedtls_net_recv, - opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL ); + mbedtls_ssl_set_bio( &ssl, &client_fd, mbedtls_net_send, + mbedtls_net_recv, + opt.nbio == 0 ? mbedtls_net_recv_timeout : NULL ); #if defined(MBEDTLS_TIMING_C) if( opt.nbio != 0 && opt.read_timeout != 0 ) - mbedtls_ssl_set_timer_cb( &ssl, &timer, mbedtls_timing_set_delay, - mbedtls_timing_get_delay ); + mbedtls_ssl_set_timer_cb( &ssl, &timer, + mbedtls_timing_set_delay, + mbedtls_timing_get_delay ); #endif /* MBEDTLS_TIMING_C */ } mbedtls_printf( " Deserializing connection..." ); - if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, buf_len ) ) != 0 ) + if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, + buf_len ) ) != 0 ) { mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned " "-0x%x\n\n", -ret );