diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-04-01 10:56:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-04-01 10:56:58 +0200 |
| commit | d7a825fdf0fc63cff67bd35d35c1a6de7c533e55 (patch) | |
| tree | 429b4f30fb55c5f7aa189af550c00f6963057d17 /lib/ssl/src/ssl.erl | |
| parent | 21244ed800dcad2436c7b0c605f9173a376ac789 (diff) | |
| parent | 44c041847fa75d73f54fb5e45649db690126a3ee (diff) | |
| download | otp-d7a825fdf0fc63cff67bd35d35c1a6de7c533e55.tar.gz otp-d7a825fdf0fc63cff67bd35d35c1a6de7c533e55.tar.bz2 otp-d7a825fdf0fc63cff67bd35d35c1a6de7c533e55.zip | |
Merge branch 'ingela/ssl/AES-CCM/OTP-15626'
* ingela/ssl/AES-CCM/OTP-15626:
ssl: Adapt DTLS code to optimizations
ssl: Add support AES_CCM cipher suites form RFC 6655
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index c7c96370b3..8807c575b1 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -112,6 +112,10 @@ aes_256_cbc | aes_128_gcm | aes_256_gcm | + aes_128_ccm | + aes_256_ccm | + aes_128_ccm_8 | + aes_256_ccm_8 | chacha20_poly1305 | legacy_cipher(). -type legacy_cipher() :: rc4_128 | |