From 185a25ac3e23640d4e9735cca3eae598198aca8c Mon Sep 17 00:00:00 2001 From: David Cooper Date: Tue, 1 Aug 2017 14:49:06 -0400 Subject: [PATCH] parse_tls_serverhello(), dh_bits, debug level 2 Currently, when `$DEBUG` is 2 and the connection is successful, `parse_tls_serverhello()` prints out information about the server's ephermal (EC)DH key, but nothing else. For example: ``` sending client hello... reading server hello... dh_bits: ECDH, P-256, 256 bits sending close_notify... (183 lines returned) ``` This commit changes `parse_tls_serverhello()` so that information about dh_bits is only displayed if `$DEBUG` is at least 3, making it the same as for other information about the server's response. In addition, it indents the printing of the information about dh_bits in order to better align with other information displayed at this debug level. --- testssl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testssl.sh b/testssl.sh index 81f9677..1fa8b3c 100755 --- a/testssl.sh +++ b/testssl.sh @@ -8388,10 +8388,10 @@ parse_tls_serverhello() { esac fi if [[ $dh_bits -ne 0 ]] && [[ $named_curve -ne 29 ]] && [[ $named_curve -ne 30 ]]; then - debugme echo "dh_bits: ECDH, $named_curve_str, $dh_bits bits" + [[ $DEBUG -ge 3 ]] && echo -e " dh_bits: ECDH, $named_curve_str, $dh_bits bits\n" echo "Server Temp Key: ECDH, $named_curve_str, $dh_bits bits" >> $TMPFILE elif [[ $dh_bits -ne 0 ]]; then - debugme echo "dh_bits: $named_curve_str, $dh_bits bits" + [[ $DEBUG -ge 3 ]] && echo -e " dh_bits: $named_curve_str, $dh_bits bits\n" echo "Server Temp Key: $named_curve_str, $dh_bits bits" >> $TMPFILE fi elif [[ $rfc_cipher_suite =~ TLS_DHE_ ]] || [[ $rfc_cipher_suite =~ TLS_DH_anon ]] || \ @@ -8450,7 +8450,7 @@ parse_tls_serverhello() { [[ "$ephemeral_param" != "$rfc7919_param" ]] && named_curve_str="" fi - [[ $DEBUG -ge 2 ]] && [[ $dh_bits -ne 0 ]] && echo "dh_bits: DH,$named_curve_str $dh_bits bits" + [[ $DEBUG -ge 3 ]] && [[ $dh_bits -ne 0 ]] && echo -e " dh_bits: DH,$named_curve_str $dh_bits bits\n" [[ $dh_bits -ne 0 ]] && echo "Server Temp Key: DH,$named_curve_str $dh_bits bits" >> $TMPFILE fi fi