aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2010-05-21 13:07:38 +0000
committerErlang/OTP <otp@erlang.org>2010-05-21 13:07:38 +0000
commitec2d4ef8f89b7bdfb5a8f90cb6cabd9b9b4b9852 (patch)
treef14a32fc58b4e8cf0d816d9e69cdb438b94d1804 /lib
parentdffa53a832ff1e9b2c536d3a04b594fb8e759466 (diff)
downloadotp-ec2d4ef8f89b7bdfb5a8f90cb6cabd9b9b4b9852.tar.gz
otp-ec2d4ef8f89b7bdfb5a8f90cb6cabd9b9b4b9852.tar.bz2
otp-ec2d4ef8f89b7bdfb5a8f90cb6cabd9b9b4b9852.zip
Decision not to support export cipher suites.
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/src/ssl.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 95cd92ee60..185a1f755a 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -718,7 +718,10 @@ emulated_options([], Inet,Emulated) ->
cipher_suites(Version, []) ->
ssl_cipher:suites(Version);
-cipher_suites(Version, [{_,_,_,_}| _] = Ciphers0) ->
+cipher_suites(Version, [{_,_,_,_}| _] = Ciphers0) -> %% Backwards compatibility
+ Ciphers = [{KeyExchange, Cipher, Hash} || {KeyExchange, Cipher, Hash, _} <- Ciphers0],
+ cipher_suites(Version, Ciphers);
+cipher_suites(Version, [{_,_,_}| _] = Ciphers0) ->
Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
cipher_suites(Version, Ciphers);
cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->