commit 49c8eb3a5a11b9ce1b61e7bf32daf87fc1a3407e
author Gabor Mezei <gabor.mezei@arm.com> Thu Mar 10 16:13:17 2022 +0100
committer Gabor Mezei <gabor.mezei@arm.com> Thu Mar 10 17:09:59 2022 +0100
tree 7872f0ce6ba9c2a096907295d446a401f68ff2db
parent 2fa1c311cd4ea064d6c4b167986bcf6faf9553eb

Enable chachcapoly cipher for SSL tickets

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

library/ssl_ticket.c

diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index f48831b..ed9c7a5 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -236,7 +236,8 @@
     cipher_info = mbedtls_cipher_info_from_type( cipher );
 
     if( mbedtls_cipher_info_get_mode( cipher_info ) != MBEDTLS_MODE_GCM &&
-        mbedtls_cipher_info_get_mode( cipher_info ) != MBEDTLS_MODE_CCM )
+        mbedtls_cipher_info_get_mode( cipher_info ) != MBEDTLS_MODE_CCM &&
+        mbedtls_cipher_info_get_mode( cipher_info ) != MBEDTLS_MODE_CHACHAPOLY )
     {
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
     }

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 960320a..7b11590 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -3108,6 +3108,21 @@
             -s "a session has been resumed" \
             -c "a session has been resumed"
 
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
+run_test    "Session resume using tickets: CHACHA20-POLY1305" \
+            "$P_SRV debug_level=3 tickets=1 ticket_aead=CHACHA20-POLY1305" \
+            "$P_CLI debug_level=3 tickets=1 reconnect=1" \
+            0 \
+            -c "client hello, adding session ticket extension" \
+            -s "found session ticket extension" \
+            -s "server hello, adding session ticket extension" \
+            -c "found session_ticket extension" \
+            -c "parse new session ticket" \
+            -S "session successfully restored from cache" \
+            -s "session successfully restored from ticket" \
+            -s "a session has been resumed" \
+            -c "a session has been resumed"
+
 # Tests for Session Tickets with DTLS
 
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2