mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -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)
171 lines
5.2 KiB
C
Vendored
Generated
171 lines
5.2 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
* RFC2104 Keyed-Hashing for Message Authentication
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) || \
|
|
!defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \
|
|
defined(USE_SSL)
|
|
|
|
#include "curl_hmac.h"
|
|
|
|
/*
|
|
* Generic HMAC algorithm.
|
|
*
|
|
* This module computes HMAC digests based on any hash function. Parameters
|
|
* and computing procedures are setup dynamically at HMAC computation context
|
|
* initialization.
|
|
*/
|
|
|
|
static const unsigned char hmac_ipad = 0x36;
|
|
static const unsigned char hmac_opad = 0x5C;
|
|
|
|
struct HMAC_context *Curl_HMAC_init(const struct HMAC_params *hashparams,
|
|
const unsigned char *key,
|
|
unsigned int keylen)
|
|
{
|
|
size_t i;
|
|
struct HMAC_context *ctxt;
|
|
unsigned char *hkey;
|
|
unsigned char b;
|
|
|
|
/* Create HMAC context. */
|
|
i = sizeof(*ctxt) + (2 * hashparams->ctxtsize) + hashparams->resultlen;
|
|
ctxt = curlx_malloc(i);
|
|
|
|
if(!ctxt)
|
|
return ctxt;
|
|
|
|
ctxt->hash = hashparams;
|
|
ctxt->hashctxt1 = (void *)(ctxt + 1);
|
|
ctxt->hashctxt2 = (void *)((char *)ctxt->hashctxt1 + hashparams->ctxtsize);
|
|
|
|
/* If the key is too long, replace it by its hash digest. */
|
|
if(keylen > hashparams->maxkeylen) {
|
|
if(hashparams->hinit(ctxt->hashctxt1))
|
|
goto fail;
|
|
hashparams->hupdate(ctxt->hashctxt1, key, keylen);
|
|
hkey = (unsigned char *)ctxt->hashctxt2 + hashparams->ctxtsize;
|
|
hashparams->hfinal(hkey, ctxt->hashctxt1);
|
|
key = hkey;
|
|
keylen = hashparams->resultlen;
|
|
}
|
|
|
|
/* Prime the two hash contexts with the modified key. */
|
|
if(hashparams->hinit(ctxt->hashctxt1) ||
|
|
hashparams->hinit(ctxt->hashctxt2))
|
|
goto fail;
|
|
|
|
for(i = 0; i < keylen; i++) {
|
|
b = (unsigned char)(*key ^ hmac_ipad);
|
|
hashparams->hupdate(ctxt->hashctxt1, &b, 1);
|
|
b = (unsigned char)(*key++ ^ hmac_opad);
|
|
hashparams->hupdate(ctxt->hashctxt2, &b, 1);
|
|
}
|
|
|
|
for(; i < hashparams->maxkeylen; i++) {
|
|
hashparams->hupdate(ctxt->hashctxt1, &hmac_ipad, 1);
|
|
hashparams->hupdate(ctxt->hashctxt2, &hmac_opad, 1);
|
|
}
|
|
|
|
/* Done, return pointer to HMAC context. */
|
|
return ctxt;
|
|
|
|
fail:
|
|
curlx_free(ctxt);
|
|
return NULL;
|
|
}
|
|
|
|
void Curl_HMAC_update(struct HMAC_context *ctxt,
|
|
const unsigned char *data,
|
|
unsigned int len)
|
|
{
|
|
/* Update first hash calculation. */
|
|
ctxt->hash->hupdate(ctxt->hashctxt1, data, len);
|
|
}
|
|
|
|
int Curl_HMAC_final(struct HMAC_context *ctxt, unsigned char *output)
|
|
{
|
|
const struct HMAC_params *hashparams = ctxt->hash;
|
|
|
|
/* Do not get output if called with a null parameter: only release
|
|
storage. */
|
|
|
|
if(!output)
|
|
output = (unsigned char *)ctxt->hashctxt2 + ctxt->hash->ctxtsize;
|
|
|
|
hashparams->hfinal(output, ctxt->hashctxt1);
|
|
hashparams->hupdate(ctxt->hashctxt2, output, hashparams->resultlen);
|
|
hashparams->hfinal(output, ctxt->hashctxt2);
|
|
curlx_free(ctxt);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Curl_hmacit()
|
|
*
|
|
* This is used to generate a HMAC hash, for the specified input data, given
|
|
* the specified hash function and key.
|
|
*
|
|
* Parameters:
|
|
*
|
|
* hashparams [in] - The hash function (Curl_HMAC_MD5).
|
|
* key [in] - The key to use.
|
|
* keylen [in] - The length of the key.
|
|
* buf [in] - The data to encrypt.
|
|
* buflen [in] - The length of the data.
|
|
* output [in/out] - The output buffer.
|
|
*
|
|
* Returns CURLE_OK on success.
|
|
*/
|
|
CURLcode Curl_hmacit(const struct HMAC_params *hashparams,
|
|
const unsigned char *key, const size_t keylen,
|
|
const unsigned char *data, size_t datalen,
|
|
unsigned char *output)
|
|
{
|
|
struct HMAC_context *ctxt;
|
|
if(keylen > UINT_MAX) /* unlikely to ever happen */
|
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
|
ctxt = Curl_HMAC_init(hashparams, key, curlx_uztoui(keylen));
|
|
|
|
if(!ctxt)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* Update the digest with the given challenge */
|
|
do {
|
|
unsigned int ilen = (unsigned int)CURLMIN(datalen, UINT_MAX);
|
|
Curl_HMAC_update(ctxt, data, ilen);
|
|
datalen -= ilen;
|
|
data += ilen;
|
|
} while(datalen);
|
|
|
|
/* Finalise the digest */
|
|
Curl_HMAC_final(ctxt, output);
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif /* Using NTLM (without SSPI) or AWS */
|