Fix calls to debugme1() with redirects

As noted in https://github.com/drwetter/testssl.sh/pull/1963#issuecomment-954935175, there are two places in which debugme1() is called in which the command to be run prints something to stdout, which is then redirected to a file. Now that debugme1() includes a redirect from stdout to stderr, these two lines do not work as expected. The output appears in the terminal and an empty file is created.

This commit fixes the issue by not using the debugme1() function in these two places.
This commit is contained in:
David Cooper 2021-11-09 15:36:30 -05:00
parent b7d6b7ca7b
commit f1df111a32
1 changed files with 2 additions and 2 deletions

View File

@ -7626,7 +7626,7 @@ determine_tls_extensions() {
fi fi
# Keep it "on file" for debugging purposes # Keep it "on file" for debugging purposes
debugme1 safe_echo "$TLS_EXTENSIONS" 2>&1 >"$TEMPDIR/$NODE.$NODEIP.tls_extensions.txt" [[ "$DEBUG" -ge 1 ]] && safe_echo "$TLS_EXTENSIONS" >"$TEMPDIR/$NODE.$NODEIP.tls_extensions.txt"
return $success return $success
} }
@ -10530,7 +10530,7 @@ run_fs() {
CURVES_OFFERED="$curves_offered" CURVES_OFFERED="$curves_offered"
CURVES_OFFERED=$(strip_trailing_space "$CURVES_OFFERED") CURVES_OFFERED=$(strip_trailing_space "$CURVES_OFFERED")
# Keep it "on file" for debugging purposes # Keep it "on file" for debugging purposes
debugme1 safe_echo "$CURVES_OFFERED" 2>&1 >"$TEMPDIR/$NODE.$NODEIP.curves_offered.txt" [[ "$DEBUG" -ge 1 ]] && safe_echo "$CURVES_OFFERED" >"$TEMPDIR/$NODE.$NODEIP.curves_offered.txt"
# find out what groups are supported. # find out what groups are supported.
if "$using_sockets" && ( "$fs_tls13_offered" || "$ffdhe_offered" ); then if "$using_sockets" && ( "$fs_tls13_offered" || "$ffdhe_offered" ); then