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_record.hrl | |
| 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_record.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_record.hrl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl index eb718fd20c..6d4d47cedb 100644 --- a/lib/ssl/src/ssl_record.hrl +++ b/lib/ssl/src/ssl_record.hrl @@ -96,6 +96,11 @@ -define(AES_CBC, 7). -define(AES_GCM, 8). -define(CHACHA20_POLY1305, 9). +%% Following two are not defined in any RFC but we want to have the +%% same type of handling internaly, all of these "bulk_cipher_algorithm" +%% enums are only used internaly anyway. +-define(AES_CCM, 10). +-define(AES_CCM_8, 11). %% CipherType -define(STREAM, 0). |