mirror of
https://github.com/open-goal/jak-project
synced 2026-09-11 20:41:41 -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)
126 lines
5.3 KiB
C
Vendored
Generated
126 lines
5.3 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_VTLS_CONFIG_H
|
|
#define HEADER_CURL_VTLS_CONFIG_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"
|
|
|
|
struct Curl_easy;
|
|
struct connectdata;
|
|
struct Curl_peer;
|
|
|
|
struct ssl_primary_config {
|
|
char *CApath; /* certificate directory (does not work on Windows) */
|
|
char *CAfile; /* certificate to verify peer against */
|
|
char *issuercert; /* optional issuer certificate filename */
|
|
char *clientcert;
|
|
char *cipher_list; /* list of ciphers to use */
|
|
char *cipher_list13; /* list of TLS 1.3 cipher suites to use */
|
|
char *signature_algorithms; /* list of signature algorithms to use */
|
|
char *pinned_key;
|
|
char *CRLfile; /* CRL to check certificate revocation */
|
|
char *cert_type; /* format for certificate (default: PEM) */
|
|
char *key; /* private key filename */
|
|
char *key_type; /* format for private key (default: PEM) */
|
|
char *key_passwd; /* plain text private key password */
|
|
struct curl_blob *cert_blob;
|
|
struct curl_blob *ca_info_blob;
|
|
struct curl_blob *issuercert_blob;
|
|
struct curl_blob *key_blob;
|
|
#ifdef USE_TLS_SRP
|
|
char *username; /* TLS username (for, e.g., SRP) */
|
|
char *password; /* TLS password (for, e.g., SRP) */
|
|
#endif
|
|
char *curves; /* list of curves to use */
|
|
uint32_t version_max; /* max supported version the client wants to use */
|
|
uint8_t ssl_options; /* the CURLOPT_SSL_OPTIONS bitmask */
|
|
uint8_t version; /* what version the client wants to use */
|
|
BIT(verifypeer); /* set TRUE if this is desired */
|
|
BIT(verifyhost); /* set TRUE if CN/SAN must match hostname */
|
|
BIT(verifystatus); /* set TRUE if certificate status must be checked */
|
|
BIT(cache_session); /* cache session or not */
|
|
BIT(deep_copy); /* members are deep copies, eg. owned here */
|
|
};
|
|
|
|
struct ssl_config_data {
|
|
struct ssl_primary_config primary;
|
|
long certverifyresult; /* result from the certificate verification */
|
|
curl_ssl_ctx_callback fsslctx; /* function to initialize SSL ctx */
|
|
void *fsslctxp; /* parameter for call back */
|
|
BIT(certinfo); /* gather lots of certificate info */
|
|
BIT(earlydata); /* use TLS 1.3 early data */
|
|
BIT(enable_beast); /* allow this flaw for interoperability's sake */
|
|
BIT(no_revoke); /* disable SSL certificate revocation checks */
|
|
BIT(no_partialchain); /* do not accept partial certificate chains */
|
|
BIT(revoke_best_effort); /* ignore SSL revocation offline/missing revocation
|
|
list errors */
|
|
BIT(native_ca_store); /* use the native CA store of operating system */
|
|
BIT(auto_client_cert); /* automatically locate and use a client
|
|
certificate for authentication (Schannel) */
|
|
BIT(custom_cafile); /* application has set custom CA file */
|
|
BIT(custom_capath); /* application has set custom CA path */
|
|
BIT(custom_cablob); /* application has set custom CA blob */
|
|
};
|
|
|
|
struct ssl_general_config {
|
|
int ca_cache_timeout; /* Certificate store cache timeout (seconds) */
|
|
};
|
|
|
|
void Curl_ssl_config_init(struct ssl_primary_config *sslc);
|
|
void Curl_ssl_config_cleanup(struct ssl_primary_config *sslc);
|
|
|
|
/**
|
|
* Init the `data->set.ssl` and `data->set.proxy_ssl` for
|
|
* connection matching use.
|
|
*/
|
|
CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data,
|
|
struct Curl_peer *origin);
|
|
|
|
/**
|
|
* Init SSL configs (main + proxy) for a new connection from the easy handle.
|
|
*/
|
|
CURLcode Curl_ssl_conn_config_init(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
/**
|
|
* Free allocated resources in SSL configs (main + proxy) for
|
|
* the given connection.
|
|
*/
|
|
void Curl_ssl_conn_config_cleanup(struct connectdata *conn);
|
|
|
|
/**
|
|
* Return TRUE iff SSL configuration from `data` is functionally the
|
|
* same as the one on `candidate`.
|
|
* @param proxy match the proxy SSL config or the main one
|
|
*/
|
|
bool Curl_ssl_conn_config_match(struct Curl_easy *data,
|
|
struct connectdata *candidate,
|
|
bool proxy);
|
|
|
|
/* Update certain connection SSL config flags after they have
|
|
* been changed on the easy handle. Works for `verifypeer`,
|
|
* `verifyhost` and `verifystatus`. */
|
|
void Curl_ssl_conn_config_update(struct Curl_easy *data, bool for_proxy);
|
|
|
|
#endif /* HEADER_CURL_VTLS_CONFIG_H */
|