- FIXED: #47 ("double" linefeed if RFC mapping file is not present)

This commit is contained in:
Dirk 2015-02-22 23:05:40 +01:00
parent e2448ea95d
commit d0d7bb47e2

View File

@ -751,7 +751,11 @@ neat_list(){
strength=`echo $strength | sed -e 's/ChaCha20-Poly1305/ly1305/g'` # workaround for empty bits ChaCha20-Poly1305
enc=`echo $enc | sed -e 's/(.*)//g' -e 's/ChaCha20-Poly1305/ChaCha20-Po/g'` # workaround for empty bits ChaCha20-Poly1305
echo "$export" | grep -iq export && strength="$strength,export"
printf -- " %-7s %-30s %-10s %-11s%-11s${MAP_RFC_FNAME:+ %-48s}${SHOW_EACH_C:+ }" "$1" "$2" "$kx" "$enc" "$strength" "$(show_rfc_style $HEXC)"
if [ -r "$MAP_RFC_FNAME" ]; then
printf -- " %-7s %-30s %-10s %-11s%-11s${MAP_RFC_FNAME:+ %-48s}${SHOW_EACH_C:+ }" "$1" "$2" "$kx" "$enc" "$strength" "$(show_rfc_style $HEXC)"
else
printf -- " %-7s %-30s %-10s %-11s%-11s${SHOW_EACH_C:+ }" "$1" "$2" "$kx" "$enc" "$strength"
fi
}
test_just_one(){
@ -2864,6 +2868,6 @@ case "$1" in
exit $ret ;;
esac
# $Id: testssl.sh,v 1.193 2015/02/21 10:47:11 dirkw Exp $
# $Id: testssl.sh,v 1.194 2015/02/22 22:05:39 dirkw Exp $
# vim:ts=5:sw=5