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

Fixes instances of SC2086, SC2046 errors regarding unquoted variables.

Browse Source 
In cipherscan line 294:
    echo $identifier
         ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 587:
                current_curves="$(get_curve_name $(echo $pfs|cut -d ',' -f2))"
                                                 ^-- SC2046: Quote this to prevent word splitting.

In cipherscan line 603:
        debug Connection $i
                         ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 715:
            echo $header
                 ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 719:
            echo $result|grep -v '(NONE)'
                 ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 897:
        local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null)
                                                 ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 910:
                cname="$(get_curve_name ${ephem_data[1]})"
                                        ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 953:
        local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null)
                                                 ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 967:
                local cname="$(get_curve_name ${ephem_data[1]})"
                                              ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 1017:
        local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null)
                                                 ^-- SC2086: Double quote to prevent globbing and word splitting.

In cipherscan line 1030:
                local cname="$(get_curve_name ${ephem_data[1]})"
                                              ^-- SC2086: Double quote to prevent globbing and word splitting.
This commit is contained in:
Richard Soderberg 2015-09-05 04:25:55 -07:00
parent c103805a38
commit bc79c51065
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cipherscan
View File

@ -328,7 +328,7 @@ get_curve_name() {
return return
fi fi
done done
echo $identifier echo "$identifier"
return return
} }
@ -621,7 +621,7 @@ test_cipher_on_target() {
ecc_ciphers+="$cipher" ecc_ciphers+="$cipher"
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)")"
fi fi
fi fi
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"
@ -637,7 +637,7 @@ bench_cipher() {
local t="$(date +%s%N)" local t="$(date +%s%N)"
verbose "Benchmarking handshake on '$TARGET' with ciphersuite '$ciphersuite'" verbose "Benchmarking handshake on '$TARGET' with ciphersuite '$ciphersuite'"
for i in $(seq 1 $BENCHMARKITER); do for i in $(seq 1 $BENCHMARKITER); do
debug Connection $i debug "Connection $i"
(echo "Q" | $sslcommand 2>/dev/null 1>/dev/null) (echo "Q" | $sslcommand 2>/dev/null 1>/dev/null)
if (( $? != 0 )); then if (( $? != 0 )); then
break break
@ -749,11 +749,11 @@ display_results_in_terminal() {
ctr=0 ctr=0
for result in "${results[@]}"; do for result in "${results[@]}"; do
if [[ $ctr -eq 0 ]]; then if [[ $ctr -eq 0 ]]; then
echo $header echo "$header"
ctr=$((ctr+1)) ctr=$((ctr+1))
fi fi
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 and pfs
awk '!/(NONE)/{print $1 " " $2 " " $3 " " $9 " " $10}' <<<"$result" awk '!/(NONE)/{print $1 " " $2 " " $3 " " $9 " " $10}' <<<"$result"
@ -931,7 +931,7 @@ test_curves() {
verbose "Testing $test_curves with command $sslcommand" verbose "Testing $test_curves with command $sslcommand"
ratelimit ratelimit
local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null) local tmp=$(echo Q | $sslcommand -curves "$test_curves" 2>/dev/null)
parse_openssl_output <<<"$tmp" parse_openssl_output <<<"$tmp"
if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then
@ -944,7 +944,7 @@ test_curves() {
if [[ -n $current_curves ]]; then if [[ -n $current_curves ]]; then
current_curves+="," current_curves+=","
fi fi
cname="$(get_curve_name ${ephem_data[1]})" cname="$(get_curve_name "${ephem_data[1]}")"
verbose "Server selected ${ephem_data[1]}, a.k.a $cname" verbose "Server selected ${ephem_data[1]}, a.k.a $cname"
current_curves+="$cname" current_curves+="$cname"
fi fi
@ -987,7 +987,7 @@ test_curves() {
verbose "Testing ordering with $sslcommand -curves $test_curves" verbose "Testing ordering with $sslcommand -curves $test_curves"
ratelimit ratelimit
local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null) local tmp=$(echo Q | $sslcommand -curves "$test_curves" 2>/dev/null)
parse_openssl_output <<<"$tmp" parse_openssl_output <<<"$tmp"
if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then
@ -1001,7 +1001,7 @@ test_curves() {
if [[ ${ephem_data[0]} =~ ECDH ]]; then if [[ ${ephem_data[0]} =~ ECDH ]]; then
verbose "Server did select ${ephem_data[1]} curve" verbose "Server did select ${ephem_data[1]} curve"
curves_ordering="inconclusive-${ephem_data[1]}" curves_ordering="inconclusive-${ephem_data[1]}"
local cname="$(get_curve_name ${ephem_data[1]})" local cname="$(get_curve_name "${ephem_data[1]}")"
if [[ "$cname" == "$most_wanted" ]]; then if [[ "$cname" == "$most_wanted" ]]; then
curves_ordering="client" curves_ordering="client"
else else
@ -1051,7 +1051,7 @@ test_curves_fallback() {
verbose "Testing $sslcommand -curves $test_curves" verbose "Testing $sslcommand -curves $test_curves"
ratelimit ratelimit
local tmp=$(echo Q | $sslcommand -curves $test_curves 2>/dev/null) local tmp=$(echo Q | $sslcommand -curves "$test_curves" 2>/dev/null)
parse_openssl_output <<<"$tmp" parse_openssl_output <<<"$tmp"
if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then if [[ -z $current_protocol || $current_cipher == "(NONE)" || $current_cipher == '0000' ]]; then
@ -1064,7 +1064,7 @@ test_curves_fallback() {
if [[ ${ephem_data[0]} =~ ECDH ]]; then if [[ ${ephem_data[0]} =~ ECDH ]]; then
# we got an ecc connection, remove the curve from the list of testable curves # we got an ecc connection, remove the curve from the list of testable curves
local cname="$(get_curve_name ${ephem_data[1]})" local cname="$(get_curve_name "${ephem_data[1]}")"
verbose "Server selected curve $cname" verbose "Server selected curve $cname"
for id in "${!curves[@]}"; do for id in "${!curves[@]}"; do
if [[ "${curves[id]}" == "$cname" ]]; then if [[ "${curves[id]}" == "$cname" ]]; then