build: drop redundant USE_QUICHE guards

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

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);