Skip to content

Commit 496373a

Browse files
committed
Finalize renaming MAX_WAITSOCK --> ROBOT_TIMEOUT
The commit 51a35b0 changed variable names but there were leftovers. Also before the tiemout values were reduced, so that the check may run faster. What was left were that some timeout values were still too long. Thus MAX_WAITSOCK is now completely changed to ROBOT_TIMEOUT . Also when the ROBOT check identified something as potentially vulnerable, the timeout value ist increased to 8 seconds which is less than in 3.2 . Tests however showed so far that there were no false positives or negatives. Moreover it changes the local variable robottimeout to robot_timeout. This PR fixes #2983 for 3.3dev .
1 parent 79db276 commit 496373a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

testssl.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20690,7 +20690,7 @@ run_robot() {
2069020690
local -i i subret len iteration testnum pubkeybytes
2069120691
local pubkeybits
2069220692
local vulnerable=false send_ccs_finished=true
20693-
local -i start_time end_time robottimeout=$ROBOT_TIMEOUT
20693+
local -i start_time end_time robot_timeout=$ROBOT_TIMEOUT
2069420694
local cve="CVE-2017-17382 CVE-2017-17427 CVE-2017-17428 CVE-2017-13098 CVE-2017-1000385 CVE-2017-13099 CVE-2016-6883 CVE-2012-5081 CVE-2017-6168"
2069520695
local cwe="CWE-203"
2069620696
local jsonID="ROBOT"
@@ -20854,7 +20854,7 @@ run_robot() {
2085420854
fi
2085520855
debugme echo "reading server error response..."
2085620856
start_time=$(LC_ALL=C date "+%s")
20857-
sockread 32768 $robottimeout
20857+
sockread 32768 $robot_timeout
2085820858
subret=$?
2085920859
if [[ $subret -eq 0 ]]; then
2086020860
end_time=$(LC_ALL=C date "+%s")
@@ -20869,9 +20869,9 @@ run_robot() {
2086920869
# exchange message, measure the amount of time it took to
2087020870
# receive a response and set the timeout value for future
2087120871
# tests to 2 seconds longer than it took to receive a response.
20872-
[[ $iteration -ne 2 ]] && [[ $robottimeout -eq $MAX_WAITSOCK ]] && \
20873-
[[ $((end_time-start_time)) -lt $((MAX_WAITSOCK-2)) ]] && \
20874-
robottimeout=$((end_time-start_time+2))
20872+
[[ $iteration -ne 2 ]] && [[ $robot_timeout -eq $ROBOT_TIMEOUT ]] && \
20873+
[[ $((end_time-start_time)) -lt $((ROBOT_TIMEOUT-2)) ]] && \
20874+
robot_timeout=$((end_time-start_time+2))
2087520875
else
2087620876
response[testnum]="Timeout waiting for alert"
2087720877
fi
@@ -20910,14 +20910,15 @@ run_robot() {
2091020910
# If the test was run with a short timeout and was found to be
2091120911
# potentially vulnerable due to some tests timing out, then
2091220912
# verify the results by rerunning with a longer timeout.
20913-
if [[ $robottimeout -eq $MAX_WAITSOCK ]]; then
20913+
if [[ $robot_timeout -eq $ROBOT_TIMEOUT ]]; then
2091420914
break
2091520915
elif [[ "${response[0]}" == "Timeout waiting for alert" ]] || \
2091620916
[[ "${response[1]}" == "Timeout waiting for alert" ]] || \
2091720917
[[ "${response[2]}" == "Timeout waiting for alert" ]] || \
2091820918
[[ "${response[3]}" == "Timeout waiting for alert" ]] || \
2091920919
[[ "${response[4]}" == "Timeout waiting for alert" ]]; then
20920-
robottimeout=10
20920+
[[ "$DEBUG" -ge 3 ]] && echo "5x Timeout waiting for alert, $robot_timeout increasing to 8"
20921+
robot_timeout=8
2092120922
else
2092220923
break
2092320924
fi
@@ -21795,6 +21796,7 @@ IPv6_OK: $IPv6_OK
2179521796
MAX_WAITSOCK: $MAX_WAITSOCK
2179621797
HEARTBLEED_MAX_WAITSOCK: $HEARTBLEED_MAX_WAITSOCK
2179721798
CCS_MAX_WAITSOCK: $CCS_MAX_WAITSOCK
21799+
ROBOT_TIMEOUT: $ROBOT_TIMEOUT
2179821800
USLEEP_SND $USLEEP_SND
2179921801
USLEEP_REC $USLEEP_REC
2180021802
HEADER_MAXSLEEP: $HEADER_MAXSLEEP

0 commit comments

Comments
 (0)