Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-30 21:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add "No FS" in non-wide mode in client simulation

Browse Source 
... and redo there for the output of curves / no FS

fix #98
This commit is contained in:
Dirk
2018-11-10 00:04:51 +01:00
parent a792a25f4d
commit f4ab795221
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
testssl.sh
View File

@@ -4569,7 +4569,7 @@ run_client_simulation() {
fi fi
bits="${bits/bits/}" bits="${bits/bits/}"
bits="${bits// /}" bits="${bits// /}"
if [[ "$what_dh" == "X25519" ]] || [[ "$what_dh" == "X448" ]]; then if [[ "$what_dh" == X25519 ]] || [[ "$what_dh" == X448 ]]; then
curve="$what_dh" curve="$what_dh"
what_dh="ECDH" what_dh="ECDH"
fi fi
@@ -4631,20 +4631,20 @@ run_client_simulation() {
done done
fi fi
fi fi
if ! "$WIDE"; then if [[ -n "$what_dh" ]]; then
"$using_sockets" && [[ -n "${handshakebytes[i]}" ]] && has_dh_bits=$HAS_DH_BITS && HAS_DH_BITS=true
"$HAS_DH_BITS" && read_dhbits_from_file $TMPFILE
"$using_sockets" && [[ -n "${handshakebytes[i]}" ]] && HAS_DH_BITS=$has_dh_bits
elif [[ -n "$what_dh" ]]; then
[[ -n "$curve" ]] && curve="($curve)" [[ -n "$curve" ]] && curve="($curve)"
if [[ "$what_dh" == "ECDH" ]]; then "$WIDE" || out ", "
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
pr_dh_quality "$bits" "$(printf -- "%-12s" "$bits bit $what_dh") $curve" pr_dh_quality "$bits" "$(printf -- "%-12s" "$bits bit $what_dh") $curve"
fi fi
elif "$HAS_DH_BITS" || ( "$using_sockets" && [[ -n "${handshakebytes[i]}" ]] ); then else
if "$HAS_DH_BITS" || ( "$using_sockets" && [[ -n "${handshakebytes[i]}" ]] ); then
"$WIDE" || out ", "
out "No FS" out "No FS"
fi fi
fi
outln outln
if [[ -n "${warning[i]}" ]]; then if [[ -n "${warning[i]}" ]]; then
out " " out " "