luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mbedtls: PSA can be used independently of TLS 1.3 (avoid runtime errors)

Browse Source 
Closes #16044
This commit is contained in:
Michael Schuster 2025-01-18 05:38:41 +01:00 committed by Daniel Stenberg
parent 23ec39c3b5
commit 11ea10355a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vtls/mbedtls.c
View File

@ -117,6 +117,11 @@ struct mbed_ssl_backend_data {
#define mbedtls_strerror(a,b,c) b[0] = 0 #define mbedtls_strerror(a,b,c) b[0] = 0
#endif #endif
/* PSA can be used independently of TLS 1.3 */
#if defined(MBEDTLS_USE_PSA_CRYPTO) && MBEDTLS_VERSION_NUMBER >= 0x03060000
#define HAS_PSA_SUPPORT
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && MBEDTLS_VERSION_NUMBER >= 0x03060000 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && MBEDTLS_VERSION_NUMBER >= 0x03060000
#define HAS_TLS13_SUPPORT #define HAS_TLS13_SUPPORT
#endif #endif
@ -805,7 +810,7 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
#ifdef MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED #if defined(HAS_SESSION_TICKETS) && MBEDTLS_VERSION_NUMBER >= 0x03060100
/* New in mbedTLS 3.6.1, need to enable, default is now disabled */ /* New in mbedTLS 3.6.1, need to enable, default is now disabled */
mbedtls_ssl_conf_tls13_enable_signal_new_session_tickets(&backend->config, mbedtls_ssl_conf_tls13_enable_signal_new_session_tickets(&backend->config,
MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED); MBEDTLS_SSL_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED);
@ -1589,7 +1594,7 @@ static int mbedtls_init(void)
#ifdef HAS_THREADING_SUPPORT #ifdef HAS_THREADING_SUPPORT
entropy_init_mutex(&ts_entropy); entropy_init_mutex(&ts_entropy);
#endif #endif
#ifdef HAS_TLS13_SUPPORT #ifdef HAS_PSA_SUPPORT
{ {
int ret; int ret;
#ifdef HAS_THREADING_SUPPORT #ifdef HAS_THREADING_SUPPORT
@ -1602,7 +1607,7 @@ static int mbedtls_init(void)
if(ret != PSA_SUCCESS) if(ret != PSA_SUCCESS)
return 0; return 0;
} }
#endif /* HAS_TLS13_SUPPORT */ #endif /* HAS_PSA_SUPPORT */
return 1; return 1;
} }