diff --git a/scripts/ocsp-stapling.test b/scripts/ocsp-stapling.test index 3651624fa..778c7151e 100755 --- a/scripts/ocsp-stapling.test +++ b/scripts/ocsp-stapling.test @@ -161,13 +161,13 @@ server=login.live.com ca=certs/external/baltimore-cybertrust-root.pem [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1 -./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!' +./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!' if [ $? -eq 0 ]; then exit 0 fi # check if supported key size is large enough to handle 4096 bit RSA -size=`./examples/client/client -? | grep "Max RSA key"` +size=`./examples/client/client '-?' | grep "Max RSA key"` size=`echo ${size//[^0-9]/}` if [ ! -z "$size" ]; then printf 'check on max key size of %d ...' $size @@ -231,7 +231,7 @@ RESULT=$? # Test with example server -./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!' +./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!' if [ $? -eq 0 ]; then exit 0 fi diff --git a/scripts/ocsp-stapling2.test b/scripts/ocsp-stapling2.test index b1c64f65e..f162365ab 100755 --- a/scripts/ocsp-stapling2.test +++ b/scripts/ocsp-stapling2.test @@ -177,7 +177,7 @@ trap cleanup EXIT INT TERM HUP [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1 # check if supported key size is large enough to handle 4096 bit RSA -size=`./examples/client/client -? | grep "Max RSA key"` +size=`./examples/client/client '-?' | grep "Max RSA key"` size=`echo ${size//[^0-9]/}` if [ ! -z "$size" ]; then printf 'check on max key size of %d ...' $size diff --git a/scripts/psk.test b/scripts/psk.test index 6693956cd..d11ac59b5 100755 --- a/scripts/psk.test +++ b/scripts/psk.test @@ -62,11 +62,11 @@ do_trap() { trap do_trap INT TERM [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1 -./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!' +./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!' if [ $? -eq 0 ]; then exit 0 fi -./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!' +./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!' if [ $? -eq 0 ]; then exit 0 fi diff --git a/scripts/resume.test b/scripts/resume.test index cbae7ebbb..35d05e1f2 100755 --- a/scripts/resume.test +++ b/scripts/resume.test @@ -49,7 +49,7 @@ do_test() { #make sure we support session resumption (!NO_SESSION_CACHE) # Check the client for the extended master secret disable option. If # present we need to run the test twice. - options_check=`./examples/client/client -?` + options_check=`./examples/client/client '-?'` case "$options_check" in *$resume_sup_string*) echo -e "\nResume test supported";; @@ -111,15 +111,15 @@ do_test() { trap do_trap INT TERM -./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!' +./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!' if [ $? -ne 0 ]; then - ./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!' + ./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!' if [ $? -ne 0 ]; then RUN_TEST="Y" fi fi -./examples/client/client -? 2>&1 | grep -- 'Resume session' +./examples/client/client '-?' 2>&1 | grep -- 'Resume session' if [ $? -ne 0 ]; then RUN_TEST="Y" fi diff --git a/scripts/tls13.test b/scripts/tls13.test index 7beb9a56b..df67a3963 100755 --- a/scripts/tls13.test +++ b/scripts/tls13.test @@ -70,11 +70,11 @@ do_trap() { trap do_trap INT TERM [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1 -./examples/client/client -? 2>&1 | grep -- 'Client not compiled in!' +./examples/client/client '-?' 2>&1 | grep -- 'Client not compiled in!' if [ $? -eq 0 ]; then exit 0 fi -./examples/server/server -? 2>&1 | grep -- 'Server not compiled in!' +./examples/server/server '-?' 2>&1 | grep -- 'Server not compiled in!' if [ $? -eq 0 ]; then exit 0 fi