LittleNellie/cipherscan
2
0
Fork 0
mirror of https://github.com/mozilla/cipherscan.git synced 2025-04-21 01:03:39 +02:00
Code Issues Releases Wiki Activity

Merge f618e9a12e into 74dd82e8ad

Browse Source
This commit is contained in:
floatingatoll 2016-08-17 01:40:13 +00:00 committed by GitHub
commit 8dc6e47d28
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cipherscan
View File

@ -482,6 +482,7 @@ parse_openssl_output() {
while read data; do while read data; do
if [[ $data =~ $regex ]]; then if [[ $data =~ $regex ]]; then
current_sigalg="${BASH_REMATCH[1]// /_}" current_sigalg="${BASH_REMATCH[1]// /_}"
break
fi fi
done <<<"$ossl_out" done <<<"$ossl_out"
fi fi
@ -629,34 +630,34 @@ test_cipher_on_target() {
verbose "handshake failed, no ciphersuite was returned" verbose "handshake failed, no ciphersuite was returned"
result='ConnectionFailure' result='ConnectionFailure'
return 2 return 2
fi
# if cipher contains NONE, the cipher wasn't accepted # if cipher contains NONE, the cipher wasn't accepted
elif [[ "$cipher" == '(NONE) ' ]]; then if [[ "$cipher" == '(NONE) ' ]]; then
result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $pfs $current_curves $curves_ordering" result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $pfs $current_curves $curves_ordering"
verbose "handshake failed, server returned ciphersuite '$result'" verbose "handshake failed, server returned ciphersuite '$result'"
return 1 return 1
fi
# the connection succeeded # the connection succeeded
else current_curves="None"
current_curves="None" # if pfs uses ECDH, test supported curves
# if pfs uses ECDH, test supported curves if [[ $pfs =~ ECDH ]]; then
if [[ $pfs =~ ECDH ]]; then has_curves="True"
has_curves="True" if [[ $TEST_CURVES == "True" ]]; then
if [[ $TEST_CURVES == "True" ]]; then test_curves
test_curves if [[ -n $ecc_ciphers ]]; then
if [[ -n $ecc_ciphers ]]; then ecc_ciphers+=":"
ecc_ciphers+=":"
fi
ecc_ciphers+="$cipher"
else
# resolve the openssl curve to the proper IANA name
current_curves="$(get_curve_name "$(echo $pfs|cut -d ',' -f2)")"
fi fi
ecc_ciphers+="$cipher"
else
# resolve the openssl curve to the proper IANA name
current_curves="$(get_curve_name "$(echo $pfs|cut -d ',' -f2)")"
fi fi
result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $pfs $current_curves $curves_ordering"
verbose "handshake succeeded, server returned ciphersuite '$result'"
return 0
fi fi
result="$cipher $protocols $pubkey $sigalg $trusted $tickethint $ocspstaple $pfs $current_curves $curves_ordering"
verbose "handshake succeeded, server returned ciphersuite '$result'"
return 0
} }
# Calculate the average handshake time for a specific ciphersuite # Calculate the average handshake time for a specific ciphersuite