Client simulation per default as wide

... in order to be consistent with run_server_preference().

The wide formatting of other tests need some inspection and
off the top off my head are not as perfectly formatted so that
they should not run per default in wide mode.
This commit is contained in:
Dirk Wetter 2020-12-08 19:43:07 +01:00
parent f6e2a5c381
commit e7fa4ff4ce
1 changed files with 20 additions and 27 deletions

View File

@ -4814,21 +4814,19 @@ run_client_simulation() {
outln outln
debugme echo debugme echo
if "$WIDE"; then if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then
if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then out " Browser Protocol Cipher Suite Name (OpenSSL) "
out " Browser Protocol Cipher Suite Name (OpenSSL) " ( "$using_sockets" || "$HAS_DH_BITS") && out "Forward Secrecy"
( "$using_sockets" || "$HAS_DH_BITS") && out "Forward Secrecy"
outln
out "--------------------------------------------------------------------------"
else
out " Browser Protocol Cipher Suite Name (IANA/RFC) "
( "$using_sockets" || "$HAS_DH_BITS") && out "Forward Secrecy"
outln
out "------------------------------------------------------------------------------------------"
fi
( "$using_sockets" || "$HAS_DH_BITS") && out "----------------------"
outln outln
out "--------------------------------------------------------------------------"
else
out " Browser Protocol Cipher Suite Name (IANA/RFC) "
( "$using_sockets" || "$HAS_DH_BITS") && out "Forward Secrecy"
outln
out "------------------------------------------------------------------------------------------"
fi fi
( "$using_sockets" || "$HAS_DH_BITS") && out "----------------------"
outln
if ! "$using_sockets"; then if ! "$using_sockets"; then
# We can't use the connectivity checker here as of now the openssl reply is always empty (reason??) # We can't use the connectivity checker here as of now the openssl reply is always empty (reason??)
save_max_ossl_fail=$MAX_OSSL_FAIL save_max_ossl_fail=$MAX_OSSL_FAIL
@ -4938,27 +4936,23 @@ run_client_simulation() {
cipher="$(openssl2rfc "$cipher")" cipher="$(openssl2rfc "$cipher")"
[[ -z "$cipher" ]] && cipher=$(get_cipher $TMPFILE) [[ -z "$cipher" ]] && cipher=$(get_cipher $TMPFILE)
fi fi
out "$proto " out "$proto "
"$WIDE" && out " "
if [[ "$COLOR" -le 2 ]]; then if [[ "$COLOR" -le 2 ]]; then
out "$cipher" out "$cipher"
else else
pr_cipher_quality "$cipher" pr_cipher_quality "$cipher"
fi fi
if "$WIDE"; then if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then
if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then for (( j=${#cipher}; j < 34; j++ )); do
for (( j=${#cipher}; j < 34; j++ )); do out " "
out " " done
done else
else for (( j=${#cipher}; j < 50; j++ )); do
for (( j=${#cipher}; j < 50; j++ )); do out " "
out " " done
done
fi
fi fi
if [[ -n "$what_dh" ]]; then if [[ -n "$what_dh" ]]; then
[[ -n "$curve" ]] && curve="($curve)" [[ -n "$curve" ]] && curve="($curve)"
"$WIDE" || out ", "
if [[ "$what_dh" == ECDH ]]; then if [[ "$what_dh" == ECDH ]]; then
pr_ecdh_quality "$bits" "$(printf -- "%-12s" "$bits bit $what_dh") $curve" pr_ecdh_quality "$bits" "$(printf -- "%-12s" "$bits bit $what_dh") $curve"
else else
@ -4966,7 +4960,6 @@ run_client_simulation() {
fi fi
else else
if "$HAS_DH_BITS" || ( "$using_sockets" && [[ -n "${handshakebytes[i]}" ]] ); then if "$HAS_DH_BITS" || ( "$using_sockets" && [[ -n "${handshakebytes[i]}" ]] ); then
"$WIDE" || out ", "
out "No FS" out "No FS"
fi fi
fi fi