Merge pull request #935 from martinsumner/develop-2.9

Filter out ECDH* ciphers

Author: martinsumner

src/riak_core_security.erl

@@ -35,27 +35,18 @@
          get_ciphers/0, set_ciphers/1, print_ciphers/0]).
 
 -define(DEFAULT_CIPHER_LIST,
-"ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256"
-":ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384"
 ":DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256"
 ":DHE-DSS-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384"
 ":ADH-AES256-GCM-SHA384:ADH-AES128-GCM-SHA256"
-":ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256"
-":ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384"
-":ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA"
 ":DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256"
 ":DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA"
-":AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA"
+":AES128-GCM-SHA256:AES256-GCM-SHA384"
 ":SRP-DSS-AES-128-CBC-SHA:SRP-RSA-AES-128-CBC-SHA:DHE-DSS-AES128-SHA"
 ":AECDH-AES128-SHA:SRP-AES-128-CBC-SHA:ADH-AES128-SHA256:ADH-AES128-SHA"
-":ECDH-RSA-AES128-GCM-SHA256:ECDH-ECDSA-AES128-GCM-SHA256"
-":ECDH-RSA-AES128-SHA256:ECDH-ECDSA-AES128-SHA256:ECDH-RSA-AES128-SHA"
-":ECDH-ECDSA-AES128-SHA:AES128-SHA256:AES128-SHA:SRP-DSS-AES-256-CBC-SHA"
+":AES128-SHA256:AES128-SHA:SRP-DSS-AES-256-CBC-SHA"
 ":SRP-RSA-AES-256-CBC-SHA:DHE-DSS-AES256-SHA256:AECDH-AES256-SHA"
 ":SRP-AES-256-CBC-SHA:ADH-AES256-SHA256:ADH-AES256-SHA"
-":ECDH-RSA-AES256-GCM-SHA384:ECDH-ECDSA-AES256-GCM-SHA384"
-":ECDH-RSA-AES256-SHA384:ECDH-ECDSA-AES256-SHA384:ECDH-RSA-AES256-SHA"
-":ECDH-ECDSA-AES256-SHA:AES256-SHA256:AES256-SHA:RC4-SHA"
+":AES256-SHA256:AES256-SHA:RC4-SHA"
 ":DHE-RSA-CAMELLIA256-SHA:DHE-DSS-CAMELLIA256-SHA:ADH-CAMELLIA256-SHA"
 ":CAMELLIA256-SHA:DHE-RSA-CAMELLIA128-SHA:DHE-DSS-CAMELLIA128-SHA"
 ":ADH-CAMELLIA128-SHA:CAMELLIA128-SHA").