diff options
| author | Michael Klishin <michael@novemberain.com> | 2019-01-01 02:31:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-01 02:31:37 +0300 |
| commit | 3e35edaee37f8faa2def517d4046944f95621480 (patch) | |
| tree | baab204c7a628ae90ed6231d1ab1f11adb696049 | |
| parent | 655934d4ad9df0808c218571bb823904413faf48 (diff) | |
| parent | b25381a3f1089500d2bdb5d14289aced767cf057 (diff) | |
| download | rabbitmq-server-git-3e35edaee37f8faa2def517d4046944f95621480.tar.gz | |
Merge pull request #1815 from rabbitmq/rabbitmq-server-1814
Honor cipher suite order in rabbitmq.conf
| -rw-r--r-- | priv/schema/rabbit.schema | 2 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 5c6078a413..8e5c6164c9 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -258,7 +258,7 @@ end}. {translation, "rabbit.ssl_options.ciphers", fun(Conf) -> Settings = cuttlefish_variable:filter_by_prefix("ssl_options.ciphers", Conf), - [V || {_, V} <- Settings] + lists:reverse([V || {_, V} <- Settings]) end}. %% =========================================================================== diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index b318adaa12..50ca777aa8 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -326,15 +326,15 @@ tcp_listen_options.exit_on_close = false", {ssl_options, [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {ciphers, [ - "DHE-RSA-AES256-GCM-SHA384", + "ECDHE-ECDSA-AES256-GCM-SHA384", + "ECDHE-RSA-AES256-GCM-SHA384", + "ECDHE-ECDSA-AES256-SHA384", + "ECDHE-RSA-AES256-SHA384", "ECDH-ECDSA-AES256-GCM-SHA384", - "ECDH-ECDSA-AES256-SHA384", "ECDH-RSA-AES256-GCM-SHA384", + "ECDH-ECDSA-AES256-SHA384", "ECDH-RSA-AES256-SHA384", - "ECDHE-ECDSA-AES256-GCM-SHA384", - "ECDHE-ECDSA-AES256-SHA384", - "ECDHE-RSA-AES256-GCM-SHA384", - "ECDHE-RSA-AES256-SHA384" + "DHE-RSA-AES256-GCM-SHA384" ]}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, |