diff options
author | Péter Dimitrov <[email protected]> | 2019-04-24 16:48:06 +0200 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2019-04-24 16:48:06 +0200 |
commit | 81121941e0d2dbe0967095637d007d4fd9d7f412 (patch) | |
tree | 731de4c3df5ceca942dbe90ee29b8298ec96134f /lib/ssl/src/ssl_cipher_format.erl | |
parent | a21ad3ee86e89ee8a73f6b9279e689eaae80376d (diff) | |
download | otp-81121941e0d2dbe0967095637d007d4fd9d7f412.tar.gz otp-81121941e0d2dbe0967095637d007d4fd9d7f412.tar.bz2 otp-81121941e0d2dbe0967095637d007d4fd9d7f412.zip |
ssl: Enable additional ciphers for TLS 1.3
Enable TLS_CHACHA20_POLY1305_SHA256 and TLS_AES_128_CCM_SHA256.
Change-Id: I04e32bcbf0683bb517f235a3e352facffc674692
Diffstat (limited to 'lib/ssl/src/ssl_cipher_format.erl')
-rw-r--r-- | lib/ssl/src/ssl_cipher_format.erl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/ssl/src/ssl_cipher_format.erl b/lib/ssl/src/ssl_cipher_format.erl index 887eb6c653..577156a4b5 100644 --- a/lib/ssl/src/ssl_cipher_format.erl +++ b/lib/ssl/src/ssl_cipher_format.erl @@ -955,12 +955,12 @@ suite_bin_to_map(?TLS_CHACHA20_POLY1305_SHA256) -> #{key_exchange => any, cipher => chacha20_poly1305, mac => aead, - prf => sha256}. -%% suite_bin_to_map(?TLS_AES_128_CCM_SHA256) -> -%% #{key_exchange => any, -%% cipher => aes_128_ccm, -%% mac => aead -%% prf => sha256}; + prf => sha256}; +suite_bin_to_map(?TLS_AES_128_CCM_SHA256) -> + #{key_exchange => any, + cipher => aes_128_ccm, + mac => aead, + prf => sha256}. %% suite_bin_to_map(?TLS_AES_128_CCM_8_SHA256) -> %% #{key_exchange => any, %% cipher => aes_128_ccm_8, @@ -1690,12 +1690,12 @@ suite_map_to_bin(#{key_exchange := any, cipher := chacha20_poly1305, mac := aead, prf := sha256}) -> - ?TLS_CHACHA20_POLY1305_SHA256. -%% suite_map_to_bin(#{key_exchange := any, -%% cipher := aes_128_ccm, -%% mac := aead, -%% prf := sha256}) -> -%% ?TLS_AES_128_CCM_SHA256; + ?TLS_CHACHA20_POLY1305_SHA256; +suite_map_to_bin(#{key_exchange := any, + cipher := aes_128_ccm, + mac := aead, + prf := sha256}) -> + ?TLS_AES_128_CCM_SHA256. %% suite_map_to_bin(#{key_exchange := any, %% cipher := aes_128_ccm_8, %% mac := aead, |