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

openssl: stop checking for OPENSSL_NO_TLSEXT macro

Browse source 
The macro has been deleted upstream and never defined in OpenSSL 1.1.0+:
e481f9b90b

BoringSSL and LibreSSL deleted the last uses in 2014:
6dbd73db5d
7b2f3298f7

Also:
- drop internal guard `HAS_ALPN_OPENSSL`. It's always set.

Follow-up to 69c89bf3d3 #18330

Closes #20129
This commit is contained in:
Viktor Szakats 2025-12-31 14:45:05 +01:00
parent c7b25e6e82
commit 0d0ac29cdd
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/vtls/openssl.c
View file

@ -2231,7 +2231,7 @@ static CURLcode ossl_verifyhost(struct Curl_easy *data,
return result;
}
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
#ifndef OPENSSL_NO_OCSP
static CURLcode verifystatus(struct Curl_cfilter *cf,
struct Curl_easy *data,
struct ossl_ctx *octx)
@ -2591,11 +2591,6 @@ static void ossl_trace(int direction, int ssl_ver, int content_type,
(void)ssl;
}
/* Check for ALPN support. */
#ifndef OPENSSL_NO_TLSEXT
# define HAS_ALPN_OPENSSL
#endif
static CURLcode
ossl_set_ssl_version_min_max(struct Curl_cfilter *cf, SSL_CTX *ctx,
unsigned int ssl_version_min)
@ -3424,7 +3419,6 @@ ossl_init_session_and_alpns(struct ossl_ctx *octx,
Curl_ssl_scache_return(cf, data, peer->scache_key, scs);
}
#ifdef HAS_ALPN_OPENSSL
if(alpns.count) {
struct alpn_proto_buf proto;
memset(&proto, 0, sizeof(proto));
@ -3438,7 +3432,6 @@ ossl_init_session_and_alpns(struct ossl_ctx *octx,
return CURLE_SSL_CONNECT_ERROR;
}
}
#endif
return CURLE_OK;
}
@ -3593,7 +3586,7 @@ static CURLcode ossl_init_ssl(struct ossl_ctx *octx,
SSL_set_app_data(octx->ssl, ssl_user_data);
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
#ifndef OPENSSL_NO_OCSP
if(Curl_ssl_cf_get_primary_config(cf)->verifystatus)
SSL_set_tlsext_status_type(octx->ssl, TLSEXT_STATUSTYPE_ocsp);
#endif
@ -4074,14 +4067,13 @@ static CURLcode ossl_connect_step1(struct Curl_cfilter *cf,
SSL_set_bio(octx->ssl, bio, bio);
#endif
#ifdef HAS_ALPN_OPENSSL
if(connssl->alpn && (connssl->state != ssl_connection_deferred)) {
struct alpn_proto_buf proto;
memset(&proto, 0, sizeof(proto));
Curl_alpn_to_proto_str(&proto, connssl->alpn);
infof(data, VTLS_INFOF_ALPN_OFFER_1STR, proto.data);
}
#endif
connssl->connecting_state = ssl_connect_2;
return CURLE_OK;
}
@ -4364,7 +4356,6 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
}
#endif /* HAVE_SSL_SET1_ECH_CONFIG_LIST && !HAVE_BORINGSSL_LIKE */
#ifdef HAS_ALPN_OPENSSL
/* Sets data and len to negotiated protocol, len is 0 if no protocol was
* negotiated
*/
@ -4375,7 +4366,6 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
return Curl_alpn_set_negotiated(cf, data, connssl, neg_protocol, len);
}
#endif
return CURLE_OK;
}
@ -4746,8 +4736,7 @@ CURLcode Curl_ossl_check_peer_cert(struct Curl_cfilter *cf,
long ossl_verify;
X509 *server_cert;
bool verified = FALSE;
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP) && \
defined(USE_APPLE_SECTRUST)
#if !defined(OPENSSL_NO_OCSP) && defined(USE_APPLE_SECTRUST)
bool sectrust_verified = FALSE;
#endif
@ -4802,7 +4791,7 @@ CURLcode Curl_ossl_check_peer_cert(struct Curl_cfilter *cf,
if(verified) {
infof(data, "SSL certificate verified via Apple SecTrust.");
ssl_config->certverifyresult = X509_V_OK;
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
#ifndef OPENSSL_NO_OCSP
sectrust_verified = TRUE;
#endif
}
@ -4820,7 +4809,7 @@ CURLcode Curl_ossl_check_peer_cert(struct Curl_cfilter *cf,
infof(data, " SSL certificate verification failed, continuing anyway!");
}
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
#ifndef OPENSSL_NO_OCSP
if(conn_config->verifystatus &&
#ifdef USE_APPLE_SECTRUST
!sectrust_verified && /* already verified via apple sectrust, cannot
@ -5401,7 +5390,7 @@ static CURLcode ossl_sha256sum(const unsigned char *tmp, /* input */
static bool ossl_cert_status_request(void)
{
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
#ifndef OPENSSL_NO_OCSP
return TRUE;
#else
return FALSE;