Skip to content

Commit 3e35eda

Browse files
Merge pull request #1815 from rabbitmq/rabbitmq-server-1814
Honor cipher suite order in rabbitmq.conf
2 parents 655934d + b25381a commit 3e35eda

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

priv/schema/rabbit.schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ end}.
258258
{translation, "rabbit.ssl_options.ciphers",
259259
fun(Conf) ->
260260
Settings = cuttlefish_variable:filter_by_prefix("ssl_options.ciphers", Conf),
261-
[V || {_, V} <- Settings]
261+
lists:reverse([V || {_, V} <- Settings])
262262
end}.
263263

264264
%% ===========================================================================

test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,15 +326,15 @@ tcp_listen_options.exit_on_close = false",
326326
{ssl_options,
327327
[{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
328328
{ciphers, [
329-
"DHE-RSA-AES256-GCM-SHA384",
329+
"ECDHE-ECDSA-AES256-GCM-SHA384",
330+
"ECDHE-RSA-AES256-GCM-SHA384",
331+
"ECDHE-ECDSA-AES256-SHA384",
332+
"ECDHE-RSA-AES256-SHA384",
330333
"ECDH-ECDSA-AES256-GCM-SHA384",
331-
"ECDH-ECDSA-AES256-SHA384",
332334
"ECDH-RSA-AES256-GCM-SHA384",
335+
"ECDH-ECDSA-AES256-SHA384",
333336
"ECDH-RSA-AES256-SHA384",
334-
"ECDHE-ECDSA-AES256-GCM-SHA384",
335-
"ECDHE-ECDSA-AES256-SHA384",
336-
"ECDHE-RSA-AES256-GCM-SHA384",
337-
"ECDHE-RSA-AES256-SHA384"
337+
"DHE-RSA-AES256-GCM-SHA384"
338338
]},
339339
{certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
340340
{keyfile,"test/config_schema_SUITE_data/certs/key.pem"},

0 commit comments

Comments
 (0)