mirror of
https://github.com/curl/curl.git
synced 2026-06-23 05:05:43 +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
331 lines
8.2 KiB
C
331 lines
8.2 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_SSL) && defined(USE_SSLS_EXPORT)
|
|
|
|
#include "../urldata.h"
|
|
#include "../curl_trc.h"
|
|
#include "vtls_scache.h"
|
|
#include "vtls_spack.h"
|
|
#include "../strdup.h"
|
|
|
|
#ifndef UINT16_MAX
|
|
#define UINT16_MAX 0xffff
|
|
#endif
|
|
#ifndef UINT32_MAX
|
|
#define UINT32_MAX 0xffffffff
|
|
#endif
|
|
|
|
#define CURL_SPACK_VERSION 0x01
|
|
#define CURL_SPACK_IETF_ID 0x02
|
|
#define CURL_SPACK_VALID_UNTIL 0x03
|
|
#define CURL_SPACK_TICKET 0x04
|
|
#define CURL_SPACK_ALPN 0x05
|
|
#define CURL_SPACK_EARLYDATA 0x06
|
|
#define CURL_SPACK_QUICTP 0x07
|
|
|
|
static CURLcode spack_enc8(struct dynbuf *buf, uint8_t b)
|
|
{
|
|
return curlx_dyn_addn(buf, &b, 1);
|
|
}
|
|
|
|
static CURLcode
|
|
spack_dec8(uint8_t *val, const uint8_t **src, const uint8_t *end)
|
|
{
|
|
if(end - *src < 1)
|
|
return CURLE_READ_ERROR;
|
|
*val = **src;
|
|
*src += 1;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode spack_enc16(struct dynbuf *buf, uint16_t val)
|
|
{
|
|
uint8_t nval[2];
|
|
nval[0] = (uint8_t)(val >> 8);
|
|
nval[1] = (uint8_t)val;
|
|
return curlx_dyn_addn(buf, nval, sizeof(nval));
|
|
}
|
|
|
|
static CURLcode
|
|
spack_dec16(uint16_t *val, const uint8_t **src, const uint8_t *end)
|
|
{
|
|
if(end - *src < 2)
|
|
return CURLE_READ_ERROR;
|
|
*val = (uint16_t)((*src)[0] << 8 | (*src)[1]);
|
|
*src += 2;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode spack_enc32(struct dynbuf *buf, uint32_t val)
|
|
{
|
|
uint8_t nval[4];
|
|
nval[0] = (uint8_t)(val >> 24);
|
|
nval[1] = (uint8_t)(val >> 16);
|
|
nval[2] = (uint8_t)(val >> 8);
|
|
nval[3] = (uint8_t)val;
|
|
return curlx_dyn_addn(buf, nval, sizeof(nval));
|
|
}
|
|
|
|
static CURLcode
|
|
spack_dec32(uint32_t *val, const uint8_t **src, const uint8_t *end)
|
|
{
|
|
if(end - *src < 4)
|
|
return CURLE_READ_ERROR;
|
|
*val = (uint32_t)(*src)[0] << 24 | (uint32_t)(*src)[1] << 16 |
|
|
(uint32_t)(*src)[2] << 8 | (*src)[3];
|
|
*src += 4;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode spack_enc64(struct dynbuf *buf, uint64_t val)
|
|
{
|
|
uint8_t nval[8];
|
|
nval[0] = (uint8_t)(val >> 56);
|
|
nval[1] = (uint8_t)(val >> 48);
|
|
nval[2] = (uint8_t)(val >> 40);
|
|
nval[3] = (uint8_t)(val >> 32); \
|
|
nval[4] = (uint8_t)(val >> 24);
|
|
nval[5] = (uint8_t)(val >> 16);
|
|
nval[6] = (uint8_t)(val >> 8);
|
|
nval[7] = (uint8_t)val;
|
|
return curlx_dyn_addn(buf, nval, sizeof(nval));
|
|
}
|
|
|
|
static CURLcode
|
|
spack_dec64(uint64_t *val, const uint8_t **src, const uint8_t *end)
|
|
{
|
|
if(end - *src < 8)
|
|
return CURLE_READ_ERROR;
|
|
*val = (uint64_t)(*src)[0] << 56 | (uint64_t)(*src)[1] << 48 |
|
|
(uint64_t)(*src)[2] << 40 | (uint64_t)(*src)[3] << 32 |
|
|
(uint64_t)(*src)[4] << 24 | (uint64_t)(*src)[5] << 16 |
|
|
(uint64_t)(*src)[6] << 8 | (*src)[7];
|
|
*src += 8;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode spack_encstr16(struct dynbuf *buf, const char *s)
|
|
{
|
|
size_t slen = strlen(s);
|
|
CURLcode r;
|
|
if(slen > UINT16_MAX)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
r = spack_enc16(buf, (uint16_t)slen);
|
|
if(!r) {
|
|
r = curlx_dyn_addn(buf, s, slen);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
static CURLcode
|
|
spack_decstr16(char **val, const uint8_t **src, const uint8_t *end)
|
|
{
|
|
uint16_t slen;
|
|
CURLcode r;
|
|
|
|
*val = NULL;
|
|
r = spack_dec16(&slen, src, end);
|
|
if(r)
|
|
return r;
|
|
if(end - *src < slen)
|
|
return CURLE_READ_ERROR;
|
|
*val = Curl_memdup0((const char *)(*src), slen);
|
|
*src += slen;
|
|
return *val ? CURLE_OK : CURLE_OUT_OF_MEMORY;
|
|
}
|
|
|
|
static CURLcode spack_encdata16(struct dynbuf *buf,
|
|
const uint8_t *data, size_t data_len)
|
|
{
|
|
CURLcode r;
|
|
if(data_len > UINT16_MAX)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
r = spack_enc16(buf, (uint16_t)data_len);
|
|
if(!r) {
|
|
r = curlx_dyn_addn(buf, data, data_len);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
static CURLcode
|
|
spack_decdata16(uint8_t **val, size_t *val_len,
|
|
const uint8_t **src, const uint8_t *end)
|
|
{
|
|
uint16_t data_len;
|
|
CURLcode r;
|
|
|
|
*val = NULL;
|
|
r = spack_dec16(&data_len, src, end);
|
|
if(r)
|
|
return r;
|
|
if(end - *src < data_len)
|
|
return CURLE_READ_ERROR;
|
|
*val = Curl_memdup0((const char *)(*src), data_len);
|
|
*val_len = data_len;
|
|
*src += data_len;
|
|
return *val ? CURLE_OK : CURLE_OUT_OF_MEMORY;
|
|
}
|
|
|
|
CURLcode Curl_ssl_session_pack(struct Curl_easy *data,
|
|
struct Curl_ssl_session *s,
|
|
struct dynbuf *buf)
|
|
{
|
|
CURLcode r;
|
|
DEBUGASSERT(s->sdata);
|
|
DEBUGASSERT(s->sdata_len);
|
|
|
|
if(s->valid_until < 0)
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
|
|
r = spack_enc8(buf, CURL_SPACK_VERSION);
|
|
if(!r)
|
|
r = spack_enc8(buf, CURL_SPACK_TICKET);
|
|
if(!r)
|
|
r = spack_encdata16(buf, s->sdata, s->sdata_len);
|
|
if(!r)
|
|
r = spack_enc8(buf, CURL_SPACK_IETF_ID);
|
|
if(!r)
|
|
r = spack_enc16(buf, (uint16_t)s->ietf_tls_id);
|
|
if(!r)
|
|
r = spack_enc8(buf, CURL_SPACK_VALID_UNTIL);
|
|
if(!r)
|
|
r = spack_enc64(buf, (uint64_t)s->valid_until);
|
|
if(!r && s->alpn) {
|
|
r = spack_enc8(buf, CURL_SPACK_ALPN);
|
|
if(!r)
|
|
r = spack_encstr16(buf, s->alpn);
|
|
}
|
|
if(!r && s->earlydata_max) {
|
|
if(s->earlydata_max > UINT32_MAX)
|
|
r = CURLE_BAD_FUNCTION_ARGUMENT;
|
|
if(!r)
|
|
r = spack_enc8(buf, CURL_SPACK_EARLYDATA);
|
|
if(!r)
|
|
r = spack_enc32(buf, (uint32_t)s->earlydata_max);
|
|
}
|
|
if(!r && s->quic_tp && s->quic_tp_len) {
|
|
r = spack_enc8(buf, CURL_SPACK_QUICTP);
|
|
if(!r)
|
|
r = spack_encdata16(buf, s->quic_tp, s->quic_tp_len);
|
|
}
|
|
|
|
if(r)
|
|
CURL_TRC_SSLS(data, "error packing data: %d", r);
|
|
return r;
|
|
}
|
|
|
|
CURLcode Curl_ssl_session_unpack(struct Curl_easy *data,
|
|
const void *bufv, size_t buflen,
|
|
struct Curl_ssl_session **ps)
|
|
{
|
|
struct Curl_ssl_session *s = NULL;
|
|
const unsigned char *buf = (const unsigned char *)bufv;
|
|
const unsigned char *end = buf + buflen;
|
|
uint8_t val8, *pval8;
|
|
uint16_t val16;
|
|
uint32_t val32;
|
|
uint64_t val64;
|
|
CURLcode r;
|
|
|
|
DEBUGASSERT(buf);
|
|
DEBUGASSERT(buflen);
|
|
*ps = NULL;
|
|
|
|
r = spack_dec8(&val8, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
if(val8 != CURL_SPACK_VERSION) {
|
|
r = CURLE_READ_ERROR;
|
|
goto out;
|
|
}
|
|
|
|
s = curlx_calloc(1, sizeof(*s));
|
|
if(!s) {
|
|
r = CURLE_OUT_OF_MEMORY;
|
|
goto out;
|
|
}
|
|
|
|
while(buf < end) {
|
|
r = spack_dec8(&val8, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
|
|
switch(val8) {
|
|
case CURL_SPACK_ALPN:
|
|
r = spack_decstr16(&s->alpn, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
break;
|
|
case CURL_SPACK_EARLYDATA:
|
|
r = spack_dec32(&val32, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
s->earlydata_max = val32;
|
|
break;
|
|
case CURL_SPACK_IETF_ID:
|
|
r = spack_dec16(&val16, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
s->ietf_tls_id = val16;
|
|
break;
|
|
case CURL_SPACK_QUICTP: {
|
|
r = spack_decdata16(&pval8, &s->quic_tp_len, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
s->quic_tp = pval8;
|
|
break;
|
|
}
|
|
case CURL_SPACK_TICKET: {
|
|
r = spack_decdata16(&pval8, &s->sdata_len, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
s->sdata = pval8;
|
|
break;
|
|
}
|
|
case CURL_SPACK_VALID_UNTIL:
|
|
r = spack_dec64(&val64, &buf, end);
|
|
if(r)
|
|
goto out;
|
|
s->valid_until = (curl_off_t)val64;
|
|
break;
|
|
default: /* unknown tag */
|
|
r = CURLE_READ_ERROR;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
out:
|
|
if(r) {
|
|
CURL_TRC_SSLS(data, "error unpacking data: %d", r);
|
|
Curl_ssl_session_destroy(s);
|
|
}
|
|
else
|
|
*ps = s;
|
|
return r;
|
|
}
|
|
|
|
#endif /* USE_SSL && USE_SSLS_EXPORT */
|