commit a6ace04c5c0ea83056772534eb6ec0fb33160de3
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Oct 15 12:44:41 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:32:57 2014 +0200
tree 76573627e568e5d3f41ff7b26ec17856cb36183b
parent f1384470bf9433320d0b601b6d9778c919794bf7

Test for lost HelloRequest

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 39e3a41..fcf8d19 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1914,9 +1914,9 @@
 
     /*
      * 7a. Request renegotiation while client is waiting for input from us.
-     * (only if we're going to exhange more data afterwards)
+     * (only on the first exchange, to be able to test retransmission)
      */
-    if( opt.renegotiate && exchanges > 1 )
+    if( opt.renegotiate && exchanges == opt.exchanges )
     {
         printf( "  . Requestion renegotiation..." );
         fflush( stdout );

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 716174e..bf5d4d0 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -2438,12 +2438,12 @@
 
 needs_more_time 4
 run_test    "DTLS proxy: 3d, min handshake, server-initiated renego" \
-            -p "$P_PXY drop=5 delay=5 duplicate=5 protect_len=41" \
+            -p "$P_PXY drop=5 delay=5 duplicate=5" \
             "$P_SRV dtls=1 hs_timeout=250-10000 tickets=0 auth_mode=none \
-             psk=abc123 renegotiate=1 renegotiation=1 exchanges=2 \
+             psk=abc123 renegotiate=1 renegotiation=1 exchanges=4 \
              debug_level=2" \
             "$P_CLI dtls=1 hs_timeout=250-10000 tickets=0 psk=abc123 \
-             renegotiation=1 exchanges=2 debug_level=2 \
+             renegotiation=1 exchanges=4 debug_level=2 \
              force_ciphersuite=TLS-PSK-WITH-AES-128-CCM-8" \
             0 \
             -c "=> renegotiate" \
@@ -2453,12 +2453,12 @@
 
 needs_more_time 4
 run_test    "DTLS proxy: 3d, min handshake, server-initiated renego, nbio" \
-            -p "$P_PXY drop=5 delay=5 duplicate=5 protect_len=41" \
+            -p "$P_PXY drop=5 delay=5 duplicate=5" \
             "$P_SRV dtls=1 hs_timeout=250-10000 tickets=0 auth_mode=none \
-             psk=abc123 renegotiate=1 renegotiation=1 exchanges=2 \
+             psk=abc123 renegotiate=1 renegotiation=1 exchanges=4 \
              debug_level=2 nbio=2" \
             "$P_CLI dtls=1 hs_timeout=250-10000 tickets=0 psk=abc123 \
-             renegotiation=1 exchanges=2 debug_level=2 nbio=2 \
+             renegotiation=1 exchanges=4 debug_level=2 nbio=2 \
              force_ciphersuite=TLS-PSK-WITH-AES-128-CCM-8" \
             0 \
             -c "=> renegotiate" \