From 23eb74d8b5eea3dabdb7b5ef53e849bd8c4b9b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 21 Jan 2015 14:37:13 +0000 Subject: [PATCH] Fix issues with new defaults --- programs/ssl/ssl_client2.c | 2 +- programs/ssl/ssl_server2.c | 2 +- tests/ssl-opt.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index a4ae359c8..3aca8e675 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1176,7 +1176,7 @@ int main( int argc, char *argv[] ) if( opt.min_version != -1 ) { ret = ssl_set_min_version( &ssl, SSL_MAJOR_VERSION_3, opt.min_version ); - if( ret != 0 ) + if( ret != 0 && opt.min_version != DFL_MIN_VERSION ) { printf( " failed\n ! selected min_version is not available\n" ); goto exit; diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 53e0fac9a..025ac8967 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -1698,7 +1698,7 @@ int main( int argc, char *argv[] ) if( opt.min_version != -1 ) { ret = ssl_set_min_version( &ssl, SSL_MAJOR_VERSION_3, opt.min_version ); - if( ret != 0 ) + if( ret != 0 && opt.min_version != DFL_MIN_VERSION ) { printf( " failed\n ! selected min_version is not available\n" ); goto exit; diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 888ebab69..4e2837869 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -1124,7 +1124,7 @@ run_test "Max fragment length: client, larger message" \ -s "2048 bytes read" \ -s "297 bytes read" -run_test "Max fragment length: client, larger message" \ +run_test "Max fragment length: DTLS client, larger message" \ "$P_SRV debug_level=3 dtls=1" \ "$P_CLI debug_level=3 dtls=1 max_frag_len=2048 request_size=2345" \ 1 \