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

ssl_tls13: fix guards for accel ECDH

Browse source 
These changes fix all failures found in test_suite_ssl

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-03-16 17:14:56 +01:00
parent 4059aba353
commit 90df310d89
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/ssl_misc.h
View file

@ -2089,7 +2089,7 @@ int mbedtls_ssl_tls13_write_change_cipher_spec(mbedtls_ssl_context *ssl);
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_reset_transcript_for_hrr(mbedtls_ssl_context *ssl); int mbedtls_ssl_reset_transcript_for_hrr(mbedtls_ssl_context *ssl);
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_PK_CAN_ECDH)
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange( int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,

6
library/ssl_tls13_client.c
View file

@ -184,7 +184,7 @@ static int ssl_tls13_reset_key_share(mbedtls_ssl_context *ssl)
return MBEDTLS_ERR_SSL_INTERNAL_ERROR; return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
} }
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_PK_CAN_ECDH)
if (mbedtls_ssl_tls13_named_group_is_ecdhe(group_id)) { if (mbedtls_ssl_tls13_named_group_is_ecdhe(group_id)) {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
@ -219,7 +219,7 @@ static int ssl_tls13_get_default_group_id(mbedtls_ssl_context *ssl,
int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE; int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_PK_CAN_ECDH)
const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); const uint16_t *group_list = mbedtls_ssl_get_groups(ssl);
/* Pick first available ECDHE group compatible with TLS 1.3 */ /* Pick first available ECDHE group compatible with TLS 1.3 */
if (group_list == NULL) { if (group_list == NULL) {
@ -301,7 +301,7 @@ static int ssl_tls13_write_key_share_ext(mbedtls_ssl_context *ssl,
* only one key share entry is allowed. * only one key share entry is allowed.
*/ */
client_shares = p; client_shares = p;
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_PK_CAN_ECDH)
if (mbedtls_ssl_tls13_named_group_is_ecdhe(group_id)) { if (mbedtls_ssl_tls13_named_group_is_ecdhe(group_id)) {
/* Pointer to group */ /* Pointer to group */
unsigned char *group = p; unsigned char *group = p;

2
library/ssl_tls13_generic.c
View file

@ -1428,7 +1428,7 @@ int mbedtls_ssl_reset_transcript_for_hrr(mbedtls_ssl_context *ssl)
return ret; return ret;
} }
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_PK_CAN_ECDH)
int mbedtls_ssl_tls13_read_public_ecdhe_share(mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_read_public_ecdhe_share(mbedtls_ssl_context *ssl,
const unsigned char *buf, const unsigned char *buf,