From 9b37932869e0479e0bfebfaffd1c2ec66eb10c4a Mon Sep 17 00:00:00 2001 From: Frank Breedijk Date: Mon, 12 Feb 2018 15:40:10 +0100 Subject: [PATCH] bla bla bla --- testssl.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testssl.sh b/testssl.sh index 50671a5..92db14a 100755 --- a/testssl.sh +++ b/testssl.sh @@ -820,6 +820,7 @@ fileout() { if ( "$do_pretty_json" && [[ "$1" == "service" ]] ) || show_finding "$severity"; then local finding=$(strip_lf "$(newline_to_spaces "$(strip_quote "$3")")") + [[ -z "$finding" ]] && finding="(empty)" [[ -e "$JSONFILE" ]] && (fileout_json_finding "$1" "$severity" "$finding" "$cve" "$cwe" "$hint") "$do_csv" && \ echo -e \""$1\"",\"$NODE/$NODEIP\",\"$PORT"\",\""$severity"\",\""$finding"\",\""$cve"\",\""$cwe"\",\""$hint"\"" >> "$CSVFILE" @@ -8970,7 +8971,7 @@ derive-handshake-traffic-keys() { if [[ "$cipher" == *SHA256 ]]; then hash_fn="-sha256" elif [[ "$cipher" == *SHA384 ]]; then - hash_fn="-sha384" + hash_fn="-sha384" else return 1 fi @@ -9288,7 +9289,7 @@ sym-decrypt() { local -i ciphertext_len tag_len case "$cipher" in - *CCM_8*) + *CCM_8*) tag_len=16 ;; *CCM*|*GCM*|*CHACHA20_POLY1305*) tag_len=32 ;; @@ -10186,7 +10187,7 @@ parse_tls_serverhello() { if [[ -n "$tls_certificate_ascii" ]]; then # In TLS 1.3, the Certificate message begins with a zero length certificate_request_context. # In addition, certificate_list is now a list of (certificate, extension) pairs rather than - # just certificates. So, extract the extensions and add them to $tls_serverhello_ascii and + # just certificates. So, extract the extensions and add them to $tls_serverhello_ascii and # create a new $tls_certificate_ascii that only contains a list of certificates. if [[ -n "$tls_certificate_ascii" ]]; then if [[ "${tls_certificate_ascii:0:2}" != "00" ]]; then @@ -14824,7 +14825,7 @@ mybanner() { bb1=$(cat <