romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 20:03:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

drop another interim macro and version check

Browse source
This commit is contained in:
Viktor Szakats 2025-08-13 10:30:47 +02:00
parent eb489ca4bb
commit 43f714a39d
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/vtls/mbedtls.c
View file

@ -107,11 +107,6 @@ struct mbed_ssl_backend_data {
#define mbedtls_strerror(a,b,c) b[0] = 0
#endif
/* TLSv1.3 support requires mbedTLS 3.6.0+ */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)
#define HAS_SESSION_TICKETS
#endif
#ifdef HAS_THREADING_SUPPORT
static mbedtls_entropy_context ts_entropy;
@ -752,7 +747,7 @@ mbed_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
return CURLE_SSL_CONNECT_ERROR;
}
#ifdef HAS_SESSION_TICKETS
#ifdef MBEDTLS_SSL_SESSION_TICKETS
/* 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_TLS1_3_SIGNAL_NEW_SESSION_TICKETS_ENABLED);
@ -1293,7 +1288,7 @@ static CURLcode mbed_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
CURL_TRC_CF(data, cf, "mbedtls_ssl_read(len=%zu) -> -0x%04X",
buffersize, -nread);
switch(nread) {
#ifdef HAS_SESSION_TICKETS
#ifdef MBEDTLS_SSL_SESSION_TICKETS
case MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET:
mbed_new_session(cf, data);
FALLTHROUGH();
@ -1490,7 +1485,7 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
SSLSUPP_CERTINFO |
SSLSUPP_PINNEDPUBKEY |
SSLSUPP_SSL_CTX |
#ifdef MBEDTLS_SSL_PROTO_TLS1_3
#ifdef MBEDTLS_SSL_PROTO_TLS1_3 /* TLSv1.3 support requires mbedTLS 3.6.0+ */
SSLSUPP_TLS13_CIPHERSUITES |
#endif
SSLSUPP_HTTPS_PROXY |