diff --git a/testssl.sh b/testssl.sh index bfe3396..c10fb81 100755 --- a/testssl.sh +++ b/testssl.sh @@ -2493,7 +2493,8 @@ std_cipherlists() { ;; esac tmpfile_handle $FUNCNAME.$debugname.txt - [[ $DEBUG -ge 1 ]] && tmln_out " -- $1" || tmln_out + [[ $DEBUG -ge 1 ]] && tm_out " -- $1" + outln else singlespaces=$(sed -e 's/ \+/ /g' -e 's/^ //' -e 's/ $//g' -e 's/ //g' <<< "$2") if [[ "$OPTIMAL_PROTO" == "-ssl2" ]]; then @@ -12498,6 +12499,12 @@ ip="" lets_roll init initialize_globals parse_cmd_line "$@" +# html_header() needs to be called early! Otherwiseif html_out() is called before html_header() and the +# command line contains --htmlfile or --html, it'll make problems with html output, see #692. +# json_header and csv_header can be called later but for context reasons we'll leave it here +html_header +json_header +csv_header get_install_dir set_color_functions maketempf @@ -12508,9 +12515,6 @@ mybanner check_proxy check4openssl_oldfarts check_bsd_mount -json_header -csv_header -html_header if "$do_display_only"; then prettyprint_local "$PATTERN2SHOW"