diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-08 10:55:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-08 10:55:24 +0200 |
| commit | eb28a406958f156c9fbae238458d633b2171b41d (patch) | |
| tree | 4a4f6216845de925d941b13e9a18ce87fb9aeaf2 /lib/ssl/src/ssl.erl | |
| parent | 6bf1835ac2d6f4db6c266b2df6167f8a10e95c92 (diff) | |
| parent | 936fefdbab8a9c95da5708d59b7cbc7252bfd968 (diff) | |
| download | otp-eb28a406958f156c9fbae238458d633b2171b41d.tar.gz otp-eb28a406958f156c9fbae238458d633b2171b41d.tar.bz2 otp-eb28a406958f156c9fbae238458d633b2171b41d.zip | |
Merge branch 'ia/ssl/version-ciphers-handling/OTP-11912' into maint
* ia/ssl/version-ciphers-handling/OTP-11912:
ssl: SSL/TLS version input list shall not be order dependent
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 3 |
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), |