From c09a77006ec30e6abdfb827d624473050972bdeb Mon Sep 17 00:00:00 2001
From: David Cooper <dcooper16@gmail.com>
Date: Tue, 24 Jan 2017 10:49:59 -0500
Subject: [PATCH] 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.
---
 utils/generate_static_cipher_lists.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/utils/generate_static_cipher_lists.sh b/utils/generate_static_cipher_lists.sh
index f2b5fe2..45f2e1b 100644
--- a/utils/generate_static_cipher_lists.sh
+++ b/utils/generate_static_cipher_lists.sh
@@ -309,34 +309,34 @@ get_export_rsa_ciphers() {
 
 get_weak_dh_ciphers() {
      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
           if [[ "${TLS_CIPHER_RFC_NAME[i]}" == "TLS_DHE_"* ]] && [[ "${TLS_CIPHER_EXPORT[i]}" == "export" ]]; then
                hexc="${TLS_CIPHER_HEXCODE[i]}"
-               [[ "${TLS_CIPHER_OSSL_NAME[i]}" != "-" ]] && exportdhe_cipher_list+=":${TLS_CIPHER_OSSL_NAME[i]}"
-               exportdhe_cipher_list_hex+=", ${hexc:2:2},${hexc:7:2}"
+               [[ "${TLS_CIPHER_OSSL_NAME[i]}" != "-" ]] && exportdh_cipher_list+=":${TLS_CIPHER_OSSL_NAME[i]}"
+               exportdh_cipher_list_hex+=", ${hexc:2:2},${hexc:7:2}"
           fi
      done
 
-     outln; pr_underline "Weak DH ciphers for run_logjam()"; outln
-     outln "exportdhe_cipher_list=\"${exportdhe_cipher_list:1}\""
-     outln "exportdhe_cipher_list_hex=\"${exportdhe_cipher_list_hex:2}\""
+     outln; pr_underline "Weak ephemeral DH ciphers for run_logjam()"; outln
+     outln "exportdh_cipher_list=\"${exportdh_cipher_list:1}\""
+     outln "exportdh_cipher_list_hex=\"${exportdh_cipher_list_hex:2}\""
 }
 
 get_dhe_ciphers() {
      local -i
-     local hexc all_dhe_ciphers=""
+     local hexc all_dh_ciphers=""
 
      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
                hexc="${TLS_CIPHER_HEXCODE[i]}"
-               all_dhe_ciphers+=", ${hexc:2:2},${hexc:7:2}"
+               all_dh_ciphers+=", ${hexc:2:2},${hexc:7:2}"
           fi
      done
 
-     outln; pr_underline "All DHE ciphers for run_logjam()"; outln
-     outln "all_dhe_ciphers=\"$(tolower "${all_dhe_ciphers:2}")\""
+     outln; pr_underline "All ephemeral DH ciphers for run_logjam()"; outln
+     outln "all_dh_ciphers=\"$(tolower "${all_dh_ciphers:2}")\""
 }
 
 get_mapping_file