From 81121941e0d2dbe0967095637d007d4fd9d7f412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 24 Apr 2019 16:48:06 +0200
Subject: ssl: Enable additional ciphers for TLS 1.3

Enable TLS_CHACHA20_POLY1305_SHA256 and TLS_AES_128_CCM_SHA256.

Change-Id: I04e32bcbf0683bb517f235a3e352facffc674692
---
 lib/ssl/src/ssl_cipher_format.erl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/ssl/src/ssl_cipher_format.erl')

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,
-- 
cgit v1.2.3