commit e8dd7097c33f2420ea408e6f6106f615d7deb45d
author TRodziewicz <tomasz.rodziewicz@mobica.com> Wed May 12 14:19:11 2021 +0200
committer TRodziewicz <tomasz.rodziewicz@mobica.com> Wed May 26 13:19:08 2021 +0200
tree 121051cb11d1d3639e577a507bde94c56c068daa
parent b7abba28e3e9ad5a82df07823700b47acfeb4912

Combine MBEDTLS_SSL_<CID-TLS1_3>_PADDING_GRANULARITY options

Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 1f1de2b..73ffdef 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -164,7 +164,7 @@
 #endif
 
 #if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
-#define MBEDTLS_SSL_MAX_CID_EXPANSION      MBEDTLS_SSL_CID_PADDING_GRANULARITY
+#define MBEDTLS_SSL_MAX_CID_EXPANSION      MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY
 #else
 #define MBEDTLS_SSL_MAX_CID_EXPANSION        0
 #endif

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index a75b919..d62df20 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -579,7 +579,7 @@
     {
         size_t padding =
             ssl_compute_padding_length( rec->data_len,
-                                        MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY );
+                                        MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY );
         if( ssl_build_inner_plaintext( data,
                                        &rec->data_len,
                                        post_avail,
@@ -605,7 +605,7 @@
     {
         size_t padding =
             ssl_compute_padding_length( rec->data_len,
-                                        MBEDTLS_SSL_CID_PADDING_GRANULARITY );
+                                        MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY );
         /*
          * Wrap plaintext into DTLSInnerPlaintext structure.
          * See ssl_build_inner_plaintext() for more information.