LittleNellie/cipherscan
2
0
Fork 0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00
Code Issues Releases Wiki Activity

cipherscan: always define a curves_ordering column value

Browse Source 
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
This commit is contained in:
Steven Noonan 2017-01-01 14:06:43 -08:00
parent e5b747d29b
commit 532ff712aa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cipherscan
View File

@ -659,6 +659,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"
@ -783,6 +784,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
@ -803,11 +806,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