Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-03 23:39:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed output in ciphertest with --color=1

Browse Source 
With --color=1 the output in the ciphertest missed some spaces between the
KeyExch. and Encryption columns. This is a result of the pr_off() function.
This commit add an additional check in neat_list() and insert the missing
spaces.
This commit is contained in:
Thomas Martens 2016-01-31 22:40:39 +01:00
parent 1726d3b41c
commit 7f7b1edd50
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testssl.sh
View File

@ -1461,11 +1461,16 @@ neat_list(){
enc=$(sed -e 's/(.*)//g' -e 's/ChaCha20-Poly1305/ChaCha20-Po/g' <<< "$enc") # workaround for empty bits ChaCha20-Poly1305
echo "$export" | grep -iq export && strength="$strength,export"
# workaround for color escape codes:
if printf -- "$kx" | "${HEXDUMPVIEW[@]}" | grep -q 33 ; then # here's a color code
if printf -- "$kx" | "${HEXDUMPVIEW[@]}" | grep -q 33 ; then # here's a color code
kx="$kx " # one for color code if ECDH and three digits
[[ "${#kx}" -eq 18 ]] && kx="$kx " # 18 means DH, colored < 1000. Add another space
[[ "${#kx}" -eq 19 ]] && kx="$kx " # 19 means DH, colored >=1000. Add another space
#echo ${#kx} # should be always 20
elif printf -- "$kx" | "${HEXDUMPVIEW[@]}" | grep -q "5b 6d" ; then # here's a code from pr_off()
kx="$kx " # one for color code if ECDH and three digits
[[ "${#kx}" -eq 11 ]] && kx="$kx " # 11 means DH, colored < 1000. Add another space
[[ "${#kx}" -eq 12 ]] && kx="$kx " # 12 means DH, colored >=1000. Add another space
#echo ${#kx} # should be always 13
fi
printf -- " %-7s %-30s %-10s %-11s%-11s${ADD_RFC_STR:+ %-48s}${SHOW_EACH_C:+ %-0s}" "$hexcode" "$ossl_cipher" "$kx" "$enc" "$strength" "$(show_rfc_style $HEXC)"