mirror of
https://github.com/open-goal/jak-project
synced 2026-09-12 04:49:19 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
217 lines
9.4 KiB
C
Vendored
Generated
217 lines
9.4 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_VTLS_SCACHE_H
|
|
#define HEADER_CURL_VTLS_SCACHE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
#ifdef USE_SSL
|
|
|
|
#include "cfilters.h"
|
|
#include "urldata.h"
|
|
|
|
struct Curl_cfilter;
|
|
struct Curl_easy;
|
|
struct Curl_ssl_scache;
|
|
struct Curl_ssl_session;
|
|
struct ssl_peer;
|
|
|
|
/* RFC 8446 (TLSv1.3) restrict lifetime to one week max, for
|
|
* other, less secure versions, we restrict it to a day */
|
|
#define CURL_SCACHE_MAX_13_LIFETIME_SEC (60 * 60 * 24 * 7)
|
|
#define CURL_SCACHE_MAX_12_LIFETIME_SEC (60 * 60 * 24)
|
|
|
|
/* Create a session cache for up to max_peers endpoints with a total
|
|
* of up to max_sessions SSL sessions per peer */
|
|
CURLcode Curl_ssl_scache_create(size_t max_peers,
|
|
size_t max_sessions_per_peer,
|
|
struct Curl_ssl_scache **pscache);
|
|
|
|
void Curl_ssl_scache_destroy(struct Curl_ssl_scache *scache);
|
|
|
|
/* Create a key from peer and TLS configuration information that is
|
|
* unique for how the connection filter wants to establish a TLS
|
|
* connection to the peer.
|
|
* If the filter is a TLS proxy filter, it uses the proxy relevant
|
|
* information.
|
|
* @param peer the peer the filter wants to talk to
|
|
* @param sslc the relevant ssl configuration
|
|
* @param tls_id identifier of TLS implementation for sessions. Should
|
|
* include full version if session data from other versions
|
|
* is to be avoided.
|
|
* @param ppeer_key on successful return, the key generated
|
|
*/
|
|
CURLcode Curl_ssl_peer_key_make(const struct ssl_peer *peer,
|
|
struct ssl_primary_config *sslc,
|
|
const char *tls_id,
|
|
char **ppeer_key);
|
|
|
|
/* Return if there is a session cache shall be used.
|
|
* An SSL session might not be configured or not available for
|
|
* "connect-only" transfers.
|
|
*/
|
|
bool Curl_ssl_scache_use(struct Curl_cfilter *cf, struct Curl_easy *data);
|
|
|
|
/* Lock session cache mutex.
|
|
* Call this before calling other Curl_ssl_*session* functions
|
|
* Caller should unlock this mutex as soon as possible, as it may block
|
|
* other SSL connection from making progress.
|
|
* The purpose of explicitly locking SSL session cache data is to allow
|
|
* individual SSL engines to manage session lifetime in their specific way.
|
|
*/
|
|
void Curl_ssl_scache_lock(struct Curl_easy *data);
|
|
|
|
/* Unlock session cache mutex */
|
|
void Curl_ssl_scache_unlock(struct Curl_easy *data);
|
|
|
|
/* Get TLS session object from the cache for the ssl_peer_key.
|
|
* scache mutex must be locked (see Curl_ssl_scache_lock).
|
|
* Caller must make sure that the ownership of returned session object
|
|
* is properly taken (e.g. its refcount is incremented
|
|
* under scache mutex).
|
|
* @param cf the connection filter wanting to use it
|
|
* @param data the transfer involved
|
|
* @param ssl_peer_key the key for lookup
|
|
* @retval sobj the object for the peer key or NULL
|
|
*/
|
|
void *Curl_ssl_scache_get_obj(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key);
|
|
|
|
typedef void Curl_ssl_scache_obj_dtor(void *sobj);
|
|
|
|
/* Add a TLS session related object to the cache.
|
|
* Replaces an existing object with the same peer_key.
|
|
* scache mutex must be locked (see Curl_ssl_scache_lock).
|
|
* Call takes ownership of `sobj`, using `sobj_dtor_cb`
|
|
* to deallocate it. Is called in all outcomes, either right away or
|
|
* later when the session cache is cleaned up.
|
|
* Caller must ensure that it has properly shared ownership of `sobj`
|
|
* with cache (e.g. incrementing refcount on success)
|
|
* @param cf the connection filter wanting to use it
|
|
* @param data the transfer involved
|
|
* @param ssl_peer_key the key for lookup
|
|
* @param sobj the TLS session object
|
|
* @param sobj_free_cb callback to free the session object
|
|
*/
|
|
CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key,
|
|
void *sobj,
|
|
Curl_ssl_scache_obj_dtor *sobj_dtor_cb);
|
|
|
|
/* All about an SSL session ticket */
|
|
struct Curl_ssl_session {
|
|
const void *sdata; /* session ticket data, plain bytes */
|
|
size_t sdata_len; /* number of bytes in sdata */
|
|
curl_off_t valid_until; /* seconds since EPOCH until ticket expires */
|
|
int ietf_tls_id; /* TLS protocol identifier negotiated */
|
|
char *alpn; /* APLN TLS negotiated protocol string */
|
|
size_t earlydata_max; /* max 0-RTT data supported by peer */
|
|
const unsigned char *quic_tp; /* Optional QUIC transport param bytes */
|
|
size_t quic_tp_len; /* number of bytes in quic_tp */
|
|
struct Curl_llist_node list; /* internal storage handling */
|
|
};
|
|
|
|
/* Create a `session` instance. Does NOT need locking.
|
|
* Takes ownership of `sdata` and `sobj` regardless of return code.
|
|
* @param sdata bytes of SSL session data or NULL (sobj then required)
|
|
* @param sdata_len amount of session data bytes
|
|
* @param ietf_tls_id IETF protocol version, e.g. 0x304 for TLSv1.3
|
|
* @param alpn ALPN protocol selected or NULL
|
|
* @param valid_until seconds since EPOCH when session expires, pass 0
|
|
* in case this is not known.
|
|
* @param psession on return the scached session instance created
|
|
*/
|
|
CURLcode Curl_ssl_session_create(void *sdata, size_t sdata_len,
|
|
int ietf_tls_id, const char *alpn,
|
|
curl_off_t valid_until, size_t earlydata_max,
|
|
struct Curl_ssl_session **psession);
|
|
|
|
/* Variation of session creation with quic transport parameter bytes,
|
|
* Takes ownership of `quic_tp` regardless of return code. */
|
|
CURLcode Curl_ssl_session_create2(void *sdata, size_t sdata_len,
|
|
int ietf_tls_id, const char *alpn,
|
|
curl_off_t valid_until, size_t earlydata_max,
|
|
unsigned char *quic_tp, size_t quic_tp_len,
|
|
struct Curl_ssl_session **psession);
|
|
|
|
/* Destroy a `session` instance. Can be called with NULL.
|
|
* Does NOT need locking. */
|
|
void Curl_ssl_session_destroy(struct Curl_ssl_session *s);
|
|
|
|
/* Put the scache session into the cache. Does NOT need locking.
|
|
* Call takes ownership of `s` in all outcomes.
|
|
* @param cf the connection filter wanting to use it
|
|
* @param data the transfer involved
|
|
* @param ssl_peer_key the key for lookup
|
|
* @param s the scache session object
|
|
*/
|
|
CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key,
|
|
struct Curl_ssl_session *s);
|
|
|
|
/* Take a matching scache session from the cache. Does NOT need locking.
|
|
* @param cf the connection filter wanting to use it
|
|
* @param data the transfer involved
|
|
* @param ssl_peer_key the key for lookup
|
|
* @param s on return, the scache session object or NULL
|
|
*/
|
|
CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key,
|
|
struct Curl_ssl_session **ps);
|
|
|
|
/* Return a taken scache session to the cache. Does NOT need locking.
|
|
* Depending on TLS version and other criteria, it may cache it again
|
|
* or destroy it. Maybe called with a NULL session.
|
|
*/
|
|
void Curl_ssl_scache_return(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key,
|
|
struct Curl_ssl_session *s);
|
|
|
|
/* Remove all sessions and obj for the peer_key. Does NOT need locking. */
|
|
void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf,
|
|
struct Curl_easy *data,
|
|
const char *ssl_peer_key);
|
|
|
|
#ifdef USE_SSLS_EXPORT
|
|
|
|
bool Curl_ssl_scache_is_locked(struct Curl_easy *data);
|
|
|
|
CURLcode Curl_ssl_session_import(struct Curl_easy *data,
|
|
const char *ssl_peer_key,
|
|
const unsigned char *shmac, size_t shmac_len,
|
|
const void *sdata, size_t sdata_len);
|
|
|
|
CURLcode Curl_ssl_session_export(struct Curl_easy *data,
|
|
curl_ssls_export_cb *export_fn,
|
|
void *userptr);
|
|
|
|
#endif /* USE_SSLS_EXPORT */
|
|
#endif /* USE_SSL */
|
|
|
|
#endif /* HEADER_CURL_VTLS_SCACHE_H */
|