Merge branch '2.9dev' into rename_ephemeral_DH_ciphers

This commit is contained in:
David Cooper 2017-02-03 13:42:04 -05:00
commit e18f5821d2

20
utils/generate_static_cipher_lists.sh Normal file → Executable file
View File

@ -269,6 +269,25 @@ get_cbc_ciphers() {
outln "cbc_cipher_list_hex=\"$(tolower "${cbc_cipher_list_hex:2}")\"" outln "cbc_cipher_list_hex=\"$(tolower "${cbc_cipher_list_hex:2}")\""
} }
get_all_cbc_ciphers() {
local -i
local hexc cbc_ciphers="" cbc_ciphers_hex=""
for (( i=0; i < TLS_NR_CIPHERS; i++ )); do
if [[ "${TLS_CIPHER_SSLVERS[i]}" != "SSLv2" ]] && [[ "${TLS_CIPHER_RFC_NAME[i]}" =~ CBC ]]; then
hexc="${TLS_CIPHER_HEXCODE[i]}"
cbc_ciphers_hex+=", ${hexc:2:2},${hexc:7:2}"
[[ "${TLS_CIPHER_OSSL_NAME[i]}" != "-" ]] && cbc_ciphers+=":${TLS_CIPHER_OSSL_NAME[i]}"
fi
done
outln ; pr_underline "CBC Ciphers for run_lucky13()"; outln
outln "cbc_ciphers=\"${cbc_ciphers:1}\""
outln "cbc_ciphers_hex=\"$(tolower "${cbc_ciphers_hex:2}")\""
}
get_sslv3_tls1_cbc_ciphers() { get_sslv3_tls1_cbc_ciphers() {
local -i local -i
local hexc cbc_ciphers="" cbc_ciphers_hex="" local hexc cbc_ciphers="" cbc_ciphers_hex=""
@ -342,6 +361,7 @@ get_dhe_ciphers() {
get_mapping_file get_mapping_file
get_robust_pfs_ciphers get_robust_pfs_ciphers
get_std_cipherlists get_std_cipherlists
get_all_cbc_ciphers
get_cbc_ciphers get_cbc_ciphers
get_sslv3_tls1_cbc_ciphers get_sslv3_tls1_cbc_ciphers
get_export_rsa_ciphers get_export_rsa_ciphers