Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2024-12-28 04:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2602 from dcooper16/fix2599

Browse Source 
Fix #2599
This commit is contained in:
Dirk Wetter 2024-11-27 11:35:41 +01:00 committed by GitHub
commit 662a99fdce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testssl.sh
View File

@ -1371,13 +1371,17 @@ fileout_insert_warning() {
[[ "$CMDLINE=" =~ -iL ]] && return 0 [[ "$CMDLINE=" =~ -iL ]] && return 0
# Note we still have the message on screen + in HTML which is not as optimal as it could be # Note we still have the message on screen + in HTML which is not as optimal as it could be
if "$do_pretty_json" && "$JSONHEADER"; then # See #2599. The "clientProblem" wrapper should only be added if fileout_insert_warning()
# is called before fileout_banner(). The only instance in which this function is called
# after fileout_banner() is in the case of a TLS 1.3 only server when $OPENSSL does not
# support TLS 1.3.
if "$do_pretty_json" && "$JSONHEADER" && ! "$TLS13_ONLY"; then
echo -e " \"clientProblem${CLIENT_PROB_NO}\" : [" >>"$JSONFILE" echo -e " \"clientProblem${CLIENT_PROB_NO}\" : [" >>"$JSONFILE"
CLIENT_PROB_NO=$((CLIENT_PROB_NO + 1)) CLIENT_PROB_NO=$((CLIENT_PROB_NO + 1))
FIRST_FINDING=true # make sure we don't have a comma here FIRST_FINDING=true # make sure we don't have a comma here
fi fi
fileout "$1" "$2" "$3" fileout "$1" "$2" "$3"
if "$do_pretty_json"; then if "$do_pretty_json" && ! "$TLS13_ONLY"; then
if "$JSONHEADER"; then if "$JSONHEADER"; then
echo -e "\n ]," >>"$JSONFILE" echo -e "\n ]," >>"$JSONFILE"
else else