mirror of
https://github.com/curl/curl.git
synced 2026-04-11 12:01:42 +08:00
3058ed3df8
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
45 lines
1.9 KiB
C
45 lines
1.9 KiB
C
#ifndef HEADER_CURL_CIPHER_SUITE_H
|
|
#define HEADER_CURL_CIPHER_SUITE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Jan Venekamp, <jan@venekamp.net>
|
|
*
|
|
* 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_MBEDTLS) || defined(USE_RUSTLS)
|
|
|
|
/* Lookup IANA id for cipher suite string, returns 0 if not recognized */
|
|
uint16_t Curl_cipher_suite_lookup_id(const char *cs_str, size_t cs_len);
|
|
|
|
/* Walk over cipher suite string, update str and end pointers to next
|
|
cipher suite in string, returns IANA id of that suite if recognized */
|
|
uint16_t Curl_cipher_suite_walk_str(const char **str, const char **end);
|
|
|
|
/* Copy openssl or RFC name for cipher suite in supplied buffer.
|
|
Caller is responsible to supply sufficiently large buffer (size
|
|
of 64 should suffice), excess bytes are silently truncated. */
|
|
int Curl_cipher_suite_get_str(uint16_t id, char *buf, size_t buf_size,
|
|
bool prefer_rfc);
|
|
|
|
#endif /* defined(USE_MBEDTLS) || defined(USE_RUSTLS) */
|
|
#endif /* HEADER_CURL_CIPHER_SUITE_H */
|