Skip to content

Commit 88856ec

Browse files
committed
2nd try
1 parent f394080 commit 88856ec

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

testssl.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17173,10 +17173,11 @@ run_renego() {
1717317173
prln_warning "not having provided client certificate and private key file, the client x509-based authentication prevents this from being tested"
1717417174
fileout "$jsonID" "WARN" "not having provided client certificate and private key file, the client x509-based authentication prevents this from being tested"
1717517175
else
17176-
# We will extensively use subshell and command pipe
17177-
# Do not let herited pipeline error control interfere
17178-
[[ $- == *e* ]] && restore_pipeerror=1
17179-
[[ $restore_pipeerror == 1 ]] && set +e
17176+
# # We will extensively use subshell and command pipe
17177+
# # Do not let herited pipeline error control interfere
17178+
# [[ $- == *e* ]] && restore_pipeerror=1
17179+
# [[ $restore_pipeerror == 1 ]] && set +e
17180+
# set +o pipefail
1718017181
# We will need $ERRFILE for mitigation detection
1718117182
if [[ $ERRFILE =~ dev.null ]]; then
1718217183
ERRFILE=$TEMPDIR/errorfile.txt || exit $ERR_FCREATE
@@ -17209,7 +17210,7 @@ run_renego() {
1720917210
# s_client STDIN too early as the close could come at any time and race with the tear down of s_client.
1721017211
# See https://github.com/drwetter/testssl.sh/issues/2590
1721117212
# In this case the added iteration is harmless as it will just spin in backgroup
17212-
for ((i=0; i <= ssl_reneg_attempts; i++ )); do sleep $ssl_reneg_wait; echo R; k=0; \
17213+
for ((i=0; i <= ssl_reneg_attempts; i++ )); do sleep $ssl_reneg_wait; echo R 2>/dev/null; k=0; \
1721317214
# 0 means client is renegotiating & doesn't return an error --> vuln!
1721417215
# 1 means client tried to renegotiating but the server side errored then. You still see RENEGOTIATING in the output
1721517216
# Exemption from above: server closed the connection but return value was zero
@@ -17287,7 +17288,7 @@ run_renego() {
1728717288
;;
1728817289
esac
1728917290
fi
17290-
[[ $restore_pipeerror == 1 ]] && set -e
17291+
# [[ $restore_pipeerror == 1 ]] && set -e
1729117292
fi
1729217293

1729317294
#pr_bold " Insecure Client-Initiated Renegotiation " # pre-RFC 5746, CVE-2009-3555

0 commit comments

Comments
 (0)