lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

change prototype of write_early_data_ext

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2023-12-05 10:40:49 +08:00
parent 163e12f7ff
commit c59c586ac4
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/ssl_misc.h
View File

@ -2113,10 +2113,10 @@ int mbedtls_ssl_tls13_generate_and_write_xxdh_key_exchange(
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
int mbedtls_ssl_tls13_write_early_data_ext(mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_write_early_data_ext(mbedtls_ssl_context *ssl,
int in_new_session_ticket,
unsigned char *buf, unsigned char *buf,
const unsigned char *end, const unsigned char *end,
size_t *out_len, size_t *out_len);
const mbedtls_ssl_session *session);
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
#define MBEDTLS_SSL_EARLY_DATA_STATUS_NOT_RECEIVED \ #define MBEDTLS_SSL_EARLY_DATA_STATUS_NOT_RECEIVED \

2
library/ssl_tls13_client.c
View File

@ -1176,7 +1176,7 @@ int mbedtls_ssl_tls13_write_client_hello_exts(mbedtls_ssl_context *ssl,
ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED) { ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED) {
ret = mbedtls_ssl_tls13_write_early_data_ext( ret = mbedtls_ssl_tls13_write_early_data_ext(
ssl, p, end, &ext_len, NULL); ssl, 0, p, end, &ext_len);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }

14
library/ssl_tls13_generic.c
View File

@ -1410,18 +1410,18 @@ cleanup:
*/ */
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
int mbedtls_ssl_tls13_write_early_data_ext(mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_write_early_data_ext(mbedtls_ssl_context *ssl,
int in_new_session_ticket,
unsigned char *buf, unsigned char *buf,
const unsigned char *end, const unsigned char *end,
size_t *out_len, size_t *out_len)
const mbedtls_ssl_session *session)
{ {
unsigned char *p = buf; unsigned char *p = buf;
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
const size_t needed = session != NULL ? 8 : 4; const size_t needed = in_new_session_ticket ? 8 : 4;
#else #else
const size_t needed = 4; const size_t needed = 4;
((void) session); ((void) in_new_session_ticket);
#endif #endif
*out_len = 0; *out_len = 0;
@ -1432,11 +1432,11 @@ int mbedtls_ssl_tls13_write_early_data_ext(mbedtls_ssl_context *ssl,
MBEDTLS_PUT_UINT16_BE(needed - 4, p, 2); MBEDTLS_PUT_UINT16_BE(needed - 4, p, 2);
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
if (session != NULL) { if (in_new_session_ticket) {
MBEDTLS_PUT_UINT32_BE(session->max_early_data_size, p, 4); MBEDTLS_PUT_UINT32_BE(ssl->conf->max_early_data_size, p, 4);
MBEDTLS_SSL_DEBUG_MSG( MBEDTLS_SSL_DEBUG_MSG(
4, ("Sent max_early_data_size=%u", 4, ("Sent max_early_data_size=%u",
(unsigned int) session->max_early_data_size)); (unsigned int) ssl->conf->max_early_data_size));
} }
#endif #endif

4
library/ssl_tls13_server.c
View File

@ -2525,7 +2525,7 @@ static int ssl_tls13_write_encrypted_extensions_body(mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED) { if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED) {
ret = mbedtls_ssl_tls13_write_early_data_ext( ret = mbedtls_ssl_tls13_write_early_data_ext(
ssl, p, end, &output_len, NULL); ssl, 0, p, end, &output_len);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
@ -3326,7 +3326,7 @@ static int ssl_tls13_write_new_session_ticket_body(mbedtls_ssl_context *ssl,
if (ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED && if (ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED &&
ssl->conf->max_early_data_size > 0) { ssl->conf->max_early_data_size > 0) {
if ((ret = mbedtls_ssl_tls13_write_early_data_ext( if ((ret = mbedtls_ssl_tls13_write_early_data_ext(
ssl, p, end, &output_len, session)) != 0) { ssl, 1, p, end, &output_len)) != 0) {
MBEDTLS_SSL_DEBUG_RET( MBEDTLS_SSL_DEBUG_RET(
1, "mbedtls_ssl_tls13_write_early_data_ext", ret); 1, "mbedtls_ssl_tls13_write_early_data_ext", ret);
return ret; return ret;