Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-29 21:05:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #901

Browse Source 
This PR fixes #901. When $OPENSSL_TIMEOUT is set and mass testing is being performed, this PR changes find_openssl_binary() so that only child instances modify $OPENSSL to add the call to timeout.

This PR also changes the warning in case $OPENSSL_TIMEOUT is set and the timeout binary cannot be found so that the warning message is printed even if $WARNINGS is "off" or "batch".
This commit is contained in:
David Cooper
2017-11-20 13:26:10 -05:00
parent 77fc111b13
commit c65a352dcf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testssl.sh
View File

@@ -12698,15 +12698,18 @@ find_openssl_binary() {
if [[ "$OPENSSL_TIMEOUT" != "" ]]; then if [[ "$OPENSSL_TIMEOUT" != "" ]]; then
if type -p timeout 2>&1 >/dev/null ; then if type -p timeout 2>&1 >/dev/null ; then
# there are different "timeout". Check whether --preserve-status is supported if ! "$do_mass_testing"; then
if timeout --help 2>/dev/null | grep -q 'preserve-status'; then # there are different "timeout". Check whether --preserve-status is supported
OPENSSL="timeout --preserve-status $OPENSSL_TIMEOUT $OPENSSL" if timeout --help 2>/dev/null | grep -q 'preserve-status'; then
else OPENSSL="timeout --preserve-status $OPENSSL_TIMEOUT $OPENSSL"
OPENSSL="timeout $OPENSSL_TIMEOUT $OPENSSL" else
OPENSSL="timeout $OPENSSL_TIMEOUT $OPENSSL"
fi
fi fi
else else
outln outln
ignore_no_or_lame " Neccessary binary \"timeout\" not found. Continue without timeout? " "y" prln_warning " Necessary binary \"timeout\" not found."
ignore_no_or_lame " Continue without timeout? " "yes"
[[ $? -ne 0 ]] && exit -2 [[ $? -ne 0 ]] && exit -2
unset OPENSSL_TIMEOUT unset OPENSSL_TIMEOUT
fi fi