From 0e21d729f859bf49fa8de4858d33a98bdfd12091 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 20 Jul 2025 01:14:58 +0200 Subject: [PATCH] try including curlx base64 functions always, and allowlist in singleuse.pl these functions are used by these places: unit1302: curlx_base64_decode, curlx_base64_encode, curlx_base64url_encode src/tool_ssls_load: curlx_base64_decode, curlx_base64_encode src/varfunc: curlx_base64_decode, curlx_base64_encode Reproducers: - unit: -DCURL_ENABLE_SSL=OFF -DCURL_DISABLE_DIGEST_AUTH=ON -DCURL_DISABLE_HTTP=ON -DHTTP_ONLY=ON - src: -DCURL_ENABLE_SSL=OFF -DCURL_DISABLE_DIGEST_AUTH=ON -DCURL_DISABLE_HTTP=ON -DHTTP_ONLY=ON -DBUILD_SHARED_LIBS=OFF --- lib/curlx/base64.c | 9 --------- scripts/singleuse.pl | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c index 92ebc57e1e..dc6e9c001c 100644 --- a/lib/curlx/base64.c +++ b/lib/curlx/base64.c @@ -26,13 +26,6 @@ #include "../curl_setup.h" -#if !defined(CURL_DISABLE_HTTP_AUTH) || defined(USE_SSH) || \ - !defined(CURL_DISABLE_LDAP) || \ - !defined(CURL_DISABLE_SMTP) || \ - !defined(CURL_DISABLE_POP3) || \ - !defined(CURL_DISABLE_IMAP) || \ - !defined(CURL_DISABLE_DIGEST_AUTH) || \ - !defined(CURL_DISABLE_DOH) || defined(USE_SSL) || !defined(BUILDING_LIBCURL) #include #include "warnless.h" #include "base64.h" @@ -281,5 +274,3 @@ CURLcode curlx_base64url_encode(const char *inputbuff, size_t insize, { return base64_encode(base64url, 0, inputbuff, insize, outptr, outlen); } - -#endif /* no users so disabled */ diff --git a/scripts/singleuse.pl b/scripts/singleuse.pl index b6ec18b47f..0251594b12 100755 --- a/scripts/singleuse.pl +++ b/scripts/singleuse.pl @@ -49,6 +49,9 @@ my %wl = ( 'Curl_creader_def_total_length' => 'internal api', 'Curl_meta_reset' => 'internal api', 'Curl_trc_dns' => 'internal api', + 'curlx_base64_decode' => 'internal api', + 'curlx_base64_encode' => 'internal api', + 'curlx_base64url_encode' => 'internal api', ); my %api = (