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

Merge pull request #8487 from yanrayw/issue/6909/rename_tls13_conf_early_data

Browse source 
TLS 1.3: Rename early_data and max_early_data_size configuration function
This commit is contained in:
Tom Cosgrove 2023-11-10 19:35:46 +00:00 committed by GitHub
commit 08ea9bfa1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.d/rename-conf-early-data-API.txt Normal file
View file

@ -0,0 +1,4 @@
API changes
* Remove `tls13_` in mbedtls_ssl_tls13_conf_early_data() and
mbedtls_ssl_tls13_conf_max_early_data_size() API names. Early data
feature may not be TLS 1.3 specific in the future. Fixes #6909.

2
include/mbedtls/mbedtls_config.h
View file

@ -4083,7 +4083,7 @@
* \def MBEDTLS_SSL_MAX_EARLY_DATA_SIZE * \def MBEDTLS_SSL_MAX_EARLY_DATA_SIZE
* *
* The default maximum amount of 0-RTT data. See the documentation of * The default maximum amount of 0-RTT data. See the documentation of
* \c mbedtls_ssl_tls13_conf_max_early_data_size() for more information. * \c mbedtls_ssl_conf_max_early_data_size() for more information.
* *
* It must be positive and smaller than UINT32_MAX. * It must be positive and smaller than UINT32_MAX.
* *

4
include/mbedtls/ssl.h
View file

@ -2000,7 +2000,7 @@ void mbedtls_ssl_conf_authmode(mbedtls_ssl_config *conf, int authmode);
* \warning This interface is experimental and may change without notice. * \warning This interface is experimental and may change without notice.
* *
*/ */
void mbedtls_ssl_tls13_conf_early_data(mbedtls_ssl_config *conf, void mbedtls_ssl_conf_early_data(mbedtls_ssl_config *conf,
int early_data_enabled); int early_data_enabled);
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
@ -2027,7 +2027,7 @@ void mbedtls_ssl_tls13_conf_early_data(mbedtls_ssl_config *conf,
* \warning This interface is experimental and may change without notice. * \warning This interface is experimental and may change without notice.
* *
*/ */
void mbedtls_ssl_tls13_conf_max_early_data_size( void mbedtls_ssl_conf_max_early_data_size(
mbedtls_ssl_config *conf, uint32_t max_early_data_size); mbedtls_ssl_config *conf, uint32_t max_early_data_size);
#endif /* MBEDTLS_SSL_SRV_C */ #endif /* MBEDTLS_SSL_SRV_C */

9
library/ssl_tls.c
View file

@ -1770,14 +1770,14 @@ void mbedtls_ssl_conf_tls13_key_exchange_modes(mbedtls_ssl_config *conf,
} }
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
void mbedtls_ssl_tls13_conf_early_data(mbedtls_ssl_config *conf, void mbedtls_ssl_conf_early_data(mbedtls_ssl_config *conf,
int early_data_enabled) int early_data_enabled)
{ {
conf->early_data_enabled = early_data_enabled; conf->early_data_enabled = early_data_enabled;
} }
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
void mbedtls_ssl_tls13_conf_max_early_data_size( void mbedtls_ssl_conf_max_early_data_size(
mbedtls_ssl_config *conf, uint32_t max_early_data_size) mbedtls_ssl_config *conf, uint32_t max_early_data_size)
{ {
conf->max_early_data_size = max_early_data_size; conf->max_early_data_size = max_early_data_size;
@ -5247,10 +5247,9 @@ int mbedtls_ssl_config_defaults(mbedtls_ssl_config *conf,
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
mbedtls_ssl_tls13_conf_early_data(conf, MBEDTLS_SSL_EARLY_DATA_DISABLED); mbedtls_ssl_conf_early_data(conf, MBEDTLS_SSL_EARLY_DATA_DISABLED);
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
mbedtls_ssl_tls13_conf_max_early_data_size( mbedtls_ssl_conf_max_early_data_size(conf, MBEDTLS_SSL_MAX_EARLY_DATA_SIZE);
conf, MBEDTLS_SSL_MAX_EARLY_DATA_SIZE);
#endif #endif
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */

2
programs/ssl/ssl_client2.c
View file

@ -1971,7 +1971,7 @@ usage:
} }
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
mbedtls_ssl_tls13_conf_early_data(&conf, opt.early_data); mbedtls_ssl_conf_early_data(&conf, opt.early_data);
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */
if ((ret = mbedtls_ssl_setup(&ssl, &conf)) != 0) { if ((ret = mbedtls_ssl_setup(&ssl, &conf)) != 0) {

4
programs/ssl/ssl_server2.c
View file

@ -2776,9 +2776,9 @@ usage:
} }
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
mbedtls_ssl_tls13_conf_early_data(&conf, tls13_early_data_enabled); mbedtls_ssl_conf_early_data(&conf, tls13_early_data_enabled);
if (tls13_early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED) { if (tls13_early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED) {
mbedtls_ssl_tls13_conf_max_early_data_size( mbedtls_ssl_conf_max_early_data_size(
&conf, opt.max_early_data_size); &conf, opt.max_early_data_size);
} }
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */

4
tests/ssl-opt.sh
View file

@ -1519,7 +1519,7 @@ do_run_test_once() {
# $1 and $2 contain the server and client command lines, respectively. # $1 and $2 contain the server and client command lines, respectively.
# #
# Note: this function only provides some guess about TLS version by simply # Note: this function only provides some guess about TLS version by simply
# looking at the server/client command lines. Even thought this works # looking at the server/client command lines. Even though this works
# for the sake of tests' filtering (especially in conjunction with the # for the sake of tests' filtering (especially in conjunction with the
# detect_required_features() function), it does NOT guarantee that the # detect_required_features() function), it does NOT guarantee that the
# result is accurate. It does not check other conditions, such as: # result is accurate. It does not check other conditions, such as:
@ -1639,7 +1639,7 @@ run_test() {
requires_config_enabled MBEDTLS_SSL_PROTO_DTLS requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
fi fi
# Check if we are trying to use an external tool wich does not support ECDH # Check if we are trying to use an external tool which does not support ECDH
EXT_WO_ECDH=$(use_ext_tool_without_ecdh_support "$SRV_CMD" "$CLI_CMD") EXT_WO_ECDH=$(use_ext_tool_without_ecdh_support "$SRV_CMD" "$CLI_CMD")
# Guess the TLS version which is going to be used # Guess the TLS version which is going to be used