mirror of
https://github.com/mozilla/cipherscan.git
synced 2024-11-05 07:23:42 +01:00
Merge pull request #134 from tycho/fix-benchmark-output
fix -b (benchmark) output
This commit is contained in:
commit
757bfefc6d
13
cipherscan
13
cipherscan
@ -662,6 +662,7 @@ test_cipher_on_target() {
|
|||||||
else
|
else
|
||||||
# resolve the openssl curve to the proper IANA name
|
# resolve the openssl curve to the proper IANA name
|
||||||
current_curves="$(get_curve_name "$(echo $pfs|cut -d ',' -f2)")"
|
current_curves="$(get_curve_name "$(echo $pfs|cut -d ',' -f2)")"
|
||||||
|
curves_ordering="unknown"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $npn $pfs $current_curves $curves_ordering"
|
result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $npn $pfs $current_curves $curves_ordering"
|
||||||
@ -786,6 +787,8 @@ display_results_in_terminal() {
|
|||||||
npn="${cipher_data[7]}"
|
npn="${cipher_data[7]}"
|
||||||
if [[ $TEST_CURVES == "True" && -n ${cipher_data[10]} ]]; then
|
if [[ $TEST_CURVES == "True" && -n ${cipher_data[10]} ]]; then
|
||||||
curvesordering="${cipher_data[10]}"
|
curvesordering="${cipher_data[10]}"
|
||||||
|
else
|
||||||
|
curvesordering="unknown"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ "$pubkey" != "${cipher_data[2]}" ]]; then
|
if [[ "$pubkey" != "${cipher_data[2]}" ]]; then
|
||||||
@ -806,11 +809,7 @@ display_results_in_terminal() {
|
|||||||
if [[ "$npn" != "${cipher_data[7]}" ]]; then
|
if [[ "$npn" != "${cipher_data[7]}" ]]; then
|
||||||
different=True
|
different=True
|
||||||
fi
|
fi
|
||||||
if [[ -z $curvesordering && -n "${cipher_data[10]}" ]]; then
|
if [[ "$TEST_CURVES" == "True" && "$curvesordering" != "${cipher_data[10]}" ]]; then
|
||||||
curvesordering="${cipher_data[10]}"
|
|
||||||
fi
|
|
||||||
if [[ -n $curvesordering && "$curvesordering" != "${cipher_data[10]}" ]]; then
|
|
||||||
echo "CURVESORDERING"
|
|
||||||
different=True
|
different=True
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -841,8 +840,8 @@ display_results_in_terminal() {
|
|||||||
if [[ $different == "True" ]]; then
|
if [[ $different == "True" ]]; then
|
||||||
echo "$result"|grep -v '(NONE)'
|
echo "$result"|grep -v '(NONE)'
|
||||||
else
|
else
|
||||||
# prints priority, ciphersuite, protocols and pfs
|
# prints priority, ciphersuite, protocols, pfs and benchmark time (if any)
|
||||||
awk '!/(NONE)/{print $1 " " $2 " " $3 " " $10 " " $11}' <<<"$result"
|
awk '!/(NONE)/{print $1 " " $2 " " $3 " " $10 " " $11 " " $13 }' <<<"$result"
|
||||||
fi
|
fi
|
||||||
done|column -t
|
done|column -t
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user