mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 04:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert some changes about tls13 and macros

Browse Source 
There is one PR #4988 to change it in the future

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-10-26 10:22:25 +00:00
parent 7c91705e21
commit f13c56032f
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/mbedtls/ssl.h
View File

@ -1051,15 +1051,13 @@ typedef void mbedtls_ssl_async_cancel_t( mbedtls_ssl_context *ssl );
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED && #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED &&
!MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */ !MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
typedef struct typedef struct
{ {
unsigned char client_application_traffic_secret_N[ MBEDTLS_MD_MAX_SIZE ]; unsigned char client_application_traffic_secret_N[ MBEDTLS_MD_MAX_SIZE ];
unsigned char server_application_traffic_secret_N[ MBEDTLS_MD_MAX_SIZE ]; unsigned char server_application_traffic_secret_N[ MBEDTLS_MD_MAX_SIZE ];
unsigned char exporter_master_secret [ MBEDTLS_MD_MAX_SIZE ]; unsigned char exporter_master_secret [ MBEDTLS_MD_MAX_SIZE ];
unsigned char resumption_master_secret [ MBEDTLS_MD_MAX_SIZE ]; unsigned char resumption_master_secret [ MBEDTLS_MD_MAX_SIZE ];
} mbedtls_ssl_tls13_application_secrets; } mbedtls_ssl_tls1_3_application_secrets;
#endif
#if defined(MBEDTLS_SSL_DTLS_SRTP) #if defined(MBEDTLS_SSL_DTLS_SRTP)
@ -1125,9 +1123,7 @@ struct mbedtls_ssl_session
* to be studied whether one of them can be removed. */ * to be studied whether one of them can be removed. */
unsigned char MBEDTLS_PRIVATE(minor_ver); /*!< The TLS version used in the session. */ unsigned char MBEDTLS_PRIVATE(minor_ver); /*!< The TLS version used in the session. */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) mbedtls_ssl_tls1_3_application_secrets MBEDTLS_PRIVATE(app_secrets);
mbedtls_ssl_tls13_application_secrets MBEDTLS_PRIVATE(app_secrets);
#endif
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
#if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE) #if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)

6
library/ssl_tls13_keys.c
View File

@ -469,7 +469,7 @@ int mbedtls_ssl_tls1_3_derive_application_secrets(
mbedtls_md_type_t md_type, mbedtls_md_type_t md_type,
unsigned char const *application_secret, unsigned char const *application_secret,
unsigned char const *transcript, size_t transcript_len, unsigned char const *transcript, size_t transcript_len,
mbedtls_ssl_tls13_application_secrets *derived ) mbedtls_ssl_tls1_3_application_secrets *derived )
{ {
int ret; int ret;
mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type ); mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type );
@ -539,7 +539,7 @@ int mbedtls_ssl_tls1_3_derive_resumption_master_secret(
mbedtls_md_type_t md_type, mbedtls_md_type_t md_type,
unsigned char const *application_secret, unsigned char const *application_secret,
unsigned char const *transcript, size_t transcript_len, unsigned char const *transcript, size_t transcript_len,
mbedtls_ssl_tls13_application_secrets *derived ) mbedtls_ssl_tls1_3_application_secrets *derived )
{ {
int ret; int ret;
mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type ); mbedtls_md_info_t const * const md_info = mbedtls_md_info_from_type( md_type );
@ -1114,7 +1114,7 @@ int mbedtls_ssl_tls1_3_generate_application_keys(
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
/* Address at which to store the application secrets */ /* Address at which to store the application secrets */
mbedtls_ssl_tls13_application_secrets * const app_secrets = mbedtls_ssl_tls1_3_application_secrets * const app_secrets =
&ssl->session_negotiate->app_secrets; &ssl->session_negotiate->app_secrets;
/* Holding the transcript up to and including the ServerFinished */ /* Holding the transcript up to and including the ServerFinished */

6
library/ssl_tls13_keys.h
View File

@ -19,7 +19,6 @@
#if !defined(MBEDTLS_SSL_TLS1_3_KEYS_H) #if !defined(MBEDTLS_SSL_TLS1_3_KEYS_H)
#define MBEDTLS_SSL_TLS1_3_KEYS_H #define MBEDTLS_SSL_TLS1_3_KEYS_H
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
/* This requires MBEDTLS_SSL_TLS1_3_LABEL( idx, name, string ) to be defined at /* This requires MBEDTLS_SSL_TLS1_3_LABEL( idx, name, string ) to be defined at
* the point of use. See e.g. the definition of mbedtls_ssl_tls1_3_labels_union * the point of use. See e.g. the definition of mbedtls_ssl_tls1_3_labels_union
* below. */ * below. */
@ -345,7 +344,7 @@ int mbedtls_ssl_tls1_3_derive_application_secrets(
mbedtls_md_type_t md_type, mbedtls_md_type_t md_type,
unsigned char const *master_secret, unsigned char const *master_secret,
unsigned char const *transcript, size_t transcript_len, unsigned char const *transcript, size_t transcript_len,
mbedtls_ssl_tls13_application_secrets *derived ); mbedtls_ssl_tls1_3_application_secrets *derived );
/** /**
* \brief Derive TLS 1.3 resumption master secret from the master secret. * \brief Derive TLS 1.3 resumption master secret from the master secret.
@ -375,7 +374,7 @@ int mbedtls_ssl_tls1_3_derive_resumption_master_secret(
mbedtls_md_type_t md_type, mbedtls_md_type_t md_type,
unsigned char const *application_secret, unsigned char const *application_secret,
unsigned char const *transcript, size_t transcript_len, unsigned char const *transcript, size_t transcript_len,
mbedtls_ssl_tls13_application_secrets *derived ); mbedtls_ssl_tls1_3_application_secrets *derived );
/** /**
* \brief Compute the next secret in the TLS 1.3 key schedule * \brief Compute the next secret in the TLS 1.3 key schedule
@ -632,5 +631,4 @@ int mbedtls_ssl_tls1_3_calculate_expected_finished( mbedtls_ssl_context *ssl,
size_t *actual_len, size_t *actual_len,
int from ); int from );
#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
#endif /* MBEDTLS_SSL_TLS1_3_KEYS_H */ #endif /* MBEDTLS_SSL_TLS1_3_KEYS_H */

4
tests/suites/test_suite_ssl.function
View File

@ -3862,7 +3862,7 @@ void ssl_tls1_3_derive_application_secrets( int hash_alg,
data_t *server_expected, data_t *server_expected,
data_t *exporter_expected ) data_t *exporter_expected )
{ {
mbedtls_ssl_tls13_application_secrets secrets; mbedtls_ssl_tls1_3_application_secrets secrets;
/* Double-check that we've passed sane parameters. */ /* Double-check that we've passed sane parameters. */
mbedtls_md_type_t md_type = (mbedtls_md_type_t) hash_alg; mbedtls_md_type_t md_type = (mbedtls_md_type_t) hash_alg;
@ -3894,7 +3894,7 @@ void ssl_tls1_3_derive_resumption_secrets( int hash_alg,
data_t *transcript, data_t *transcript,
data_t *resumption_expected ) data_t *resumption_expected )
{ {
mbedtls_ssl_tls13_application_secrets secrets; mbedtls_ssl_tls1_3_application_secrets secrets;
/* Double-check that we've passed sane parameters. */ /* Double-check that we've passed sane parameters. */
mbedtls_md_type_t md_type = (mbedtls_md_type_t) hash_alg; mbedtls_md_type_t md_type = (mbedtls_md_type_t) hash_alg;