aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-05-02 09:05:32 +0200
committerIngela Anderton Andin <[email protected]>2014-05-07 14:36:56 +0200
commit936fefdbab8a9c95da5708d59b7cbc7252bfd968 (patch)
tree21332661a55f15a99aaee33658b03e549012aa17 /lib/ssl/src
parentaca0b6182b039333b4c963938878d9eecc85e5a1 (diff)
downloadotp-936fefdbab8a9c95da5708d59b7cbc7252bfd968.tar.gz
otp-936fefdbab8a9c95da5708d59b7cbc7252bfd968.tar.bz2
otp-936fefdbab8a9c95da5708d59b7cbc7252bfd968.zip
ssl: SSL/TLS version input list shall not be order dependent
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 866312f332..4dea977fe1 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -637,7 +637,8 @@ handle_options(Opts0, _Role) ->
user_lookup_fun = handle_option(user_lookup_fun, Opts, undefined),
psk_identity = handle_option(psk_identity, Opts, undefined),
srp_identity = handle_option(srp_identity, Opts, undefined),
- ciphers = handle_cipher_option(proplists:get_value(ciphers, Opts, []), hd(Versions)),
+ ciphers = handle_cipher_option(proplists:get_value(ciphers, Opts, []),
+ RecordCb:highest_protocol_version(Versions)),
%% Server side option
reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
reuse_sessions = handle_option(reuse_sessions, Opts, true),