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

9 files changed, 415 insertions, 85 deletions

diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 30b2ab7c4f..a6943af164 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -193,7 +193,8 @@ next_event(StateName, no_record,
 	    %% TODO maybe buffer later epoch
             next_event(StateName, no_record, State, Actions); 
 	{#alert{} = Alert, State} ->
-	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
+            Version = State#state.connection_env#connection_env.negotiated_version,
+            handle_own_alert(Alert, Version, StateName, State)
     end;
 next_event(connection = StateName, Record,
 	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
@@ -233,7 +234,8 @@ next_event(StateName, Record,
 	    %% TODO maybe buffer later epoch
             next_event(StateName, no_record, State0, Actions); 
 	#alert{} = Alert ->
-	    {next_state, StateName, State0, [{next_event, internal, Alert} | Actions]}
+	    Version = State0#state.connection_env#connection_env.negotiated_version,
+            handle_own_alert(Alert, Version, StateName, State0)
     end.
 
 %%% DTLS record protocol level application data messages 
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 |
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index fe8736d2df..97878431a6 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -35,7 +35,7 @@
 -include_lib("public_key/include/public_key.hrl").
 
 -export([security_parameters/2, security_parameters/3, security_parameters_1_3/2,
-	 cipher_init/3, nonce_seed/2, decipher/6, cipher/5, aead_encrypt/5, aead_decrypt/6,
+	 cipher_init/3, nonce_seed/2, decipher/6, cipher/5, aead_encrypt/6, aead_decrypt/6,
 	 suites/1, all_suites/1,  crypto_support_filters/0,
 	 chacha_suites/1, anonymous_suites/1, psk_suites/1, psk_suites_anon/1, 
          srp_suites/0, srp_suites_anon/0,
@@ -106,9 +106,13 @@ security_parameters_1_3(SecParams, CipherSuite) ->
 cipher_init(?RC4, IV, Key) ->
     State = crypto:stream_init(rc4, Key),
     #cipher_state{iv = IV, key = Key, state = State};
-cipher_init(?AES_GCM, IV, Key) ->
+cipher_init(Type, IV, Key) when Type == ?AES_GCM;
+                                Type == ?AES_CCM ->
     <<Nonce:64>> = random_bytes(8),
     #cipher_state{iv = IV, key = Key, nonce = Nonce, tag_len = 16};
+cipher_init(?AES_CCM_8, IV, Key) ->
+    <<Nonce:64>> = random_bytes(8),
+    #cipher_state{iv = IV, key = Key, nonce = Nonce, tag_len = 8};
 cipher_init(?CHACHA20_POLY1305, IV, Key) ->
     #cipher_state{iv = IV, key = Key, tag_len = 16};
 cipher_init(_BCA, IV, Key) ->
@@ -148,14 +152,18 @@ cipher(?AES_CBC, CipherState, Mac, Fragment, Version) ->
 			 crypto:block_encrypt(aes_cbc256, Key, IV, T)
 		 end, block_size(aes_128_cbc), CipherState, Mac, Fragment, Version).
 
-aead_encrypt(Type, Key, Nonce, Fragment, AdditionalData) ->
-    crypto:block_encrypt(aead_type(Type), Key, Nonce, {AdditionalData, Fragment}).
+aead_encrypt(Type, Key, Nonce, Fragment, AdditionalData, TagLen) ->
+    crypto:block_encrypt(aead_type(Type), Key, Nonce, {AdditionalData, Fragment, TagLen}).
 
 aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AdditionalData) ->
     crypto:block_decrypt(aead_type(Type), Key, Nonce, {AdditionalData, CipherText, CipherTag}).
 
 aead_type(?AES_GCM) ->
     aes_gcm;
+aead_type(?AES_CCM) ->
+    aes_ccm;
+aead_type(?AES_CCM_8) ->
+    aes_ccm;
 aead_type(?CHACHA20_POLY1305) ->
     chacha20_poly1305.
 
@@ -311,8 +319,7 @@ anonymous_suites({254, _} = Version) ->
     dtls_v1:anonymous_suites(Version);
 anonymous_suites(4) ->
     []; %% Raw public key negotiation may be used instead
-anonymous_suites(N)
-  when N >= 3 ->
+anonymous_suites( 3 = N) ->
     psk_suites_anon(N) ++
     [?TLS_DH_anon_WITH_AES_128_GCM_SHA256,
      ?TLS_DH_anon_WITH_AES_256_GCM_SHA384,
@@ -347,8 +354,7 @@ psk_suites({3, N}) ->
     psk_suites(N);
 psk_suites(4) ->
     []; %% TODO Add new PSK, PSK_(EC)DHE suites
-psk_suites(N)
-  when N >= 3 ->
+psk_suites(3) ->
     [
      ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
@@ -369,20 +375,32 @@ psk_suites(_) ->
 %%--------------------------------------------------------------------
 psk_suites_anon({3, N}) ->
     psk_suites_anon(N);
-psk_suites_anon(N)
-  when N >= 3 ->
+psk_suites_anon(3) ->
     [
      ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_PSK_WITH_AES_256_CBC_SHA384,
+     ?TLS_DHE_PSK_WITH_AES_256_CCM,
+     ?TLS_PSK_DHE_WITH_AES_256_CCM_8,
+     ?TLS_PSK_WITH_AES_256_CCM,
+     ?TLS_PSK_WITH_AES_256_CCM_8,
      ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256,
      ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     ?TLS_PSK_WITH_AES_128_CBC_SHA256
+     ?TLS_PSK_WITH_AES_128_CBC_SHA256,
+     ?TLS_DHE_PSK_WITH_AES_128_CCM,
+     ?TLS_PSK_DHE_WITH_AES_128_CCM_8,
+     ?TLS_PSK_WITH_AES_128_CCM,
+     ?TLS_PSK_WITH_AES_128_CCM_8,
+     ?TLS_ECDHE_PSK_WITH_RC4_128_SHA
     ] ++ psk_suites_anon(0);
 psk_suites_anon(_) ->
 	[?TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
@@ -589,7 +607,7 @@ is_acceptable_keyexchange(dhe_rsa, Algos) ->
     proplists:get_bool(dh, Algos) andalso
         proplists:get_bool(rsa, Algos);
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_anon;
-                                                   KeyExchange == ecdhe_psk ->
+                                                   KeyExchange == ecdhe_psk ->        
     proplists:get_bool(ecdh, Algos);
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_ecdsa;
                                                    KeyExchange == ecdhe_ecdsa ->
@@ -629,6 +647,12 @@ is_acceptable_cipher(Cipher, Algos)
   when Cipher == aes_128_gcm;
        Cipher == aes_256_gcm ->
     proplists:get_bool(aes_gcm, Algos);
+is_acceptable_cipher(Cipher, Algos)
+  when Cipher == aes_128_ccm;
+       Cipher == aes_256_ccm;
+       Cipher == aes_128_ccm_8;
+       Cipher == aes_256_ccm_8 ->
+    proplists:get_bool(aes_ccm, Algos);
 is_acceptable_cipher(Cipher, Algos) ->
     proplists:get_bool(Cipher, Algos).
 
@@ -721,6 +745,12 @@ bulk_cipher_algorithm(Cipher) when Cipher == aes_128_cbc;
 bulk_cipher_algorithm(Cipher) when Cipher == aes_128_gcm;
 				   Cipher == aes_256_gcm ->
     ?AES_GCM;
+bulk_cipher_algorithm(Cipher) when Cipher == aes_128_ccm;
+				   Cipher == aes_256_ccm ->
+    ?AES_CCM;
+bulk_cipher_algorithm(Cipher) when Cipher == aes_128_ccm_8;
+				   Cipher == aes_256_ccm_8 ->
+    ?AES_CCM_8;
 bulk_cipher_algorithm(chacha20_poly1305) ->
     ?CHACHA20_POLY1305.
 
@@ -735,6 +765,10 @@ type(Cipher) when Cipher == des_cbc;
     ?BLOCK;
 type(Cipher) when Cipher == aes_128_gcm;
 		  Cipher == aes_256_gcm;
+                  Cipher == aes_128_ccm;
+		  Cipher == aes_256_ccm;
+                  Cipher == aes_128_ccm_8;
+		  Cipher == aes_256_ccm_8;
 		  Cipher == chacha20_poly1305 ->
     ?AEAD.
 
@@ -752,8 +786,16 @@ key_material(aes_256_cbc) ->
     32;
 key_material(aes_128_gcm) ->
     16;
+key_material(aes_128_ccm) ->
+    16;
+key_material(aes_128_ccm_8) ->
+    16;
 key_material(aes_256_gcm) ->
     32;
+key_material(aes_256_ccm_8) ->
+    32;
+key_material(aes_256_ccm) ->
+    32;
 key_material(chacha20_poly1305) ->
     32.
 
@@ -769,6 +811,10 @@ expanded_key_material(Cipher) when Cipher == aes_128_cbc;
 				   Cipher == aes_256_cbc;
 				   Cipher == aes_128_gcm;
 				   Cipher == aes_256_gcm;
+                                   Cipher == aes_128_ccm;
+				   Cipher == aes_256_ccm;
+                                   Cipher == aes_128_ccm_8;
+				   Cipher == aes_256_ccm_8;
 				   Cipher == chacha20_poly1305 ->
     unknown.  
 
@@ -778,12 +824,16 @@ effective_key_bits(des_cbc) ->
     56;
 effective_key_bits(Cipher) when Cipher == rc4_128;
 				Cipher == aes_128_cbc;
-				Cipher == aes_128_gcm ->
+				Cipher == aes_128_gcm;
+                                Cipher == aes_128_ccm;
+                                Cipher == aes_128_ccm_8 ->
     128;
 effective_key_bits('3des_ede_cbc') ->
     168;
 effective_key_bits(Cipher) when Cipher == aes_256_cbc;
 				Cipher == aes_256_gcm;
+				Cipher == aes_256_ccm;
+                                Cipher == aes_256_ccm_8;
 				Cipher == chacha20_poly1305 ->
     256.
 
@@ -792,7 +842,11 @@ iv_size(Cipher) when Cipher == null;
 		     Cipher == chacha20_poly1305->
     0;
 iv_size(Cipher) when Cipher == aes_128_gcm;
-		     Cipher == aes_256_gcm ->
+		     Cipher == aes_256_gcm;
+                     Cipher == aes_128_ccm;
+		     Cipher == aes_256_ccm;
+                     Cipher == aes_128_ccm_8;
+		     Cipher == aes_256_ccm_8 ->
     4;
 iv_size(Cipher) ->
     block_size(Cipher).
@@ -804,6 +858,10 @@ block_size(Cipher) when Cipher == aes_128_cbc;
 			Cipher == aes_256_cbc;
 			Cipher == aes_128_gcm;
 			Cipher == aes_256_gcm;
+                        Cipher == aes_128_ccm;
+			Cipher == aes_256_ccm;
+                        Cipher == aes_128_ccm_8;
+			Cipher == aes_256_ccm_8;
 			Cipher == chacha20_poly1305 ->
     16.
 
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 00822ad9de..5d2f5e2951 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -612,6 +612,58 @@
 %%      TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256     = {0xcc, 0x15}
 -define(TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#15)>>).
 
+
+%% RFC 6655 - TLS-1.2 cipher suites
+
+%% TLS_RSA_WITH_AES_128_CCM      = {0xC0,0x9C}
+-define(TLS_RSA_WITH_AES_128_CCM,   <<?BYTE(16#C0), ?BYTE(16#9C)>>).
+
+%% TLS_RSA_WITH_AES_256_CCM      = {0xC0,0x9D}
+-define(TLS_RSA_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#9D)>>).
+
+%% TLS_DHE_RSA_WITH_AES_256_CCM      = {0xC0,0x9E}
+-define(TLS_DHE_RSA_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#9E)>>).
+
+%% TLS_DHE_RSA_WITH_AES_128_CCM      = {0xC0,0x9F}
+-define(TLS_DHE_RSA_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#9F)>>).
+
+%% TLS_RSA_WITH_AES_256_CCM_8      = {0xC0,0x9A0}
+-define(TLS_RSA_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A0)>>).
+
+%% TLS_RSA_WITH_AES_128_CCM_8      = {0xC0,0xA1}
+-define(TLS_RSA_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A1)>>).
+
+%% TLS_DHE_RSA_WITH_AES_128_CCM_8      = {0xC0,0xA2}
+-define(TLS_DHE_RSA_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A2)>>).
+
+%% TLS_DHE_RSA_WITH_AES_256_CCM_8      = {0xC0,0xA3}
+-define(TLS_DHE_RSA_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A3)>>).
+
+%%  TLS_PSK_WITH_AES_128_CCM       = {0xC0,0xA4}
+-define(TLS_PSK_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#A4)>>).
+
+%% TLS_PSK_WITH_AES_256_CCM       = {0xC0,0xA5)
+-define(TLS_PSK_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#A5)>>).
+
+%% TLS_DHE_PSK_WITH_AES_128_CCM   = {0xC0,0xA6}
+-define(TLS_DHE_PSK_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#A6)>>).
+
+%% TLS_DHE_PSK_WITH_AES_256_CCM   = {0xC0,0xA7}
+-define(TLS_DHE_PSK_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#A7)>>).
+
+%% TLS_PSK_WITH_AES_128_CCM_8     = {0xC0,0xA8}
+-define(TLS_PSK_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A8)>>).
+
+%%  TLS_PSK_WITH_AES_256_CCM_8     = {0xC0,0xA9)
+-define(TLS_PSK_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A9)>>).
+
+%% TLS_PSK_DHE_WITH_AES_128_CCM_8 = {0xC0,0xAA}
+-define(TLS_PSK_DHE_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#AA)>>).
+
+%% TLS_PSK_DHE_WITH_AES_256_CCM_8 = << ?BYTE(0xC0,0xAB}
+-define(TLS_PSK_DHE_WITH_AES_256_CCM_8, <<?BYTE(16#C0),?BYTE(16#AB)>>).
+
+
 %%% TLS 1.3 cipher suites RFC8446
 
 %% TLS_AES_128_GCM_SHA256       = {0x13,0x01}
diff --git a/lib/ssl/src/ssl_cipher_format.erl b/lib/ssl/src/ssl_cipher_format.erl
index b592295d56..8737181922 100644
--- a/lib/ssl/src/ssl_cipher_format.erl
+++ b/lib/ssl/src/ssl_cipher_format.erl
@@ -467,16 +467,16 @@ suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384) ->
       cipher => aes_256_gcm, 
       mac => null, 
       prf => sha384};
-%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
-%%     #{key_exchange => ecdhe_psk, 
-%%       cipher => aes_128_ccm, 
-%%       mac => null, 
-%%       prf =>sha256};
-%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
-%%     #{key_exchange => ecdhe_psk, 
-%%       cipher => aes_256_ccm, 
-%%       mac => null, 
-%%       prf => sha256};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
+     #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_ccm, 
+       mac => null, 
+       prf =>sha256};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_ccm_8, 
+      mac => null, 
+      prf =>sha256};
 %%% SRP Cipher Suites RFC 5054
 suite_definition(?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => srp_anon, 
@@ -792,7 +792,53 @@ suite_definition(?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384) ->
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-%% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
+suite_definition(?TLS_PSK_WITH_AES_128_CCM) ->
+    #{key_exchange => psk,
+      cipher => aes_128_ccm,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_PSK_WITH_AES_256_CCM) -> 
+    #{key_exchange => psk,
+      cipher => aes_256_ccm,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_DHE_PSK_WITH_AES_128_CCM) ->
+    #{key_exchange => dhe_psk,
+      cipher => aes_128_ccm,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_DHE_PSK_WITH_AES_256_CCM) ->
+    #{key_exchange => dhe_psk,
+      cipher => aes_256_ccm,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_PSK_WITH_AES_128_CCM_8) ->
+    #{key_exchange => psk,
+      cipher => aes_128_ccm_8,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_PSK_WITH_AES_256_CCM_8) ->
+    #{key_exchange => psk,
+      cipher => aes_256_ccm_8,
+      mac => aead,
+      prf => sha256};
+suite_definition(?TLS_PSK_DHE_WITH_AES_128_CCM_8) ->
+  #{key_exchange => dhe_psk,
+    cipher => aes_128_ccm_8,
+    mac => aead,
+    prf => sha256};
+suite_definition(?TLS_PSK_DHE_WITH_AES_256_CCM_8) ->
+  #{key_exchange => dhe_psk,
+    cipher => aes_256_ccm_8,
+    mac => aead,
+    prf => sha256};
+suite_definition(#{key_exchange := psk_dhe,
+                   cipher := aes_256_ccm_8,
+                   mac := aead,
+                   prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_256_CCM_8;
+
+% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
 suite_definition(?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => chacha20_poly1305, 
@@ -825,16 +871,15 @@ suite_definition(?TLS_CHACHA20_POLY1305_SHA256) ->
       mac => aead,
       prf => sha256}.
 %% suite_definition(?TLS_AES_128_CCM_SHA256) ->
-%%     #{key_exchange => any,
-%%       cipher => aes_128_ccm,
-%%       mac => aead,
-%%       prf => sha256};
+%%      #{key_exchange => any,
+%%        cipher => aes_128_ccm,
+%%        mac => aead,
+%%        prf => sha256};
 %% suite_definition(?TLS_AES_128_CCM_8_SHA256) ->
