commit b9ec44fcf6cb07f293b6ec967587c33b455831eb
author Hanno Becker <hanno.becker@arm.com> Mon May 13 15:31:17 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Mon Jun 03 16:07:50 2019 +0100
tree 2f86151be81a7424d49e8f51d9c6856b2bda0b22
parent ddf775a97fb94df4c0d95c4e7864ec1bfe4098dd

Remove restriction on value of MBEDTLS_SSL_CID_PADDING_GRANULARITY

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d16ce01..428bab7 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -2013,9 +2013,9 @@
                                           uint8_t rec_type )
 {
     size_t len = *content_size;
-
-    /* MBEDTLS_SSL_CID_PADDING_GRANULARITY must be a power of 2. */
-    size_t pad = ~len & ( MBEDTLS_SSL_CID_PADDING_GRANULARITY - 1 );
+    size_t pad = ( MBEDTLS_SSL_CID_PADDING_GRANULARITY -
+                   ( len + 1 ) % MBEDTLS_SSL_CID_PADDING_GRANULARITY ) %
+        MBEDTLS_SSL_CID_PADDING_GRANULARITY;
 
     /* Write real content type */
     if( remaining == 0 )