diff options
| author | Erlang/OTP <[email protected]> | 2016-04-26 12:01:02 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-04-26 12:01:02 +0200 |
| commit | 237c335b55d1c18191b0dadde42492a2bea9fd82 (patch) | |
| tree | 22caceec5aa7e0a34015caabe0fd02a65f362918 /lib/ssl/src/ssl.erl | |
| parent | afe72bfc1448ff426c38eceb7412f69e973aef62 (diff) | |
| parent | 0bb95b2ac735ecf01a02de07da22d4a7a9577f36 (diff) | |
| download | otp-237c335b55d1c18191b0dadde42492a2bea9fd82.tar.gz otp-237c335b55d1c18191b0dadde42492a2bea9fd82.tar.bz2 otp-237c335b55d1c18191b0dadde42492a2bea9fd82.zip | |
Merge branch 'ingela/ssl/3-4-tuples-cipher-suites-mix/OTP-13511' into maint-18
* ingela/ssl/3-4-tuples-cipher-suites-mix/OTP-13511:
ssl: Corrections to cipher suite handling
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 780bef5877..effb9338fb 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1089,10 +1089,7 @@ binary_cipher_suites(Version, []) -> %% Defaults to all supported suites that does %% not require explicit configuration ssl_cipher:filter_suites(ssl_cipher:suites(Version)); -binary_cipher_suites(Version, [{_,_,_,_}| _] = Ciphers0) -> %% Backwards compatibility - Ciphers = [{KeyExchange, Cipher, Hash} || {KeyExchange, Cipher, Hash, _} <- Ciphers0], - binary_cipher_suites(Version, Ciphers); -binary_cipher_suites(Version, [{_,_,_}| _] = Ciphers0) -> +binary_cipher_suites(Version, [Tuple|_] = Ciphers0) when is_tuple(Tuple) -> Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0], binary_cipher_suites(Version, Ciphers); |