mirror of
https://github.com/curl/curl.git
synced 2026-08-06 15:36:14 +03:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
240 lines
7.5 KiB
C
240 lines
7.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "../curl_setup.h"
|
|
|
|
#if defined(USE_HTTP3) && \
|
|
(defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL))
|
|
|
|
#ifdef USE_OPENSSL
|
|
#include <openssl/err.h>
|
|
#include "../vtls/openssl.h"
|
|
#elif defined(USE_GNUTLS)
|
|
#include <gnutls/abstract.h>
|
|
#include <gnutls/gnutls.h>
|
|
#include <gnutls/x509.h>
|
|
#include <gnutls/crypto.h>
|
|
#include <nettle/sha2.h>
|
|
#include "../vtls/gtls.h"
|
|
#elif defined(USE_WOLFSSL)
|
|
#include <wolfssl/options.h>
|
|
#include <wolfssl/ssl.h>
|
|
#include <wolfssl/quic.h>
|
|
#include "../vtls/wolfssl.h"
|
|
#endif
|
|
|
|
#include "../urldata.h"
|
|
#include "../curl_trc.h"
|
|
#include "../cfilters.h"
|
|
#include "../multiif.h"
|
|
#include "../vtls/keylog.h"
|
|
#include "../vtls/vtls.h"
|
|
#include "../vtls/vtls_scache.h"
|
|
#include "vquic-tls.h"
|
|
|
|
CURLcode Curl_vquic_tls_init(struct curl_tls_ctx *ctx,
|
|
struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct ssl_peer *peer,
|
|
const struct alpn_spec *alpns,
|
|
Curl_vquic_tls_ctx_setup *cb_setup,
|
|
void *cb_user_data, void *ssl_user_data,
|
|
Curl_vquic_session_reuse_cb *session_reuse_cb)
|
|
{
|
|
char tls_id[80];
|
|
CURLcode result;
|
|
|
|
#ifdef USE_OPENSSL
|
|
Curl_ossl_version(tls_id, sizeof(tls_id));
|
|
#elif defined(USE_GNUTLS)
|
|
Curl_gtls_version(tls_id, sizeof(tls_id));
|
|
#elif defined(USE_WOLFSSL)
|
|
Curl_wssl_version(tls_id, sizeof(tls_id));
|
|
#else
|
|
#error "no TLS lib in used, should not happen"
|
|
return CURLE_FAILED_INIT;
|
|
#endif
|
|
(void)session_reuse_cb;
|
|
result = Curl_ssl_peer_init(peer, cf, tls_id, TRNSPRT_QUIC);
|
|
if(result)
|
|
return result;
|
|
|
|
#ifdef USE_OPENSSL
|
|
(void)result;
|
|
return Curl_ossl_ctx_init(&ctx->ossl, cf, data, peer, alpns,
|
|
cb_setup, cb_user_data, NULL, ssl_user_data,
|
|
session_reuse_cb);
|
|
#elif defined(USE_GNUTLS)
|
|
return Curl_gtls_ctx_init(&ctx->gtls, cf, data, peer, alpns,
|
|
cb_setup, cb_user_data, ssl_user_data,
|
|
session_reuse_cb);
|
|
#elif defined(USE_WOLFSSL)
|
|
return Curl_wssl_ctx_init(&ctx->wssl, cf, data, peer, alpns,
|
|
cb_setup, cb_user_data,
|
|
ssl_user_data, session_reuse_cb);
|
|
#else
|
|
#error "no TLS lib in used, should not happen"
|
|
return CURLE_FAILED_INIT;
|
|
#endif
|
|
}
|
|
|
|
void Curl_vquic_tls_cleanup(struct curl_tls_ctx *ctx)
|
|
{
|
|
#ifdef USE_OPENSSL
|
|
if(ctx->ossl.ssl)
|
|
SSL_free(ctx->ossl.ssl);
|
|
if(ctx->ossl.ssl_ctx)
|
|
SSL_CTX_free(ctx->ossl.ssl_ctx);
|
|
#elif defined(USE_GNUTLS)
|
|
if(ctx->gtls.session)
|
|
gnutls_deinit(ctx->gtls.session);
|
|
Curl_gtls_shared_creds_free(&ctx->gtls.shared_creds);
|
|
#elif defined(USE_WOLFSSL)
|
|
if(ctx->wssl.ssl)
|
|
wolfSSL_free(ctx->wssl.ssl);
|
|
if(ctx->wssl.ssl_ctx)
|
|
wolfSSL_CTX_free(ctx->wssl.ssl_ctx);
|
|
#endif
|
|
memset(ctx, 0, sizeof(*ctx));
|
|
}
|
|
|
|
CURLcode Curl_vquic_tls_before_recv(struct curl_tls_ctx *ctx,
|
|
struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
#ifdef USE_OPENSSL
|
|
if(!ctx->ossl.x509_store_setup) {
|
|
CURLcode result = Curl_ssl_setup_x509_store(cf, data, &ctx->ossl);
|
|
if(result)
|
|
return result;
|
|
ctx->ossl.x509_store_setup = TRUE;
|
|
}
|
|
#elif defined(USE_WOLFSSL)
|
|
if(!ctx->wssl.x509_store_setup) {
|
|
CURLcode result = Curl_wssl_setup_x509_store(cf, data, &ctx->wssl);
|
|
if(result)
|
|
return result;
|
|
}
|
|
#elif defined(USE_GNUTLS)
|
|
if(!ctx->gtls.shared_creds->trust_setup) {
|
|
CURLcode result = Curl_gtls_client_trust_setup(cf, data, &ctx->gtls);
|
|
if(result)
|
|
return result;
|
|
}
|
|
#else
|
|
(void)ctx; (void)cf; (void)data;
|
|
#endif
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode Curl_vquic_tls_verify_peer(struct curl_tls_ctx *ctx,
|
|
struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
struct ssl_peer *peer)
|
|
{
|
|
struct ssl_primary_config *conn_config;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
conn_config = Curl_ssl_cf_get_primary_config(cf);
|
|
if(!conn_config)
|
|
return CURLE_FAILED_INIT;
|
|
|
|
#ifdef USE_OPENSSL
|
|
(void)conn_config;
|
|
result = Curl_ossl_check_peer_cert(cf, data, &ctx->ossl, peer);
|
|
#elif defined(USE_GNUTLS)
|
|
result = Curl_gtls_verifyserver(cf, data, ctx->gtls.session,
|
|
conn_config, &data->set.ssl, peer,
|
|
data->set.str[STRING_SSL_PINNEDPUBLICKEY]);
|
|
if(result)
|
|
return result;
|
|
#elif defined(USE_WOLFSSL)
|
|
(void)data;
|
|
if(conn_config->verifyhost) {
|
|
WOLFSSL_X509* cert = wolfSSL_get_peer_certificate(ctx->wssl.ssl);
|
|
if(!cert)
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
else if(peer->sni &&
|
|
(wolfSSL_X509_check_host(cert, peer->sni, strlen(peer->sni), 0, NULL)
|
|
== WOLFSSL_FAILURE))
|
|
result = CURLE_PEER_FAILED_VERIFICATION;
|
|
else if(!peer->sni &&
|
|
(wolfSSL_X509_check_ip_asc(cert, peer->hostname, 0)
|
|
== WOLFSSL_FAILURE))
|
|
result = CURLE_PEER_FAILED_VERIFICATION;
|
|
wolfSSL_X509_free(cert);
|
|
}
|
|
if(!result)
|
|
result = Curl_wssl_verify_pinned(cf, data, &ctx->wssl);
|
|
#endif
|
|
/* on error, remove any session we might have in the pool */
|
|
if(result)
|
|
Curl_ssl_scache_remove_all(cf, data, peer->scache_key);
|
|
return result;
|
|
}
|
|
|
|
|
|
bool Curl_vquic_tls_get_ssl_info(struct curl_tls_ctx *ctx,
|
|
bool give_ssl_ctx,
|
|
struct curl_tlssessioninfo *info)
|
|
{
|
|
#ifdef USE_OPENSSL
|
|
info->backend = CURLSSLBACKEND_OPENSSL;
|
|
info->internals = give_ssl_ctx ?
|
|
(void *)ctx->ossl.ssl_ctx : (void *)ctx->ossl.ssl;
|
|
return TRUE;
|
|
#elif defined(USE_GNUTLS)
|
|
(void)give_ssl_ctx; /* gnutls always returns its session */
|
|
info->backend = CURLSSLBACKEND_GNUTLS;
|
|
info->internals = ctx->gtls.session;
|
|
return TRUE;
|
|
#elif defined(USE_WOLFSSL)
|
|
info->backend = CURLSSLBACKEND_WOLFSSL;
|
|
info->internals = give_ssl_ctx ?
|
|
(void *)ctx->wssl.ssl_ctx : (void *)ctx->wssl.ssl;
|
|
return TRUE;
|
|
#else
|
|
return FALSE;
|
|
#endif
|
|
}
|
|
|
|
void Curl_vquic_report_handshake(struct curl_tls_ctx *ctx,
|
|
struct Curl_cfilter *cf,
|
|
struct Curl_easy *data)
|
|
{
|
|
(void)cf;
|
|
#ifdef USE_OPENSSL
|
|
(void)cf;
|
|
Curl_ossl_report_handshake(data, &ctx->ossl);
|
|
#elif defined(USE_GNUTLS)
|
|
Curl_gtls_report_handshake(data, &ctx->gtls);
|
|
#elif defined(USE_WOLFSSL)
|
|
Curl_wssl_report_handshake(data, &ctx->wssl);
|
|
#else
|
|
(void)data;
|
|
(void)ctx;
|
|
#endif
|
|
}
|
|
|
|
#endif /* !USE_HTTP3 && (USE_OPENSSL || USE_GNUTLS || USE_WOLFSSL) */
|