LittleNellie
/
cipherscan
mirror of https://github.com/mozilla/cipherscan.git
2
0
Fork 0
Code Issues Releases Wiki Activity

revise whitespace layout of cipher, curve arrays to improve future diffs

This commit is contained in:
Richard Soderberg 2015-09-02 21:47:13 -07:00
parent 9e563782e2
commit 10057f93dc
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cipherscan
View File

@ -65,7 +65,8 @@ fi
CIPHERSUITE="ALL:COMPLEMENTOFALL:+aRSA" CIPHERSUITE="ALL:COMPLEMENTOFALL:+aRSA"
# some servers are intolerant to large client hello, try a shorter list of # some servers are intolerant to large client hello, try a shorter list of
# ciphers with them # ciphers with them
SHORTCIPHERSUITE=('ECDHE-ECDSA-AES128-GCM-SHA256' SHORTCIPHERSUITE=(
'ECDHE-ECDSA-AES128-GCM-SHA256'
'ECDHE-RSA-AES128-GCM-SHA256' 'ECDHE-RSA-AES128-GCM-SHA256'
'ECDHE-RSA-AES256-GCM-SHA384' 'ECDHE-RSA-AES256-GCM-SHA384'
'ECDHE-ECDSA-AES256-SHA' 'ECDHE-ECDSA-AES256-SHA'
@ -88,7 +89,8 @@ SHORTCIPHERSUITE=('ECDHE-ECDSA-AES128-GCM-SHA256'
'CAMELLIA256-SHA' 'CAMELLIA256-SHA'
'DES-CBC3-SHA' 'DES-CBC3-SHA'
'RC4-SHA' 'RC4-SHA'
'RC4-MD5') 'RC4-MD5'
)
# as some servers are intolerant to large client hello's (or ones that have # as some servers are intolerant to large client hello's (or ones that have
# RC4 ciphers below position 64), use the following for cipher testing in case # RC4 ciphers below position 64), use the following for cipher testing in case
# of problems # of problems
@ -126,7 +128,7 @@ FALLBACKCIPHERSUITE=(
'EXP-DES-CBC-SHA' 'EXP-DES-CBC-SHA'
'EXP-RC2-CBC-MD5' 'EXP-RC2-CBC-MD5'
'EXP-RC4-MD5' 'EXP-RC4-MD5'
) )
DEBUG=0 DEBUG=0
VERBOSE=0 VERBOSE=0
DELAY=0 DELAY=0
@ -205,7 +207,8 @@ debug(){
} }
# obtain an array of curves supported by openssl # obtain an array of curves supported by openssl
CURVES=(sect163k1 # K-163 CURVES=(
sect163k1 # K-163
sect163r1 sect163r1
sect163r2 # B-163 sect163r2 # B-163
sect193r1 sect193r1
@ -232,11 +235,13 @@ CURVES=(sect163k1 # K-163
secp521r1 # P-521 secp521r1 # P-521
brainpoolP256r1 brainpoolP256r1
brainpoolP384r1 brainpoolP384r1
brainpoolP512r1) brainpoolP512r1
)
# many curves have alternative names, this array provides a mapping to find the IANA # many curves have alternative names, this array provides a mapping to find the IANA
# name of a curve using its alias # name of a curve using its alias
CURVES_MAP=("sect163k1 K-163" CURVES_MAP=(
"sect163k1 K-163"
"sect163r2 B-163" "sect163r2 B-163"
"sect233k1 K-233" "sect233k1 K-233"
"sect233r1 B-233" "sect233r1 B-233"
@ -250,7 +255,8 @@ CURVES_MAP=("sect163k1 K-163"
"secp224r1 P-224" "secp224r1 P-224"
"prime256v1 P-256 secp256r1" "prime256v1 P-256 secp256r1"
"secp384r1 P-384" "secp384r1 P-384"
"secp521r1 P-521") "secp521r1 P-521"
)
get_curve_name() { get_curve_name() {
local identifier=$1 local identifier=$1