diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-09-29 12:07:44 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-09-29 12:07:44 +0100 |
| commit | 9fc7772499ce009ed368c5bda9844f9c839222cc (patch) | |
| tree | cddd3d1379f5eb6ae886e380344046b7dcf92ff6 | |
| parent | 7630d9cca83bac5cfa4605077b83ee0d7670ff50 (diff) | |
| download | rabbitmq-server-bug23308.tar.gz | |
Don't require otp sources for buildbug23308
SSL connections using RC4 on Erlang versions earlier that R14B will now fail.
| -rw-r--r-- | src/rabbit_networking.erl | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index fe5ffccc..db5c71f6 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -46,8 +46,6 @@ -include("rabbit.hrl"). -include_lib("kernel/include/inet.hrl"). --include_lib("ssl/src/ssl_record.hrl"). - -define(RABBIT_TCP_OPTS, [ binary, @@ -120,27 +118,7 @@ boot_ssl() -> end} | SslOptsConfig] end, - % filter that removes RC4 ciphers can be - % removed when at least R14B (SSL 4.0.1) is required - 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], + [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners], ok end. |