commit ceef848eb6e8975d452596f36342b793b1edb947
author Hanno Becker <hanno.becker@arm.com> Tue Jun 02 06:16:00 2020 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Jun 02 06:16:00 2020 +0100
tree 025b45099842fb8474c7e0e823fe895ba89eb3a0
parent 9338f9f7187af0c12a9a7519bf29101f345af7a0

Rename TLS 1.3 padding granularity macro

This is to avoid confusion with the class of macros

MBEDTLS_SSL_PROTO_TLS1_X

which have an underscore between major and minor version number.

Signed-off-by: Hanno Becker <hanno.becker@arm.com>

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 874cfb7..9ba566e 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -3554,7 +3554,7 @@
  */
 //#define MBEDTLS_SSL_CID_PADDING_GRANULARITY 16
 
-/** \def MBEDTLS_SSL_TLS13_PADDING_GRANULARITY
+/** \def MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY
  *
  * This option controls the use of record plaintext padding
  * in TLS 1.3.
@@ -3568,7 +3568,7 @@
  * Note: On systems lacking division instructions,
  *       a power of two should be preferred.
  */
-//#define MBEDTLS_SSL_TLS13_PADDING_GRANULARITY 1
+//#define MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY 1
 
 /** \def MBEDTLS_SSL_OUT_CONTENT_LEN
  *

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 2e552b8..65424d6 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -277,8 +277,8 @@
 #define MBEDTLS_SSL_CID_PADDING_GRANULARITY 16
 #endif
 
-#if !defined(MBEDTLS_SSL_TLS13_PADDING_GRANULARITY)
-#define MBEDTLS_SSL_TLS13_PADDING_GRANULARITY 1
+#if !defined(MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY)
+#define MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY 1
 #endif
 
 /* \} name SECTION: Module settings */

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 0d16192..2c29656 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -661,7 +661,7 @@
     {
         size_t padding =
             ssl_compute_padding_length( rec->data_len,
-                                        MBEDTLS_SSL_TLS13_PADDING_GRANULARITY );
+                                        MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY );
         if( ssl_build_inner_plaintext( data,
                                        &rec->data_len,
                                        post_avail,

programs/test/query_config.c

diff --git a/programs/test/query_config.c b/programs/test/query_config.c
index 7f9410c..58aa875 100644
--- a/programs/test/query_config.c
+++ b/programs/test/query_config.c
@@ -2610,13 +2610,13 @@
     }
 #endif /* MBEDTLS_SSL_CID_PADDING_GRANULARITY */
 
-#if defined(MBEDTLS_SSL_TLS13_PADDING_GRANULARITY)
-    if( strcmp( "MBEDTLS_SSL_TLS13_PADDING_GRANULARITY", config ) == 0 )
+#if defined(MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY)
+    if( strcmp( "MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY", config ) == 0 )
     {
-        MACRO_EXPANSION_TO_STR( MBEDTLS_SSL_TLS13_PADDING_GRANULARITY );
+        MACRO_EXPANSION_TO_STR( MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY );
         return( 0 );
     }
-#endif /* MBEDTLS_SSL_TLS13_PADDING_GRANULARITY */
+#endif /* MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY */
 
 #if defined(MBEDTLS_SSL_OUT_CONTENT_LEN)
     if( strcmp( "MBEDTLS_SSL_OUT_CONTENT_LEN", config ) == 0 )