diff options
| author | Andreas Schultz <[email protected]> | 2014-05-17 15:01:46 +0200 |
|---|---|---|
| committer | Andreas Schultz <[email protected]> | 2014-09-03 15:26:00 +0200 |
| commit | 867e3974db7c48d147f1c2c54899c2834ad3ee3d (patch) | |
| tree | ab5b3be4a7c181f9fbd4b33f5521e31fcd2c218a /lib/ssl/src/ssl.erl | |
| parent | 5010b791378f4af46176f297888c30ad010a3e83 (diff) | |
| download | otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.tar.gz otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.tar.bz2 otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.zip | |
ssl: implement AES128-GCM suites
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index d741fa63fb..04b31930c5 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -354,7 +354,7 @@ cipher_suites(openssl) -> cipher_suites(all) -> Version = tls_record:highest_protocol_version([]), Supported = ssl_cipher:all_suites(Version) - ++ ssl_cipher:anonymous_suites() + ++ ssl_cipher:anonymous_suites(Version) ++ ssl_cipher:psk_suites(Version) ++ ssl_cipher:srp_suites(), ssl_cipher:filter_suites([suite_definition(S) || S <- Supported]). @@ -947,7 +947,7 @@ binary_cipher_suites(Version, [{_,_,_}| _] = Ciphers0) -> binary_cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) -> All = ssl_cipher:suites(Version) - ++ ssl_cipher:anonymous_suites() + ++ ssl_cipher:anonymous_suites(Version) ++ ssl_cipher:psk_suites(Version) ++ ssl_cipher:srp_suites(), case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, All)] of |