diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-09-14 15:21:40 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-09-14 15:21:40 +0100 |
| commit | 4e517eae89a3ecfd2b7017b714afaf1c8b5f4969 (patch) | |
| tree | a950b75f13d0471ac4c15a6d5d72fb20ea7ae020 /src | |
| parent | 745aaacbdb058f8fd164baf2a25fe49b7dd7ce34 (diff) | |
| parent | 19f462bf66c64ac1f7e2fc2bd5dadade272aade8 (diff) | |
| download | rabbitmq-server-git-4e517eae89a3ecfd2b7017b714afaf1c8b5f4969.tar.gz | |
Merged bug21528 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_networking.erl | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 08272afed4..da4eb66aee 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -46,6 +46,8 @@ -include("rabbit.hrl"). -include_lib("kernel/include/inet.hrl"). +-include_lib("ssl/src/ssl_record.hrl"). + -define(RABBIT_TCP_OPTS, [ binary, @@ -116,7 +118,26 @@ boot_ssl() -> end} | SslOptsConfig] end, - [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners], + % In R13B04 and R14A (at least), rc4 is incorrectly implemented. + CipherSuites = proplists:get_value(ciphers, + SslOpts, + ssl:cipher_suites()), + FilteredCipherSuites = + [C || C <- CipherSuites, + begin + SuiteCode = + if is_tuple(C) -> ssl_cipher:suite(C); + is_list(C) -> ssl_cipher:openssl_suite(C) + end, + SP = ssl_cipher:security_parameters( + SuiteCode, + #security_parameters{}), + SP#security_parameters.bulk_cipher_algorithm =/= ?RC4 + end], + SslOpts1 = [{ciphers, FilteredCipherSuites} + | [{K, V} || {K, V} <- SslOpts, K =/= ciphers]], + [start_ssl_listener(Host, Port, SslOpts1) + || {Host, Port} <- SslListeners], ok end. |