diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-04-15 22:25:45 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-04-25 12:05:59 +0200 |
| commit | d2381e1a8d7cd54f7dc0a5105d172460b005a8fb (patch) | |
| tree | ed27fe71af988862558f20d72021b805228a5ab9 /lib/ssl/src/ssl.erl | |
| parent | 5f67ca5b3d0c13dfbe936fcfa08621eef00d53cf (diff) | |
| download | otp-d2381e1a8d7cd54f7dc0a5105d172460b005a8fb.tar.gz otp-d2381e1a8d7cd54f7dc0a5105d172460b005a8fb.tar.bz2 otp-d2381e1a8d7cd54f7dc0a5105d172460b005a8fb.zip | |
ssl: Corrections to cipher suite handling
It was not possible to mix ssl 3 and 4 tuple cipher suites in the
ciphers option.
Some ssl_cipher:suite/1 clauses wrongly returned 3-tuples that
should have been 4 tuples
Conflicts:
lib/ssl/test/ssl_basic_SUITE.erl
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 61afdce93c..025e8cea61 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); |