-%%     #{key_exchange => any,
+%%      #{key_exchange => any,
 %%       cipher => aes_128_ccm_8,
-%%       mac => aead,
-%%       prf => sha256}.
-
+%%        mac => aead,
+%%        prf => sha256}.
 
 %%--------------------------------------------------------------------
 -spec erl_suite_definition(cipher_suite() | internal_erl_cipher_suite()) -> old_erl_cipher_suite().
@@ -1154,16 +1199,16 @@ suite(#{key_exchange := ecdhe_psk,
        mac := null, 
        prf := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384;
- %% suite(#{key_exchange := ecdhe_psk, 
- %%        cipher := aes_128_ccm, 
- %%        mac := null, 
- %%        prf := sha256}) ->
- %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
- %% suite(#{key_exchange := ecdhe_psk, 
- %%         cipher := aes_256_ccm, 
- %%         mac := null, 
- %%         prf := sha256}) ->
- %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_ccm_8, 
+        mac := null, 
+        prf := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_ccm, 
+         mac := null, 
+         prf := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
 %%% SRP Cipher Suites RFC 5054
 suite(#{key_exchange := srp_anon, 
         cipher := '3des_ede_cbc',
@@ -1460,6 +1505,90 @@ suite(#{key_exchange := dhe_rsa,
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
+
+%% RFC 6655 - TLS-1.2 cipher suites
+suite(#{key_exchange := psk,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_128_CCM;
+suite(#{key_exchange := psk,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_256_CCM;
+suite(#{key_exchange := dhe_psk,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_PSK_WITH_AES_128_CCM;
+suite(#{key_exchange := dhe_psk,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_PSK_WITH_AES_256_CCM;
+suite(#{key_exchange := rsa,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_128_CCM;
+suite(#{key_exchange := rsa,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_256_CCM;
+suite(#{key_exchange := dhe_rsa,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_128_CCM;
+suite(#{key_exchange := dhe_rsa,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_256_CCM;
+
+suite(#{key_exchange := psk,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_128_CCM_8;
+suite(#{key_exchange := psk,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_256_CCM_8;
+suite(#{key_exchange := dhe_psk,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_128_CCM_8;
+suite(#{key_exchange := dhe_psk,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_256_CCM_8;
+suite(#{key_exchange := rsa,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_128_CCM_8;
+suite(#{key_exchange := rsa,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_256_CCM_8;
+suite(#{key_exchange := dhe_rsa,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_128_CCM_8;
+suite(#{key_exchange := dhe_rsa,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_256_CCM_8;
+
 %% TLS 1.3 Cipher Suites RFC8446
 suite(#{key_exchange := any,
         cipher := aes_128_gcm,
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 91f1876980..9cc131c3cb 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -471,34 +471,41 @@ initial_security_params(ConnectionEnd) ->
 
 -define(end_additional_data(AAD, Len), << (begin(AAD)end)/binary, ?UINT16(begin(Len)end) >>).
 
-do_cipher_aead(?CHACHA20_POLY1305 = Type, Fragment, #cipher_state{key=Key} = CipherState, AAD0) ->
+do_cipher_aead(?CHACHA20_POLY1305 = Type, Fragment, #cipher_state{key=Key, tag_len = TagLen} = CipherState, AAD0) ->
     AAD = ?end_additional_data(AAD0, erlang:iolist_size(Fragment)),
     Nonce = encrypt_nonce(Type, CipherState),
-    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD),
+    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD, TagLen),
     {<<Content/binary, CipherTag/binary>>, CipherState};
-do_cipher_aead(Type, Fragment, #cipher_state{key=Key, nonce = ExplicitNonce} = CipherState, AAD0) ->
+do_cipher_aead(Type, Fragment, #cipher_state{key=Key, tag_len = TagLen, nonce = ExplicitNonce} = CipherState, AAD0) ->
     AAD = ?end_additional_data(AAD0, erlang:iolist_size(Fragment)),
     Nonce = encrypt_nonce(Type, CipherState),
-    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD),
+    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD, TagLen),
     {<<ExplicitNonce:64/integer, Content/binary, CipherTag/binary>>, CipherState#cipher_state{nonce = ExplicitNonce + 1}}.
 
 encrypt_nonce(?CHACHA20_POLY1305, #cipher_state{nonce = Nonce, iv = IV}) ->
     crypto:exor(<<?UINT32(0), Nonce/binary>>, IV);
-encrypt_nonce(?AES_GCM, #cipher_state{iv = IV, nonce = ExplicitNonce}) ->
+encrypt_nonce(Type, #cipher_state{iv = IV, nonce = ExplicitNonce}) when  Type == ?AES_GCM;
+                                                                         Type == ?AES_CCM;
+                                                                         Type == ?AES_CCM_8 ->
     <<Salt:4/bytes, _/binary>> = IV,
     <<Salt/binary, ExplicitNonce:64/integer>>.
 
 decrypt_nonce(?CHACHA20_POLY1305, #cipher_state{nonce = Nonce, iv = IV}, _) ->
     crypto:exor(<<Nonce:96/unsigned-big-integer>>, IV);
-decrypt_nonce(?AES_GCM, #cipher_state{iv = <<Salt:4/bytes, _/binary>>}, <<ExplicitNonce:8/bytes, _/binary>>) ->   
-     <<Salt/binary, ExplicitNonce/binary>>.
+decrypt_nonce(Type, #cipher_state{iv = <<Salt:4/bytes, _/binary>>}, <<ExplicitNonce:8/bytes, _/binary>>) when 
+      Type == ?AES_GCM; 
+      Type == ?AES_CCM; 
+      Type == ?AES_CCM_8 ->
+    <<Salt/binary, ExplicitNonce/binary>>.
 
 -compile({inline, [aead_ciphertext_split/4]}).
 aead_ciphertext_split(?CHACHA20_POLY1305, #cipher_state{tag_len = Len}, CipherTextFragment, AAD) ->
     CipherLen = byte_size(CipherTextFragment) - Len,
     <<CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment,
     {?end_additional_data(AAD, CipherLen), CipherText, CipherTag};
-aead_ciphertext_split(?AES_GCM,  #cipher_state{tag_len = Len}, CipherTextFragment, AAD) ->
+aead_ciphertext_split(Type,  #cipher_state{tag_len = Len}, CipherTextFragment, AAD) when Type == ?AES_GCM;
+                                                                                         Type == ?AES_CCM;
+                                                                                         Type == ?AES_CCM_8 ->
     CipherLen = byte_size(CipherTextFragment) - (Len + 8), %% 8 is length of explicit Nonce
     << _:8/bytes, CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment,
     {?end_additional_data(AAD, CipherLen), CipherText, CipherTag}.
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).
diff --git a/lib/ssl/src/tls_record_1_3.erl b/lib/ssl/src/tls_record_1_3.erl
index 97331e1510..74321a1ae2 100644
--- a/lib/ssl/src/tls_record_1_3.erl
+++ b/lib/ssl/src/tls_record_1_3.erl
@@ -252,7 +252,7 @@ cipher_aead(Fragment, BulkCipherAlgo, Key, Seq, IV, TagLen) ->
     AAD = additional_data(erlang:iolist_size(Fragment) + TagLen),
     Nonce = nonce(Seq, IV),
     {Content, CipherTag} =
-        ssl_cipher:aead_encrypt(BulkCipherAlgo, Key, Nonce, Fragment, AAD),
+        ssl_cipher:aead_encrypt(BulkCipherAlgo, Key, Nonce, Fragment, AAD, TagLen),
     <<Content/binary, CipherTag/binary>>.
 
 encode_tls_cipher_text(#tls_cipher_text{opaque_type = Type,
diff --git a/lib/ssl/test/ssl_cipher_suite_SUITE.erl b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
index 3a23293e26..bf1bc0e752 100644
--- a/lib/ssl/test/ssl_cipher_suite_SUITE.erl
+++ b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
@@ -85,11 +85,7 @@ groups() ->
      {rsa_psk, [], [rsa_psk_3des_ede_cbc,                    
                     rsa_psk_rc4_128,
                     rsa_psk_aes_128_cbc,
-                    %% rsa_psk_aes_128_ccm,
-                    %% rsa_psk_aes_128_ccm_8,
                     rsa_psk_aes_256_cbc
-                    %% rsa_psk_aes_256_ccm,
-                    %% rsa_psk_aes_256_ccm_8
                    ]},
      {dh_anon, [], [dh_anon_rc4_128,
                     dh_anon_3des_ede_cbc, 
@@ -101,26 +97,33 @@ groups() ->
                       ecdh_anon_aes_128_cbc,
                       ecdh_anon_aes_256_cbc
                      ]},     
-     {srp, [], [srp_3des_ede_cbc, 
-                srp_aes_128_cbc,
-                srp_aes_256_cbc]},
+     {srp_anon, [], [srp_anon_3des_ede_cbc, 
+                     srp_anon_aes_128_cbc,
+                     srp_anon_aes_256_cbc]},
      {psk, [], [psk_3des_ede_cbc,                    
                 psk_rc4_128,
                 psk_aes_128_cbc,
-                %% psk_aes_128_ccm,
-                %% psk_aes_128_ccm_8,
-                psk_aes_256_cbc
-                %% psk_aes_256_ccm,
-                %% psk_aes_256_ccm_8
+                psk_aes_128_ccm,
+                psk_aes_128_ccm_8,
+                psk_aes_256_cbc,
+                psk_aes_256_ccm,
+                psk_aes_256_ccm_8
                ]},
      {dhe_psk, [], [dhe_psk_3des_ede_cbc,                    
                     dhe_psk_rc4_128,
                     dhe_psk_aes_128_cbc,
-                    %% dhe_psk_aes_128_ccm,
-                    %% dhe_psk_aes_128_ccm_8,
-                    dhe_psk_aes_256_cbc
-                    %% dhe_psk_aes_256_ccm,
-                    %% dhe_psk_aes_256_ccm_8
+                    dhe_psk_aes_128_ccm,
+                    dhe_psk_aes_128_ccm_8,
+                    dhe_psk_aes_256_cbc,
+                    dhe_psk_aes_256_ccm,
+                    dhe_psk_aes_256_ccm_8
+               ]},
+     {ecdhe_psk, [], [ecdhe_psk_3des_ede_cbc,                    
+                     ecdhe_psk_rc4_128,
+                     ecdhe_psk_aes_128_cbc,
+                     ecdhe_psk_aes_128_ccm,
+                     ecdhe_psk_aes_128_ccm_8,
+                     ecdhe_psk_aes_256_cbc
                ]}
     ].
 
@@ -148,7 +151,8 @@ anonymous() ->
      {group, ecdh_anon},
      {group, psk},
      {group, dhe_psk},
-     {group, srp}
+     {group, ecdhe_psk},
+     {group, srp_anon}
     ].
     
 
@@ -169,8 +173,16 @@ end_per_suite(_Config) ->
 %%--------------------------------------------------------------------
 init_per_group(GroupName, Config) when GroupName == ecdh_anon;
                                        GroupName == ecdhe_rsa;
-                                       GroupName == ecdhe_ecdsa ->
-    case ssl_test_lib:sufficient_crypto_support(ec_cipher) of
+                                       GroupName == ecdhe_psk ->
+    case proplists:get_bool(ecdh, proplists:get_value(public_keys, crypto:supports())) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(ecdhe_ecdsa = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(ecdh, PKAlg) andalso lists:member(ecdsa, PKAlg) of
         true ->
             init_certs(GroupName, Config);
         false ->
@@ -192,7 +204,7 @@ init_per_group(srp_dss = GroupName, Config) ->
         false ->
             {skip, "Missing DSS_SRP crypto support"}
     end;
-init_per_group(GroupName, Config) when GroupName == srp;
+init_per_group(GroupName, Config) when GroupName == srp_anon;
                                        GroupName == srp_rsa ->
     PKAlg = proplists:get_value(public_keys, crypto:supports()),
     case lists:member(srp, PKAlg) of
@@ -225,15 +237,17 @@ end_per_group(GroupName, Config) ->
           Config
   end.
 init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc;
-                                         TestCase == srp_3des_ede_cbc;
+                                         TestCase == srp_anon_3des_ede_cbc;
                                          TestCase == dhe_psk_3des_ede_cbc;
+                                         TestCase == ecdhe_psk_3des_ede_cbc;
                                          TestCase == srp_rsa_3des_ede_cbc;
+                                         TestCase == srp_dss_3des_ede_cbc;
                                          TestCase == rsa_psk_3des_ede_cbc;
                                          TestCase == rsa_3des_ede_cbc;
                                          TestCase == dhe_rsa_3des_ede_cbc;
                                          TestCase == dhe_dss_3des_ede_cbc;
                                          TestCase == ecdhe_rsa_3des_ede_cbc;
-                                         TestCase == srp_dss_3des_ede_cbc;
+                                         TestCase == srp_anon_dss_3des_ede_cbc;
                                          TestCase == dh_anon_3des_ede_cbc;
                                          TestCase == ecdh_anon_3des_ede_cbc;
                                          TestCase == ecdhe_ecdsa_3des_ede_cbc ->
@@ -246,6 +260,7 @@ init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc;
             {skip, "Missing 3DES crypto support"}
     end;
 init_per_testcase(TestCase, Config) when TestCase == psk_rc4_128;
+                                         TestCase == ecdhe_psk_rc4_128;
                                          TestCase == dhe_psk_rc4_128;
                                          TestCase == rsa_psk_rc4_128;
                                          TestCase == rsa_rc4_128;
@@ -260,7 +275,33 @@ init_per_testcase(TestCase, Config) when TestCase == psk_rc4_128;
         _ ->
             {skip, "Missing RC4 crypto support"}
     end;
-init_per_testcase(TestCase, Config)  ->
+init_per_testcase(TestCase, Config) when  TestCase == psk_aes_128_ccm_8;
+                                          TestCase == rsa_psk_aes_128_ccm_8;
+                                          TestCase == psk_aes_128_ccm_8;
+                                          TestCase == dhe_psk_aes_128_ccm_8;
+                                          TestCase == ecdhe_psk_aes_128_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_128_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_128_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when TestCase == psk_aes_256_ccm_8;
+                                         TestCase == rsa_psk_aes_256_ccm_8;
+                                         TestCase == psk_aes_256_ccm_8;
+                                         TestCase == dhe_psk_aes_256_ccm_8;
+                                         TestCase == ecdhe_psk_aes_256_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_256_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_256_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) ->
     Cipher = test_cipher(TestCase, Config),
     %%Reason = io_lib:format("Missing ~p crypto support", [Cipher]),
     SupCiphers = proplists:get_value(ciphers, crypto:supports()),
@@ -284,6 +325,10 @@ init_certs(srp_rsa, Config) ->
     [{tls_config, #{server_config => [{user_lookup_fun, {fun user_lookup/3, undefined}} | ServerOpts],
                     client_config => [{srp_identity, {"Test-User", "secret"}} | ClientOpts]}} |
      proplists:delete(tls_config, Config)];
+init_certs(srp_anon, Config) ->
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun user_lookup/3, undefined}}],
+                    client_config => [{srp_identity, {"Test-User", "secret"}}]}} |
+     proplists:delete(tls_config, Config)];
 init_certs(rsa_psk, Config) ->
     ClientExt = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]),
     {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, 
@@ -341,7 +386,8 @@ init_certs(GroupName, Config) when GroupName == dhe_ecdsa;
                     client_config => ClientOpts}} |
      proplists:delete(tls_config, Config)];
 init_certs(GroupName, Config) when GroupName == psk;
-                                   GroupName == dhe_psk ->
+                                   GroupName == dhe_psk;
+                                   GroupName == ecdhe_psk ->
     PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
     [{tls_config, #{server_config => [{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}],
                     client_config => [{psk_identity, "Test-User"},
@@ -549,14 +595,14 @@ ecdh_anon_aes_128_cbc(Config) when is_list(Config) ->
 ecdh_anon_aes_256_cbc(Config) when is_list(Config) ->
     run_ciphers_test(ecdh_anon, 'aes_256_cbc', Config).   
 
-srp_3des_ede_cbc(Config) when is_list(Config) ->
-    run_ciphers_test(srp, '3des_ede_cbc', Config).                 
+srp_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_anon, '3des_ede_cbc', Config).                 
     
-srp_aes_128_cbc(Config) when is_list(Config) ->
-   run_ciphers_test(srp, 'aes_128_cbc', Config).             
+srp_anon_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_128_cbc', Config).             
 
-srp_aes_256_cbc(Config) when is_list(Config) ->
-   run_ciphers_test(srp, 'aes_256_cbc', Config).     
+srp_anon_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_256_cbc', Config).     
 
 dhe_psk_des_cbc(Config) when is_list(Config) ->
     run_ciphers_test(dhe_psk, 'des_cbc', Config).            
@@ -591,6 +637,33 @@ dhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
 dhe_psk_aes_256_ccm_8(Config) when is_list(Config) ->
     run_ciphers_test(dhe_psk, 'aes_256_ccm_8', Config).
 
+ecdhe_psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'des_cbc', Config).            
+
+ecdhe_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'rc4_128', Config).            
+
+ecdhe_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, '3des_ede_cbc', Config).            
+
+ecdhe_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_cbc', Config).             
+
+ecdhe_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_cbc', Config).
+
+ecdhe_psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_gcm', Config).             
+
+ecdhe_psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_gcm', Config).
+
+ecdhe_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm', Config).             
+
+ecdhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm_8', Config).
+
 psk_des_cbc(Config) when is_list(Config) ->
     run_ciphers_test(psk, 'des_cbc', Config).