commit caecdaed25b6b3af912c1f1132eb960d1c630ab4
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Oct 13 19:04:37 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:32:54 2014 +0200
tree 4009585ab33482fe80be3e653dfa6501d368f478
parent 2d87e419e0bae21c3f3ec4ff3c9d62bfd0a33161

Cosmetics in ssl_server2 & complete tests for HVR

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index e9a0971..c6f170a 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -2046,6 +2046,7 @@
             -s "cookie verification passed" \
             -S "cookie verification skipped" \
             -c "received hello verify request" \
+            -s "hello verification requested" \
             -S "SSL - The requested feature is not available"
 
 run_test    "DTLS cookie: disabled" \
@@ -2056,18 +2057,19 @@
             -S "cookie verification passed" \
             -s "cookie verification skipped" \
             -C "received hello verify request" \
+            -S "hello verification requested" \
             -S "SSL - The requested feature is not available"
 
-# wait for client having a timeout, or server sending an alert
-#run_test    "DTLS cookie: default (failing)" \
-#            "$P_SRV dtls=1 debug_level=2 cookies=-1" \
-#            "$P_CLI dtls=1 debug_level=2" \
-#            0 \
-#            -S "cookie verification failed" \
-#            -S "cookie verification passed" \
-#            -S "cookie verification skipped" \
-#            -C "received hello verify request" \
-#            -s "SSL - The requested feature is not available"
+run_test    "DTLS cookie: default (failing)" \
+            "$P_SRV dtls=1 debug_level=2 cookies=-1" \
+            "$P_CLI dtls=1 debug_level=2 hs_timeout=100-400" \
+            1 \
+            -s "cookie verification failed" \
+            -S "cookie verification passed" \
+            -S "cookie verification skipped" \
+            -C "received hello verify request" \
+            -S "hello verification requested" \
+            -s "SSL - The requested feature is not available"
 
 requires_ipv6
 run_test    "DTLS cookie: enabled, IPv6" \
@@ -2078,6 +2080,7 @@
             -s "cookie verification passed" \
             -S "cookie verification skipped" \
             -c "received hello verify request" \
+            -s "hello verification requested" \
             -S "SSL - The requested feature is not available"
 
 run_test    "DTLS cookie: enabled, nbio" \
@@ -2088,6 +2091,7 @@
             -s "cookie verification passed" \
             -S "cookie verification skipped" \
             -c "received hello verify request" \
+            -s "hello verification requested" \
             -S "SSL - The requested feature is not available"
 
 # Tests for various cases of client authentication with DTLS