romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 04:13:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: prefer ifdef/ifndef for single checks

Browse source 
Closes #18018
This commit is contained in:
Viktor Szakats 2025-07-25 14:31:16 +02:00
parent b2bccdc257
commit 89771d19d5
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
109 changed files with 319 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/unit1979.c
View file

@ -131,7 +131,7 @@ static CURLcode test_unit1979(char *arg)
buffer);
curlx_dyn_free(&canonical_path);
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
UNITTEST_END_SIMPLE
}

2
tests/unit/unit1980.c
View file

@ -102,7 +102,7 @@ static CURLcode test_unit1980(char *arg)
buffer);
curlx_dyn_free(&canonical_query);
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
UNITTEST_END_SIMPLE
}

14
tests/unit/unit3205.c
View file

@ -60,7 +60,7 @@ static CURLcode test_unit3205(char *arg)
"ECDHE-RSA-CHACHA20-POLY1305" },
{ 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
"ECDHE-ECDSA-CHACHA20-POLY1305" },
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA",
"AES128-SHA" },
{ 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA",
@ -451,19 +451,19 @@ static CURLcode test_unit3205(char *arg)
{ 0xC030, "ECDHE-RSA-AES256-GCM-SHA384"},
{ 0xCCA9, "ECDHE-ECDSA-CHACHA20-POLY1305"},
{ 0xCCA8, "ECDHE-RSA-CHACHA20-POLY1305"},
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x009E, "DHE-RSA-AES128-GCM-SHA256"},
{ 0x009F, "DHE-RSA-AES256-GCM-SHA384"},
#else
{ 0x0000, "DHE-RSA-AES128-GCM-SHA256"},
{ 0x0000, "DHE-RSA-AES256-GCM-SHA384"},
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0xCCAA, "DHE-RSA-CHACHA20-POLY1305"},
#else
{ 0x0000, "DHE-RSA-CHACHA20-POLY1305"},
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0xC023, "ECDHE-ECDSA-AES128-SHA256" },
{ 0xC027, "ECDHE-RSA-AES128-SHA256" },
{ 0xC009, "ECDHE-ECDSA-AES128-SHA" },
@ -482,14 +482,14 @@ static CURLcode test_unit3205(char *arg)
{ 0x0000, "ECDHE-ECDSA-AES256-SHA" },
{ 0x0000, "ECDHE-RSA-AES256-SHA" },
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x0067, "DHE-RSA-AES128-SHA256" },
{ 0x006B, "DHE-RSA-AES256-SHA256" },
#else
{ 0x0000, "DHE-RSA-AES128-SHA256" },
{ 0x0000, "DHE-RSA-AES256-SHA256" },
#endif
#if defined(USE_MBEDTLS)
#ifdef USE_MBEDTLS
{ 0x009C, "AES128-GCM-SHA256" },
{ 0x009D, "AES256-GCM-SHA384" },
{ 0x003C, "AES128-SHA256" },
@ -605,7 +605,7 @@ static CURLcode test_unit3205(char *arg)
j++;
}
}
#endif /* defined(USE_MBEDTLS) || defined(USE_RUSTLS) */
#endif /* USE_MBEDTLS || USE_RUSTLS */
UNITTEST_END_SIMPLE
}