Git
/
testssl.sh
mirror of https://github.com/drwetter/testssl.sh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename cipher lists for run_logjam() 

This PR renames the cipher lists for `run_logjam()` in generate_static_cipher_lists.sh to align with their names in testssl.sh, as requested in #590.

I think these names are still open for misinterpretation, however, since its not clear whether "dh_cipher" refers to ciphers that use static DH keys, ephemeral DH keys, or both.
This commit is contained in:
David Cooper 2017-01-24 10:49:59 -05:00 committed by GitHub
parent 2a5d56a9d6
commit c09a77006e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/generate_static_cipher_lists.sh
View File

@ -309,34 +309,34 @@ get_export_rsa_ciphers() {
get_weak_dh_ciphers() { get_weak_dh_ciphers() {
local -i local -i
local hexc exportdhe_cipher_list="" exportdhe_cipher_list_hex="" local hexc exportdh_cipher_list="" exportdh_cipher_list_hex=""
for (( i=0; i < TLS_NR_CIPHERS; i++ )); do for (( i=0; i < TLS_NR_CIPHERS; i++ )); do
if [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DHE_"* ]] && [[ "${TLS_CIPHER_EXPORT[i]}" == "export" ]]; then if [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DHE_"* ]] && [[ "${TLS_CIPHER_EXPORT[i]}" == "export" ]]; then
hexc="${TLS_CIPHER_HEXCODE[i]}" hexc="${TLS_CIPHER_HEXCODE[i]}"
[[ "${TLS_CIPHER_OSSL_NAME[i]}" != "-" ]] && exportdhe_cipher_list+=":${TLS_CIPHER_OSSL_NAME[i]}" [[ "${TLS_CIPHER_OSSL_NAME[i]}" != "-" ]] && exportdh_cipher_list+=":${TLS_CIPHER_OSSL_NAME[i]}"
exportdhe_cipher_list_hex+=", ${hexc:2:2},${hexc:7:2}" exportdh_cipher_list_hex+=", ${hexc:2:2},${hexc:7:2}"
fi fi
done done
outln; pr_underline "Weak DH ciphers for run_logjam()"; outln outln; pr_underline "Weak ephemeral DH ciphers for run_logjam()"; outln
outln "exportdhe_cipher_list=\"${exportdhe_cipher_list:1}\"" outln "exportdh_cipher_list=\"${exportdh_cipher_list:1}\""
outln "exportdhe_cipher_list_hex=\"${exportdhe_cipher_list_hex:2}\"" outln "exportdh_cipher_list_hex=\"${exportdh_cipher_list_hex:2}\""
} }
get_dhe_ciphers() { get_dhe_ciphers() {
local -i local -i
local hexc all_dhe_ciphers="" local hexc all_dh_ciphers=""
for (( i=0; i < TLS_NR_CIPHERS; i++ )); do for (( i=0; i < TLS_NR_CIPHERS; i++ )); do
if [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DHE_"* ]] || [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DH_anon_"* ]]; then if [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DHE_"* ]] || [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DH_anon_"* ]]; then
hexc="${TLS_CIPHER_HEXCODE[i]}" hexc="${TLS_CIPHER_HEXCODE[i]}"
all_dhe_ciphers+=", ${hexc:2:2},${hexc:7:2}" all_dh_ciphers+=", ${hexc:2:2},${hexc:7:2}"
fi fi
done done
outln; pr_underline "All DHE ciphers for run_logjam()"; outln outln; pr_underline "All ephemeral DH ciphers for run_logjam()"; outln
outln "all_dhe_ciphers=\"$(tolower "${all_dhe_ciphers:2}")\"" outln "all_dh_ciphers=\"$(tolower "${all_dh_ciphers:2}")\""
} }
get_mapping_file get_mapping_file