yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename TLS 1.3 padding granularity macro

Browse source 
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>
This commit is contained in:
Hanno Becker 2020-06-02 06:16:00 +01:00
parent 9338f9f718
commit ceef848eb6
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/config.h
View file

@ -3554,7 +3554,7 @@
*/ */
//#define MBEDTLS_SSL_CID_PADDING_GRANULARITY 16 //#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 * This option controls the use of record plaintext padding
* in TLS 1.3. * in TLS 1.3.
@ -3568,7 +3568,7 @@
* Note: On systems lacking division instructions, * Note: On systems lacking division instructions,
* a power of two should be preferred. * 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 /** \def MBEDTLS_SSL_OUT_CONTENT_LEN
* *

4
include/mbedtls/ssl.h
View file

@ -277,8 +277,8 @@
#define MBEDTLS_SSL_CID_PADDING_GRANULARITY 16 #define MBEDTLS_SSL_CID_PADDING_GRANULARITY 16
#endif #endif
#if !defined(MBEDTLS_SSL_TLS13_PADDING_GRANULARITY) #if !defined(MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY)
#define MBEDTLS_SSL_TLS13_PADDING_GRANULARITY 1 #define MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY 1
#endif #endif
/* \} name SECTION: Module settings */ /* \} name SECTION: Module settings */

2
library/ssl_msg.c
View file

@ -661,7 +661,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
{ {
size_t padding = size_t padding =
ssl_compute_padding_length( rec->data_len, ssl_compute_padding_length( rec->data_len,
MBEDTLS_SSL_TLS13_PADDING_GRANULARITY ); MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY );
if( ssl_build_inner_plaintext( data, if( ssl_build_inner_plaintext( data,
&rec->data_len, &rec->data_len,
post_avail, post_avail,

8
programs/test/query_config.c
View file

@ -2610,13 +2610,13 @@ int query_config( const char *config )
} }
#endif /* MBEDTLS_SSL_CID_PADDING_GRANULARITY */ #endif /* MBEDTLS_SSL_CID_PADDING_GRANULARITY */
#if defined(MBEDTLS_SSL_TLS13_PADDING_GRANULARITY) #if defined(MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY)
if( strcmp( "MBEDTLS_SSL_TLS13_PADDING_GRANULARITY", config ) == 0 ) 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 ); return( 0 );
} }
#endif /* MBEDTLS_SSL_TLS13_PADDING_GRANULARITY */ #endif /* MBEDTLS_SSL_TLS1_3_PADDING_GRANULARITY */
#if defined(MBEDTLS_SSL_OUT_CONTENT_LEN) #if defined(MBEDTLS_SSL_OUT_CONTENT_LEN)
if( strcmp( "MBEDTLS_SSL_OUT_CONTENT_LEN", config ) == 0 ) if( strcmp( "MBEDTLS_SSL_OUT_CONTENT_LEN", config ) == 0 )