mirror of
https://github.com/curl/curl.git
synced 2026-07-30 05:48:03 +03:00
Backtrack on previous change that aimed to solve the wrong `share.h` being included. It turns out it did not fix this issue. At the same time it introduced relative header filenames and the need to include the same headers differently depending on the source files' location, reducing readability and editability. Replace this method by re-adding curl's lib source directory to the header path and addressing headers by the their full, relative name to that base directory. Aligning with this method already used in src and tests. With these advantages: - makes includes easier to read, recognize, grep, sort, write, and copy between sources, - syncs the way these headers are included across curl components, - avoids the ambiguity between system `schannel.h`, `rustls.h` vs. local headers using the same names in `lib/vtls`, - silences clang-tidy `readability-duplicate-include` checker, which detects the above issue, Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html - possibly silences TIOBE coding standard warnings: `6.10.2.a: Don't use relative paths in #include statements.` - long shot: it works well with concatenated test sources, for clang-tidy-friendly custom unity builds. Ref: #20667 Slight downside: it's not enforced. If there happens to be a collision between a local `lib/*.h` header and a system one, the solution is to rename (possibly with its `.c` counterpart) into the `curl_` namespace. This is also the method used by curl in the past. Also: - curlx/inet_pton: reduce scope of an include. - toolx/tool_time: apply this to an include, and update VS project files accordingly. Also dropping unnecessary lib/curlx header path. - clang-tidy: enable `readability-duplicate-include`. Follow-up to3887069c66#19676 Follow-up to625f2c1644#16991 #16949 Closes #20623
147 lines
3.8 KiB
C
147 lines
3.8 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_OPENSSL) || \
|
|
defined(USE_GNUTLS) || \
|
|
defined(USE_WOLFSSL) || \
|
|
(defined(USE_NGTCP2) && defined(USE_NGHTTP3)) || \
|
|
defined(USE_QUICHE) || \
|
|
defined(USE_RUSTLS)
|
|
|
|
#include "vtls/keylog.h"
|
|
#include "escape.h"
|
|
#include "curlx/fopen.h"
|
|
|
|
/* The fp for the open SSLKEYLOGFILE, or NULL if not open */
|
|
static FILE *keylog_file_fp;
|
|
|
|
void Curl_tls_keylog_open(void)
|
|
{
|
|
char *keylog_file_name;
|
|
|
|
if(!keylog_file_fp) {
|
|
keylog_file_name = curl_getenv("SSLKEYLOGFILE");
|
|
if(keylog_file_name) {
|
|
keylog_file_fp = curlx_fopen(keylog_file_name, FOPEN_APPENDTEXT);
|
|
if(keylog_file_fp) {
|
|
#ifdef _WIN32
|
|
if(setvbuf(keylog_file_fp, NULL, _IONBF, 0))
|
|
#else
|
|
if(setvbuf(keylog_file_fp, NULL, _IOLBF, 4096))
|
|
#endif
|
|
{
|
|
curlx_fclose(keylog_file_fp);
|
|
keylog_file_fp = NULL;
|
|
}
|
|
}
|
|
Curl_safefree(keylog_file_name);
|
|
}
|
|
}
|
|
}
|
|
|
|
void Curl_tls_keylog_close(void)
|
|
{
|
|
if(keylog_file_fp) {
|
|
curlx_fclose(keylog_file_fp);
|
|
keylog_file_fp = NULL;
|
|
}
|
|
}
|
|
|
|
bool Curl_tls_keylog_enabled(void)
|
|
{
|
|
return keylog_file_fp != NULL;
|
|
}
|
|
|
|
bool Curl_tls_keylog_write_line(const char *line)
|
|
{
|
|
/* The current maximum valid keylog line length LF and NUL is 195. */
|
|
size_t linelen;
|
|
char buf[256];
|
|
|
|
if(!keylog_file_fp || !line) {
|
|
return FALSE;
|
|
}
|
|
|
|
linelen = strlen(line);
|
|
if(linelen == 0 || linelen > sizeof(buf) - 2) {
|
|
/* Empty line or too big to fit in an LF and NUL. */
|
|
return FALSE;
|
|
}
|
|
|
|
memcpy(buf, line, linelen);
|
|
if(line[linelen - 1] != '\n') {
|
|
buf[linelen++] = '\n';
|
|
}
|
|
buf[linelen] = '\0';
|
|
|
|
/* Using fputs here instead of fprintf since libcurl's fprintf replacement
|
|
may not be thread-safe. */
|
|
fputs(buf, keylog_file_fp);
|
|
return TRUE;
|
|
}
|
|
|
|
bool Curl_tls_keylog_write(const char *label,
|
|
const unsigned char client_random[CLIENT_RANDOM_SIZE],
|
|
const unsigned char *secret, size_t secretlen)
|
|
{
|
|
size_t pos, i;
|
|
unsigned char line[KEYLOG_LABEL_MAXLEN + 1 + 2 * CLIENT_RANDOM_SIZE + 1 +
|
|
2 * SECRET_MAXLEN + 1 + 1];
|
|
|
|
if(!keylog_file_fp) {
|
|
return FALSE;
|
|
}
|
|
|
|
pos = strlen(label);
|
|
if(pos > KEYLOG_LABEL_MAXLEN || !secretlen || secretlen > SECRET_MAXLEN) {
|
|
/* Should never happen - sanity check anyway. */
|
|
return FALSE;
|
|
}
|
|
|
|
memcpy(line, label, pos);
|
|
line[pos++] = ' ';
|
|
|
|
/* Client Random */
|
|
for(i = 0; i < CLIENT_RANDOM_SIZE; i++) {
|
|
Curl_hexbyte(&line[pos], client_random[i]);
|
|
pos += 2;
|
|
}
|
|
line[pos++] = ' ';
|
|
|
|
/* Secret */
|
|
for(i = 0; i < secretlen; i++) {
|
|
Curl_hexbyte(&line[pos], secret[i]);
|
|
pos += 2;
|
|
}
|
|
line[pos++] = '\n';
|
|
line[pos] = '\0';
|
|
|
|
/* Using fputs here instead of fprintf since libcurl's fprintf replacement
|
|
may not be thread-safe. */
|
|
fputs((char *)line, keylog_file_fp);
|
|
return TRUE;
|
|
}
|
|
|
|
#endif /* TLS or QUIC backend */
|