commit 550e1662c7f22c33c0c00c41d365aa013dd2b421
author Hanno Becker <hanno.becker@arm.com> Wed May 08 17:37:58 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Mon May 20 15:32:36 2019 +0100
tree 2b5b8d5c5c281ab364ccce59dcb54277ae825a0e
parent 9bf10ea25da1964c3ed0cb9ff261a0f40820bec3

Allow the configuration of padding when using CID extension

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 6711fd2..eb332b8 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1591,7 +1591,9 @@
                                           uint8_t rec_type )
 {
     size_t len = *content_size;
-    size_t pad = ~len & 0xF; /* Pad to a multiple of 16 */
+
+    /* MBEDTLS_SSL_CID_PADDING_GRANULARITY must be a power of 2. */
+    size_t pad = ~len & ( MBEDTLS_SSL_CID_PADDING_GRANULARITY - 1 );
 
     /* Write real content type */
     if( remaining == 0 )