eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set hs_psk,ciphercuit_info and kex mode when writing pre-share key

Browse source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2022-12-19 07:31:27 +00:00
parent 57a138d5c3
commit 854db28bb7
3 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
library/ssl_client.c
View file

@ -966,24 +966,6 @@ int mbedtls_ssl_write_client_hello(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_REJECTED) { if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED) {
psa_algorithm_t hash_alg = PSA_ALG_NONE;
const unsigned char *psk;
size_t psk_len;
MBEDTLS_SSL_DEBUG_MSG(1, ("in generate early keys"));
if ((ret = mbedtls_ssl_tls13_ticket_get_psk(
ssl, &hash_alg, &psk, &psk_len))
!= 0) {
MBEDTLS_SSL_DEBUG_RET(
1, "mbedtls_ssl_tls13_ticket_get_psk", ret);
goto cleanup;
}
if ((ret = mbedtls_ssl_set_hs_psk(ssl, psk, psk_len)) != 0) {
MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_ssl_set_hs_psk", ret);
goto cleanup;
}
/* Start the TLS 1.3 key schedule: /* Start the TLS 1.3 key schedule:
* Set the PSK and derive early secret. * Set the PSK and derive early secret.
*/ */

2
library/ssl_tls.c
View file

@ -1676,8 +1676,6 @@ int mbedtls_ssl_set_session(mbedtls_ssl_context *ssl, const mbedtls_ssl_session
session->ciphersuite)); session->ciphersuite));
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
ssl->handshake->ciphersuite_info = ciphersuite_info;
ssl->handshake->key_exchange_mode = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL;
} }
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */

31
library/ssl_tls13_client.c
View file

@ -893,11 +893,16 @@ int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
int configured_psk_count = 0; int configured_psk_count = 0;
unsigned char *p = buf; unsigned char *p = buf;
psa_algorithm_t hash_alg; psa_algorithm_t hash_alg = PSA_ALG_NONE;
const unsigned char *identity; const unsigned char *identity;
size_t identity_len; size_t identity_len;
size_t l_binders_len = 0; size_t l_binders_len = 0;
size_t output_len; size_t output_len;
#if defined(MBEDTLS_SSL_EARLY_DATA)
const unsigned char *psk;
size_t psk_len;
const mbedtls_ssl_ciphersuite_t *ciphersuite_info;
#endif
*out_len = 0; *out_len = 0;
*binders_len = 0; *binders_len = 0;
@ -962,6 +967,30 @@ int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
p += output_len; p += output_len;
l_binders_len += 1 + PSA_HASH_LENGTH(hash_alg); l_binders_len += 1 + PSA_HASH_LENGTH(hash_alg);
#if defined(MBEDTLS_SSL_EARLY_DATA)
MBEDTLS_SSL_DEBUG_MSG(
1, ("Set hs psk for early data when writing the first psk"));
ret = ssl_tls13_ticket_get_psk(ssl, &hash_alg, &psk, &psk_len);
if (ret != 0) {
MBEDTLS_SSL_DEBUG_RET(
1, "mbedtls_ssl_tls13_ticket_get_psk", ret);
return ret;
}
ret = mbedtls_ssl_set_hs_psk(ssl, psk, psk_len);
if (ret != 0) {
MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_ssl_set_hs_psk", ret);
return ret;
}
ciphersuite_info = mbedtls_ssl_ciphersuite_from_id(
ssl->session_negotiate->ciphersuite);
ssl->handshake->ciphersuite_info = ciphersuite_info;
ssl->handshake->key_exchange_mode =
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL;
#endif /* MBEDTLS_SSL_EARLY_DATA */
} }
#endif /* MBEDTLS_SSL_SESSION_TICKETS */ #endif /* MBEDTLS_SSL_SESSION_TICKETS */