romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:11:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: drop redundant USE_QUICHE guards

Browse source 
When used together with `USE_OPENSSL`. `USE_QUICHE` always implies
`USE_OPENSSL`.

Also: merge two (now identical) `#if` blocks in `openssl.c`.

Closes #21135
This commit is contained in:
Viktor Szakats 2026-03-28 02:41:40 +01:00
parent 9f66cdddf4
commit 3c72928471
No known key found for this signature in database
4 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/vtls/keylog.c
View file

@ -23,10 +23,7 @@
***************************************************************************/
#include "curl_setup.h"
#if defined(USE_OPENSSL) || \
defined(USE_GNUTLS) || \
defined(USE_WOLFSSL) || \
defined(USE_QUICHE) || \
#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL) || \
defined(USE_RUSTLS)
#include "vtls/keylog.h"

6
lib/vtls/openssl.c
View file

@ -27,7 +27,7 @@
*/
#include "curl_setup.h"
#if defined(USE_QUICHE) || defined(USE_OPENSSL)
#ifdef USE_OPENSSL
#include "urldata.h"
#include "curl_trc.h"
@ -514,10 +514,6 @@ static CURLcode ossl_certchain(struct Curl_easy *data, SSL *ssl)
return result;
}
#endif /* USE_QUICHE || USE_OPENSSL */
#ifdef USE_OPENSSL
static int ossl_bio_cf_create(BIO *bio)
{
BIO_set_shutdown(bio, 1);

5
src/curlinfo.c
View file

@ -39,7 +39,7 @@
#include <stdio.h>
#if defined(USE_QUICHE) || defined(USE_OPENSSL)
#ifdef USE_OPENSSL
#include <openssl/opensslconf.h> /* for OPENSSL_NO_OCSP */
#endif
@ -249,8 +249,7 @@ static const char *disabled[] = {
#endif
,
"cert-status: "
#if defined(USE_GNUTLS) || \
((defined(USE_QUICHE) || defined(USE_OPENSSL)) && !defined(OPENSSL_NO_OCSP))
#if defined(USE_GNUTLS) || (defined(USE_OPENSSL) && !defined(OPENSSL_NO_OCSP))
"ON"
#else
"OFF"

9
tests/libtest/cli_hx_download.c
View file

@ -25,7 +25,7 @@
#include "testtrace.h"
#if defined(USE_QUICHE) || defined(USE_OPENSSL)
#ifdef USE_OPENSSL
#include <openssl/ssl.h>
#endif
#ifdef USE_WOLFSSL
@ -137,9 +137,8 @@ static int my_progress_d_cb(void *userdata,
return 1;
}
#if defined(USE_QUICHE) || defined(USE_OPENSSL) || defined(USE_WOLFSSL) || \
defined(USE_GNUTLS) || defined(USE_MBEDTLS) || defined(USE_RUSTLS) || \
defined(USE_SCHANNEL)
#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL) || \
defined(USE_MBEDTLS) || defined(USE_RUSTLS) || defined(USE_SCHANNEL)
if(!t->checked_ssl && dlnow > 0) {
struct curl_tlssessioninfo *tls;
CURLcode result;
@ -153,7 +152,7 @@ static int my_progress_d_cb(void *userdata,
}
else {
switch(tls->backend) {
#if defined(USE_QUICHE) || defined(USE_OPENSSL)
#ifdef USE_OPENSSL
case CURLSSLBACKEND_OPENSSL: {
const char *version = SSL_get_version((SSL *)tls->internals);
assert(version);