diff --git a/t/32_isHTML_valid.t b/t/32_isHTML_valid.t index 853cc1d..e15a306 100755 --- a/t/32_isHTML_valid.t +++ b/t/32_isHTML_valid.t @@ -79,11 +79,11 @@ $debughtml = `cat $html_file`; unlink $html_file; # Remove date information from the Start and Done banners in the two HTML files, since they were created at different times -$html =~ s/Start 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]/Start XXXX-XX-XX XX:XX:XX/; -$debughtml =~ s/Start 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]/Start XXXX-XX-XX XX:XX:XX/; +$html =~ s/Start 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \(UTC offset: [+-][0-9][0-9][0-9][0-9]\)/Start XXXX-XX-XX XX:XX:XX (UTC offset: +XXXX)/; +$debughtml =~ s/Start 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \(UTC offset: [+-][0-9][0-9][0-9][0-9]\)/Start XXXX-XX-XX XX:XX:XX (UTC offset: +XXXX)/; -$html =~ s/Done 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \[ *[0-9]*s\]/Done XXXX-XX-XX XX:XX:XX [ Xs]/; -$debughtml =~ s/Done 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \[ *[0-9]*s\]/Done XXXX-XX-XX XX:XX:XX [ Xs]/; +$html =~ s/Done 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \(UTC offset: [+-][0-9][0-9][0-9][0-9]\) \[ *[0-9]*s\]/Done XXXX-XX-XX XX:XX:XX (UTC offset: +XXXX) [ Xs]/; +$debughtml =~ s/Done 2[0-9][0-9][0-9]-[0-3][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9] \(UTC offset: [+-][0-9][0-9][0-9][0-9]\) \[ *[0-9]*s\]/Done XXXX-XX-XX XX:XX:XX (UTC offset: +XXXX) [ Xs]/; # Remove time difference from "HTTP clock skew" line $html =~ s/HTTP clock skew \+?-?[0-9]* /HTTP clock skew X /; diff --git a/testssl.sh b/testssl.sh index 835c63c..0d61114 100755 --- a/testssl.sh +++ b/testssl.sh @@ -24318,9 +24318,9 @@ datebanner() { if [[ "$1" =~ Done ]] ; then scan_time_f="$(printf "%04ss" "$SCAN_TIME")" # 4 digits because of windows - pr_reverse "$1 $(date +%F) $(date +%T) [$scan_time_f] -->> $node_banner <<--" + pr_reverse "$1 $(date +%F) $(date +%T) (UTC offset: $(date "+%z")) [$scan_time_f] -->> $node_banner <<--" else - pr_reverse "$1 $(date +%F) $(date +%T) -->> $node_banner <<--" + pr_reverse "$1 $(date +%F) $(date +%T) (UTC offset: $(date "+%z")) -->> $node_banner <<--" fi outln "\n" [[ "$1" =~ Start ]] && display_rdns_etc