commit 23eb74d8b5eea3dabdb7b5ef53e849bd8c4b9b02
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 14:37:13 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jan 21 14:37:13 2015 +0000
tree c112db97521b8996a5239cf798b6e608dc072d9c
parent 67505bf9e859b8500e8631238ea7648748685cbc

Fix issues with new defaults

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index a4ae359..3aca8e6 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1176,7 +1176,7 @@
     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;

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 53e0fac..025ac89 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1698,7 +1698,7 @@
     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;

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 888ebab..4e28378 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1124,7 +1124,7 @@
             -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 \