From 496c3646881bc89149dd78f238dea7ac136366b7 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 21:42:20 -0800 Subject: [PATCH 1/6] chore(quest): claim quest/m1/rind/README.md Quest-Claim: c0496d26aafa2236 From 316cfde8dfa8d8c29bd7355c19b9d15ea5fde0a9 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 23:14:33 -0800 Subject: [PATCH 2/6] chore(rind): drop aws-lc-rs, guard against C crypto, and ship moq-cli for armv7 The last rind child landed, so this is the epic's own work: - aws-lc-rs and aws-lc-sys leave Cargo.lock. Their last edges were dev-only: moq-auth's released-verifier fixtures (published moq-auth 0.2.1 and moq-token 0.7) and moq-archive's object_store `aws` feature. The fixtures become pinned wire JSON; the S3 test takes rind's provider. - `sh/rs/crypto.py`, run from `just rs lint`, walks every target a workflow names and fails on aws-lc-sys, ring, or openssl-sys in the normal/build graph, or on a crypto crate reaching `cc`. - moq-cli ships an armv7-unknown-linux-gnueabihf release with v4l2: a tarball, an armhf .deb on apt.moq.dev, and moq.sh support, including a 32-bit OS on a 64-bit kernel. - Tests that built a bare reqwest client now install rind's provider, as main does; aws-lc had filled that slot through feature unification. Co-Authored-By: Claude Opus 5.5 --- .github/actions/nasm/action.yml | 2 +- .github/workflows/moq-cli.yml | 3 + .github/workflows/release-binary.yml | 66 ++- .github/workflows/release-c.yml | 2 +- .github/workflows/release-cpp.yml | 2 +- Cargo.lock | 465 +-------------------- Cargo.toml | 27 +- doc/bin/cli.md | 6 +- doc/setup/install.md | 8 +- infra/apt/publish.sh | 2 +- infra/apt/src/worker.ts | 2 +- infra/moq-sh/install.sh | 13 +- infra/moq-sh/install.test.sh | 28 +- quest/m1/README.md | 1 - quest/m1/rind/README.md | 64 --- quest/m2/README.md | 1 - rs/justfile | 7 +- rs/moq-archive/Cargo.toml | 3 +- rs/moq-archive/src/producer/backends.rs | 2 + rs/moq-auth/Cargo.toml | 2 - rs/moq-auth/src/crypto.rs | 4 +- rs/moq-auth/tests/released_token.rs | 150 +++---- rs/moq-cli/src/auth.rs | 2 + rs/moq-relay/src/internal.rs | 1 + rs/moq-relay/src/test_support.rs | 1 + rs/moq-relay/tests/integration/embed.rs | 1 + rs/moq-relay/tests/integration/refusals.rs | 1 + rs/workspace-hack/Cargo.toml | 148 ++----- sh/dart/generate.sh | 2 +- sh/rs/crypto.py | 86 ++++ 30 files changed, 328 insertions(+), 774 deletions(-) delete mode 100644 quest/m1/rind/README.md create mode 100644 sh/rs/crypto.py diff --git a/.github/actions/nasm/action.yml b/.github/actions/nasm/action.yml index 2fa0c54c48f..1642fb75d17 100644 --- a/.github/actions/nasm/action.yml +++ b/.github/actions/nasm/action.yml @@ -1,5 +1,5 @@ name: Install NASM -description: Install the pinned NASM on a Windows runner, where aws-lc-rs assembles its x86_64 crypto with it. +description: Install the pinned NASM on a Windows runner, where openh264 assembles its x86_64 kernels with it. runs: using: composite diff --git a/.github/workflows/moq-cli.yml b/.github/workflows/moq-cli.yml index 0f4c2c1e9ce..64d80aca73c 100644 --- a/.github/workflows/moq-cli.yml +++ b/.github/workflows/moq-cli.yml @@ -22,6 +22,9 @@ jobs: with: crate: moq-cli bin: moq + # armv7 serves boards running a 32-bit OS, whose SoC codecs v4l2 reaches. + linux-targets: '["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "armv7-unknown-linux-gnueabihf"]' + linux-features: v4l2 permissions: contents: write actions: write diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 03943b08658..2c302f742a4 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -16,6 +16,16 @@ on: description: "Executable the package ships, e.g. moq" required: true type: string + linux-targets: + description: "JSON list of the Linux targets to build" + required: false + type: string + default: '["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]' + linux-features: + description: "Cargo features the Linux builds add, comma-separated" + required: false + type: string + default: "" permissions: contents: read @@ -27,23 +37,14 @@ env: jobs: build: name: Build (${{ matrix.target }}) - runs-on: ${{ matrix.runs-on }} + # Native runners for x86_64 and aarch64; armv7 cross-compiles on arm64. + # zig links every target against glibc 2.34, whatever the runner has. + runs-on: ${{ startsWith(matrix.target, 'x86_64') && 'ubuntu-22.04' || 'ubuntu-22.04-arm' }} strategy: fail-fast: false matrix: - include: - # Native runners. Each binary is built on the same arch it ships - # for, so the .deb/.rpm linkage matches the distro's glibc on the - # oldest LTS we support (Ubuntu 22.04 / AlmaLinux 9). - - target: x86_64-unknown-linux-gnu - runs-on: ubuntu-22.04 - deb-arch: amd64 - rpm-arch: x86_64 - - target: aarch64-unknown-linux-gnu - runs-on: ubuntu-22.04-arm - deb-arch: arm64 - rpm-arch: aarch64 + target: ${{ fromJSON(inputs.linux-targets) }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -65,11 +66,40 @@ jobs: - name: Set up packaging tools uses: ./.github/actions/setup-packaging + # Debian and RPM name each architecture their own way. AlmaLinux 9 ships + # no 32-bit ARM, so armv7 is a .deb and a tarball only. + - name: Package architectures + id: arch + shell: bash + env: + TARGET: ${{ matrix.target }} + run: | + case "$TARGET" in + x86_64-unknown-linux-gnu) echo "deb=amd64 rpm=x86_64" ;; + aarch64-unknown-linux-gnu) echo "deb=arm64 rpm=aarch64" ;; + armv7-unknown-linux-gnueabihf) echo "deb=armhf rpm=" ;; + *) echo "no package architecture for $TARGET" >&2; exit 1 ;; + esac | tr ' ' '\n' >> "$GITHUB_OUTPUT" + + # cargo-zigbuild writes the arm-features.h glibc lacks into zig's lib + # directory (ziglang/zig#3287), which the Nix store keeps read-only. + - name: Writable zig for 32-bit ARM + if: startsWith(matrix.target, 'armv7') + shell: bash + run: | # zizmor: ignore[github-env] a copy of the Nix store zig this job already runs. + zig=$(readlink -f "$(command -v zig)") + cp -rL --no-preserve=mode "$(dirname "$(dirname "$zig")")" "$RUNNER_TEMP/zig" + chmod +x "$RUNNER_TEMP/zig/bin/zig" + echo "CARGO_ZIGBUILD_ZIG_PATH=$RUNNER_TEMP/zig/bin/zig" >> "$GITHUB_ENV" + - name: Build (release, glibc 2.34) shell: bash + env: + TARGET: ${{ matrix.target }} + FEATURES: ${{ inputs.linux-features }} # Pin to glibc 2.34 so one binary covers Ubuntu 22.04+ (.deb) # and AlmaLinux/RHEL/Rocky 9+ (.rpm). - run: cargo zigbuild --locked --release --target ${{ matrix.target }}.2.34 -p "$CRATE" + run: cargo zigbuild --locked --release --target "$TARGET.2.34" -p "$CRATE" --features "$FEATURES" - name: Package release assets shell: bash @@ -92,7 +122,7 @@ jobs: shell: bash env: VERSION: ${{ steps.parse.outputs.version }} - ARCH: ${{ matrix.deb-arch }} + ARCH: ${{ steps.arch.outputs.deb }} BINARY_PATH: target/${{ matrix.target }}/release/${{ inputs.bin }} run: | just rs package-nfpm "packaging/$CRATE/nfpm.yaml" deb dist/ @@ -101,10 +131,11 @@ jobs: fi - name: Package .rpm + if: steps.arch.outputs.rpm != '' shell: bash env: VERSION: ${{ steps.parse.outputs.version }} - ARCH: ${{ matrix.rpm-arch }} + ARCH: ${{ steps.arch.outputs.rpm }} BINARY_PATH: target/${{ matrix.target }}/release/${{ inputs.bin }} run: just rs package-nfpm "packaging/$CRATE/nfpm.yaml" rpm dist/ @@ -181,9 +212,6 @@ jobs: with: targets: ${{ matrix.target }} - # aws-lc-rs assembles its x86_64 crypto with NASM on Windows. - - uses: ./.github/actions/nasm - - name: Parse version id: parse shell: bash diff --git a/.github/workflows/release-c.yml b/.github/workflows/release-c.yml index 010f1b26084..e7f7c164bcd 100644 --- a/.github/workflows/release-c.yml +++ b/.github/workflows/release-c.yml @@ -49,7 +49,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable - # aws-lc-rs assembles its x86_64 crypto with NASM on Windows. + # openh264 assembles its x86_64 kernels with NASM, or falls back to slower C. - uses: ./.github/actions/nasm if: runner.os == 'Windows' diff --git a/.github/workflows/release-cpp.yml b/.github/workflows/release-cpp.yml index a9cabd443d2..13bf54b9649 100644 --- a/.github/workflows/release-cpp.yml +++ b/.github/workflows/release-cpp.yml @@ -63,7 +63,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable - # aws-lc-rs assembles its x86_64 crypto with NASM on Windows. + # openh264 assembles its x86_64 kernels with NASM, or falls back to slower C. - uses: ./.github/actions/nasm if: runner.os == 'Windows' diff --git a/Cargo.lock b/Cargo.lock index 2bbc0785f5a..ba35e0e6f5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -542,30 +542,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "aws-lc-rs" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048006790404103c488e6c5616b3e7e702a71292aadda08e8f7698a9e0d2eb53" -dependencies = [ - "aws-lc-sys", - "untrusted 0.7.1", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bfbe32ac36b3c428696ce315464181bc4029d689fd58e3f2a4e58c252242f52" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", - "pkg-config", -] - [[package]] name = "axum" version = "0.8.9" @@ -655,12 +631,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "base16ct" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd307490d624467aa6f74b0eabb77633d1f758a7b25f12bceb0b22e08d9726f6" - [[package]] name = "base64" version = "0.22.1" @@ -1221,15 +1191,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" -[[package]] -name = "cmake" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" -dependencies = [ - "cc", -] - [[package]] name = "cmov" version = "0.5.4" @@ -1717,22 +1678,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-bigint" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c035cb64cba03dad2fb921f3e218785e8cf9a41790da5eb3a1400f62fa2be11" -dependencies = [ - "cpubits", - "ctutils", - "getrandom 0.4.3", - "hybrid-array", - "num-traits", - "rand_core 0.10.1", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.7" @@ -1749,9 +1694,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ - "getrandom 0.4.3", "hybrid-array", - "rand_core 0.10.1", ] [[package]] @@ -1779,7 +1722,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe3e9d21d39e6f39ff46e03d5b621424f88ee23d8a1672c6bfc9ccc7f2da4f6a" dependencies = [ "cmov", - "subtle", ] [[package]] @@ -1924,7 +1866,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ "const-oid 0.9.6", - "pem-rfc7468 0.7.0", "zeroize", ] @@ -1937,7 +1878,6 @@ dependencies = [ "const-oid 0.10.2", "der_derive", "flagset", - "pem-rfc7468 1.0.0", "zeroize", ] @@ -2040,7 +1980,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid 0.9.6", "crypto-common 0.1.7", "subtle", ] @@ -2140,12 +2079,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "dyn-clone" version = "1.0.20" @@ -2182,48 +2115,12 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ecdsa" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0681a4fc24c767085329728d8dfba959af91228aa4610cca4f8ce317ba46ae0" -dependencies = [ - "der 0.8.2", - "digest 0.11.3", - "elliptic-curve", - "rfc6979", - "signature 3.0.0", - "spki 0.8.1", - "zeroize", -] - [[package]] name = "either" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" -[[package]] -name = "elliptic-curve" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d65aa39b3a5c1c9c1b745c9a019234bb7a21b77abcb4f4d266d706e2d577d65" -dependencies = [ - "base16ct", - "crypto-bigint", - "crypto-common 0.2.2", - "digest 0.11.3", - "ff", - "group", - "hybrid-array", - "pem-rfc7468 1.0.0", - "pkcs8 0.11.0", - "rand_core 0.10.1", - "sec1", - "subtle", - "zeroize", -] - [[package]] name = "embedded-io" version = "0.4.0" @@ -2349,16 +2246,6 @@ dependencies = [ "getrandom 0.4.3", ] -[[package]] -name = "ff" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f" -dependencies = [ - "rand_core 0.10.1", - "subtle", -] - [[package]] name = "fiat-crypto" version = "0.3.0" @@ -2464,12 +2351,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures" version = "0.3.34" @@ -2598,10 +2479,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -2766,17 +2645,6 @@ dependencies = [ "windows", ] -[[package]] -name = "group" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4" -dependencies = [ - "ff", - "rand_core 0.10.1", - "subtle", -] - [[package]] name = "gst-plugin-version-helper" version = "0.8.4" @@ -3270,9 +3138,7 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" dependencies = [ - "subtle", "typenum", - "zeroize", ] [[package]] @@ -3769,14 +3635,13 @@ version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e75fe14a82d81e5f5af639997db37d8b96045938a7ac6ab18cdbe1c7467e05e1" dependencies = [ - "aws-lc-rs", "base64 0.22.1", "getrandom 0.2.17", "js-sys", "pem 3.0.6", "serde", "serde_json", - "signature 2.2.0", + "signature", "simple_asn1", "zeroize", ] @@ -3872,9 +3737,6 @@ name = "lazy_static" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" -dependencies = [ - "spin 0.9.9", -] [[package]] name = "libc" @@ -4271,6 +4133,7 @@ dependencies = [ "bytes", "futures", "kio", + "moq-crypto", "moq-net", "object_store", "percent-encoding", @@ -4333,11 +4196,9 @@ dependencies = [ "bench-harness", "jsonwebtoken", "kio", - "moq-auth 0.2.1", - "moq-auth 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "moq-auth", "moq-crypto", - "moq-pattern 0.1.2", - "moq-token", + "moq-pattern", "pkcs1", "pkcs8 0.11.0", "rand 0.10.3", @@ -4359,27 +4220,6 @@ dependencies = [ "workspace-hack", ] -[[package]] -name = "moq-auth" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee68e814b2a98cf61d528e26c5555eeb13fd99f32e5bdbfeecc37db49c06719" -dependencies = [ - "aws-lc-rs", - "base64 0.23.1", - "jsonwebtoken", - "kio", - "moq-pattern 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "p256", - "p384", - "rsa", - "serde", - "serde_json", - "serde_with", - "thiserror 2.0.21", - "url", -] - [[package]] name = "moq-bench" version = "0.1.0" @@ -4484,7 +4324,7 @@ dependencies = [ "libc", "moq-archive", "moq-audio", - "moq-auth 0.2.1", + "moq-auth", "moq-hls", "moq-json", "moq-mux", @@ -4760,7 +4600,7 @@ dependencies = [ "hashlink", "kio", "libc", - "moq-pattern 0.1.2", + "moq-pattern", "num_enum", "proptest", "rand 0.10.3", @@ -4813,21 +4653,12 @@ name = "moq-pattern" version = "0.1.2" dependencies = [ "bench-harness", - "moq-pattern 0.1.2", + "moq-pattern", "serde", "serde_json", "workspace-hack", ] -[[package]] -name = "moq-pattern" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc361de827f05fa2a1dfb6489cb73575a16ed5c56f3b1d218be9925176c7521" -dependencies = [ - "serde", -] - [[package]] name = "moq-quic" version = "0.1.0" @@ -4890,7 +4721,7 @@ dependencies = [ "hyper-util", "kio", "libc", - "moq-auth 0.2.1", + "moq-auth", "moq-congestion", "moq-crypto", "moq-net", @@ -4937,7 +4768,7 @@ name = "moq-room" version = "0.2.11" dependencies = [ "kio", - "moq-auth 0.2.1", + "moq-auth", "moq-json", "moq-net", "moq-room", @@ -5079,24 +4910,6 @@ dependencies = [ "workspace-hack", ] -[[package]] -name = "moq-token" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014ed664b93a4a1bde2547fc92604f3147d2087ed7577e069a33bb88662bb57b" -dependencies = [ - "aws-lc-rs", - "base64 0.23.1", - "jsonwebtoken", - "p256", - "p384", - "rsa", - "serde", - "serde_json", - "serde_with", - "thiserror 2.0.21", -] - [[package]] name = "moq-tokio" version = "0.19.23" @@ -5594,22 +5407,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -dependencies = [ - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.8", - "smallvec", - "zeroize", -] - [[package]] name = "num-complex" version = "0.4.6" @@ -6233,7 +6030,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1796bc93603f78c5760a69f2d58badc9618d22adade0a95385bb2adbae4eb94" dependencies = [ "async-trait", - "aws-lc-rs", "base64 0.23.1", "bytes", "chrono", @@ -6255,7 +6051,6 @@ dependencies = [ "quick-xml 0.41.0", "rand 0.10.3", "reqwest", - "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -6376,33 +6171,6 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "p256" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c9239b2dbc807adbbe147e8cf72ea7450c3a0aabe62cb8e75ff4ec22e1f72a" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primefield", - "primeorder", - "sha2 0.11.1", -] - -[[package]] -name = "p384" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17b851e6b3e378ab4ecb07fa2ed23f4d15f075735f8fec9fa1e7bdce5f8301f" -dependencies = [ - "ecdsa", - "elliptic-curve", - "fiat-crypto", - "primefield", - "primeorder", - "sha2 0.11.1", -] - [[package]] name = "page_size" version = "0.6.0" @@ -6531,24 +6299,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -6834,33 +6584,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "primefield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c555a6e4eb7d4e158fcb028c835c3b8642206ddc279b5c6b202ef9a8bdb592f4" -dependencies = [ - "crypto-bigint", - "crypto-common 0.2.2", - "ff", - "rand_core 0.10.1", - "subtle", - "zeroize", -] - -[[package]] -name = "primeorder" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c9f42978c78a00e3d68f69fc03e57a234debae69da4020a4fb588fcdcd07b06" -dependencies = [ - "elliptic-curve", - "once_cell", - "primefield", - "serdect", - "wnaf", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -7075,63 +6798,6 @@ dependencies = [ "parking_lot 0.12.5", ] -[[package]] -name = "quinn" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.1.3", - "rustls", - "socket2 0.6.5", - "thiserror 2.0.21", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9746dbde176634f4f2f1faf2404e30a31b2bc1e9cafb5329c95d8177a18c9fc" -dependencies = [ - "aws-lc-rs", - "bytes", - "getrandom 0.4.3", - "lru-slab", - "rand 0.10.3", - "rand_pcg", - "ring", - "rustc-hash 2.1.3", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.21", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.6.5", - "tracing", - "windows-sys 0.61.2", -] - [[package]] name = "quote" version = "1.0.47" @@ -7418,7 +7084,6 @@ dependencies = [ "log", "percent-encoding", "pin-project-lite", - "quinn", "rustls", "rustls-pki-types", "rustls-platform-verifier", @@ -7499,16 +7164,6 @@ dependencies = [ "mpeg4-audio-const 0.3.0", ] -[[package]] -name = "rfc6979" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a459cddafb3fe76b31fd8f1108007566c40301feb64dc7b54656eb7388172b" -dependencies = [ - "crypto-bigint", - "hmac 0.13.0", -] - [[package]] name = "rind" version = "0.1.12" @@ -7581,7 +7236,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -7605,26 +7260,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid 0.9.6", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature 2.2.0", - "spki 0.7.3", - "subtle", - "zeroize", -] - [[package]] name = "rubato" version = "5.0.1" @@ -7707,7 +7342,6 @@ version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ - "aws-lc-rs", "once_cell", "rustls-pki-types", "rustls-webpki", @@ -7733,7 +7367,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ - "web-time", "zeroize", ] @@ -7770,10 +7403,9 @@ version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -8101,20 +7733,6 @@ dependencies = [ "fallible-iterator", ] -[[package]] -name = "sec1" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d" -dependencies = [ - "base16ct", - "ctutils", - "der 0.8.2", - "hybrid-array", - "subtle", - "zeroize", -] - [[package]] name = "security-framework" version = "3.7.0" @@ -8293,16 +7911,6 @@ dependencies = [ "syn 3.0.6", ] -[[package]] -name = "serdect" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66cf8fedced2fcf12406bcb34223dffb92eaf34908ede12fed414c82b7f00b3e" -dependencies = [ - "base16ct", - "serde", -] - [[package]] name = "sfv" version = "0.15.0" @@ -8406,20 +8014,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", "rand_core 0.6.4", ] -[[package]] -name = "signature" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" -dependencies = [ - "digest 0.11.3", - "rand_core 0.10.1", -] - [[package]] name = "simd-adler32" version = "0.3.10" @@ -9911,12 +9508,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -10879,28 +10470,13 @@ version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wnaf" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795ca18b3fdb5e62bf982199278341ddcf7ebf7d32e25e212ad05d496e95f6fa" -dependencies = [ - "ff", - "group", - "hybrid-array", - "primefield", -] - [[package]] name = "workspace-hack" version = "0.1.0" dependencies = [ "anyhow", - "aws-lc-rs", - "aws-lc-sys", "base64 0.22.1", "base64 0.23.1", - "base64ct", "bitflags 2.13.2", "block2 0.6.2", "bytemuck", @@ -10915,10 +10491,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "crypto-common 0.1.7", - "crypto-common 0.2.2", - "ctutils", "cudarc", - "der 0.7.10", "der 0.8.2", "derive_more 2.1.1", "derive_more-impl", @@ -10948,14 +10521,11 @@ dependencies = [ "hashbrown 0.17.1", "hex", "hmac 0.12.1", - "hybrid-array", "hyper", "hyper-rustls", "hyper-util", "indexmap 2.14.2", "itertools 0.13.0", - "jsonwebtoken", - "lazy_static", "libc", "linux-raw-sys 0.12.1", "log", @@ -10969,7 +10539,6 @@ dependencies = [ "num-bigint", "num-complex", "num-integer", - "num-iter", "num-traits", "objc2 0.6.5", "objc2-core-audio", @@ -10983,17 +10552,11 @@ dependencies = [ "object_store", "once_cell", "percent-encoding", - "pkcs1", - "pkcs8 0.10.2", - "pkcs8 0.11.0", "portable-atomic", - "ppv-lite86", "proc-macro2", "proptest", "quick-xml 0.41.0", "quote", - "rand 0.8.8", - "rand_chacha 0.3.1", "rcgen", "regex", "regex-automata", @@ -11001,8 +10564,6 @@ dependencies = [ "reqwest", "rustix 1.1.6", "rustls", - "rustls-pki-types", - "rustls-webpki", "security-framework-sys", "semver", "serde", @@ -11011,14 +10572,10 @@ dependencies = [ "serde_spanned 1.1.2", "serde_with", "sha2 0.10.9", - "sha2 0.11.1", - "signature 2.2.0", "siphasher", "slab", "smallvec", "socket2 0.6.5", - "spin 0.9.9", - "spki 0.7.3", "spki 0.8.1", "subtle", "syn 2.0.119", diff --git a/Cargo.toml b/Cargo.toml index 45fdc2fd03a..985de7f565d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -253,13 +253,6 @@ x509-cert = { version = "0.3", default-features = false } x509-parser = "0.18" zeroize = { version = "1", features = ["derive"] } -[patch.crates-io] -# The published moq-auth 0.2.1 compatibility fixture depends on kio from -# crates.io. Without this, the lock carries a second kio whose pin drifts behind -# the member, and the next publish that reaches both fails to resolve a single -# version (#3551). -kio = { path = "rs/kio" } - [profile.dev] # Full DWARF is what makes a debug build enormous: the debug `libmoq_ffi.a` # measured 619 MiB against a 100 MiB ceiling for the published one, and a @@ -270,24 +263,8 @@ kio = { path = "rs/kio" } # in lldb. `profile.test` inherits this. debug = "line-tables-only" -# Optimize the bignum crates even in dev/test builds. RSA keygen is bignum -# arithmetic in a loop, and unoptimized it is orders of magnitude slower: the -# moq-auth key tests spend ~16s generating 2048-bit keys, versus well under a -# second here. These are dependencies we never step through in a debugger, so -# optimizing them costs nothing an unoptimized build was buying us, and the -# tests keep exercising production key sizes rather than being weakened to -# stay fast. `profile.test` inherits these overrides. -[profile.dev.package.num-bigint-dig] -opt-level = 3 - -[profile.dev.package.crypto-bigint] -opt-level = 3 - -[profile.dev.package.rsa] -opt-level = 3 - -# Same for the sonora echo canceller. Its hot loops are `core::arch` NEON/SSE -# intrinsics, which at opt-level 0 compile to out-of-line calls carrying the +# Optimize the sonora echo canceller even in dev/test builds. Its hot loops +# are `core::arch` NEON/SSE intrinsics, which at opt-level 0 compile to out-of-line calls carrying the # debug UB preconditions of `read_unaligned` and `copy_nonoverlapping`: a # profile of `aec::tests::survives_a_moving_echo_delay` spends 65% of its # samples in those checks and intrinsic shims and only 20% in sonora's own diff --git a/doc/bin/cli.md b/doc/bin/cli.md index 9e5a5de42d2..62c5a880c55 100644 --- a/doc/bin/cli.md +++ b/doc/bin/cli.md @@ -14,8 +14,10 @@ Docker; see [Install](/setup/install). Its cryptography comes from [rind](https://github.com/moq-dev/rind), which runs on any x86\_64 CPU and on any aarch64 CPU with NEON, including a Raspberry Pi 4, CM4, or Zero 2 W on a 64-bit OS. On a CPU missing a feature rind needs, -`moq` exits at startup naming it. The Rust library also supports armv7; -prebuilt CLI artifacts for 32-bit boards are not yet available. +`moq` exits at startup naming it. A board running a 32-bit OS, such as a +Raspberry Pi 2 or later on 32-bit Raspberry Pi OS, takes the +`armv7-unknown-linux-gnueabihf` release, which `moq.sh` and apt (`armhf`) +install. It needs an ARMv7 CPU, so not a Pi 1, Zero, or Zero W. ## What it does diff --git a/doc/setup/install.md b/doc/setup/install.md index 4233f7323eb..c5f4ca8e7db 100644 --- a/doc/setup/install.md +++ b/doc/setup/install.md @@ -28,7 +28,7 @@ curl -fsSL https://moq.sh | sh ``` It installs the newest `moq` release into `~/.local/bin`, without sudo or Rust, -on macOS (Apple Silicon) and Linux (x86\_64, aarch64, glibc 2.34+). It checks +on macOS (Apple Silicon) and Linux (x86\_64, aarch64, armv7, glibc 2.34+). It checks the download against the release's `SHA256SUMS` and never edits your shell profile; it prints the `PATH` line to add if needed. Run it again to upgrade. Pass options after `sh -s --`: @@ -67,7 +67,8 @@ docker run -i moqdev/moq --help Static binaries for Linux (x86\_64, aarch64), macOS (Apple Silicon), and Windows (x64) are attached to every -[GitHub release](https://github.com/moq-dev/moq/releases). The Nix cache at +[GitHub release](https://github.com/moq-dev/moq/releases), plus `moq` for Linux +armv7. The Nix cache at `nix.moq.dev` only holds tagged releases, so the `release` branch builds from source. Nix asks before trusting it; `--accept-flake-config` says yes for one command. @@ -90,7 +91,8 @@ gh attestation verify moq-cli-vX.Y.Z-x86_64-unknown-linux-gnu.tar.gz \ ## Debian and Ubuntu Debian 12+ and Ubuntu 22.04+. The GStreamer plugin needs GStreamer 1.22, so it -is available on Debian 12+ and Ubuntu 24.04+. +is available on Debian 12+ and Ubuntu 24.04+. On 32-bit ARM (`armhf`), only +`moq` is published. ```bash curl -fsSL https://apt.moq.dev/moq-keyring.gpg | sudo tee /usr/share/keyrings/moq-keyring.gpg > /dev/null diff --git a/infra/apt/publish.sh b/infra/apt/publish.sh index be08cb2decf..d2df7e258ea 100755 --- a/infra/apt/publish.sh +++ b/infra/apt/publish.sh @@ -25,7 +25,7 @@ ORIGIN="MoQ Project" LABEL="moq" SUITE="$DIST" DESCRIPTION="Media over QUIC apt repository" -ARCHES=(amd64 arm64) +ARCHES=(amd64 arm64 armhf) # Make rclone talk to R2. R2 is S3-compatible. export RCLONE_CONFIG_R2_TYPE=s3 diff --git a/infra/apt/src/worker.ts b/infra/apt/src/worker.ts index 7eec1e1fa27..a35d36513b7 100644 --- a/infra/apt/src/worker.ts +++ b/infra/apt/src/worker.ts @@ -5,7 +5,7 @@ // /dists/stable/InRelease signed metadata // /dists/stable/Release metadata // /dists/stable/Release.gpg detached signature -// /dists/stable/main/binary-{amd64,arm64}/Packages{,.gz} +// /dists/stable/main/binary-{amd64,arm64,armhf}/Packages{,.gz} // /pool/main//__.deb actual packages interface Env { diff --git a/infra/moq-sh/install.sh b/infra/moq-sh/install.sh index 5729e7bcc54..86511e14d21 100755 --- a/infra/moq-sh/install.sh +++ b/infra/moq-sh/install.sh @@ -61,13 +61,18 @@ detect_target() { esac ;; Linux) + # A 32-bit OS on a 64-bit kernel, as Raspberry Pi OS ships on a Pi 4, + # reports aarch64 but runs only 32-bit binaries. + if [ "$arch" = aarch64 ] && [ "$(getconf LONG_BIT 2>/dev/null || true)" = 32 ]; then + arch=armv7l + fi case "$arch" in - x86_64 | amd64) arch=x86_64 ;; - aarch64 | arm64) arch=aarch64 ;; - *) die "no moq build for Linux on $arch; x86_64 and aarch64 are published. Try: cargo install moq-cli" ;; + x86_64 | amd64) target=x86_64-unknown-linux-gnu ;; + aarch64 | arm64) target=aarch64-unknown-linux-gnu ;; + armv7* | armv8l) target=armv7-unknown-linux-gnueabihf ;; + *) die "no moq build for Linux on $arch; x86_64, aarch64, and armv7 are published. Try: cargo install moq-cli" ;; esac check_glibc - target=$arch-unknown-linux-gnu ;; *) die "no moq build for $os; macOS and Linux are published. On Windows: winget install moq-dev.moq" ;; esac diff --git a/infra/moq-sh/install.test.sh b/infra/moq-sh/install.test.sh index 71ef29bf87d..fb3ac8e165a 100755 --- a/infra/moq-sh/install.test.sh +++ b/infra/moq-sh/install.test.sh @@ -13,7 +13,8 @@ script="$here/install.sh" tmp=$(mktemp -d) trap 'rm -rf "$tmp"' EXIT -# Fake host tools, driven by FAKE_OS, FAKE_ARCH, FAKE_GLIBC, and FAKE_ROSETTA. +# Fake host tools, driven by FAKE_OS, FAKE_ARCH, FAKE_GLIBC, FAKE_ROSETTA, and +# FAKE_BITS. mkdir "$tmp/fake" cat >"$tmp/fake/uname" <<'EOF' #!/bin/sh @@ -24,8 +25,13 @@ esac EOF cat >"$tmp/fake/getconf" <<'EOF' #!/bin/sh -[ -n "$FAKE_GLIBC" ] || exit 1 -echo "glibc $FAKE_GLIBC" +case "$1" in + LONG_BIT) echo "$FAKE_BITS" ;; + *) + [ -n "$FAKE_GLIBC" ] || exit 1 + echo "glibc $FAKE_GLIBC" + ;; +esac EOF cat >"$tmp/fake/sysctl" <<'EOF' #!/bin/sh @@ -40,7 +46,7 @@ release() { version=$1 tag="moq-cli-v$version" mkdir -p "$releases/$tag" - for target in aarch64-apple-darwin x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu; do + for target in aarch64-apple-darwin x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu armv7-unknown-linux-gnueabihf; do root="$tmp/build/$tag-$target" mkdir -p "$root/bin" printf '#!/bin/sh\necho "moq %s"\n' "$version" >"$root/bin/moq" @@ -107,7 +113,8 @@ host() { FAKE_ARCH=$2 FAKE_GLIBC=${3:-} FAKE_ROSETTA=${4:-0} - export FAKE_OS FAKE_ARCH FAKE_GLIBC FAKE_ROSETTA + FAKE_BITS=${5:-64} + export FAKE_OS FAKE_ARCH FAKE_GLIBC FAKE_ROSETTA FAKE_BITS } suite() { @@ -162,6 +169,9 @@ suite() { grep -v aarch64-unknown-linux-gnu "$releases/moq-cli-v1.1.0/SHA256SUMS" >"$releases/moq-cli-v1.2.0/SHA256SUMS" host Linux aarch64 2.34 refuse "incomplete release" "has no moq-cli-v1.2.0-aarch64-unknown-linux-gnu.tar.gz" "$tmp/served.sh" --dir "$dir" --version 1.2.0 + # A 32-bit OS on a 64-bit kernel asks for the armv7 build. + host Linux aarch64 2.36 0 32 + refuse "32-bit OS on a 64-bit kernel" "has no moq-cli-v1.2.0-armv7-unknown-linux-gnueabihf.tar.gz" "$tmp/served.sh" --dir "$dir" --version 1.2.0 installed 1.0.0 # A tarball that doesn't match SHA256SUMS is never installed. @@ -204,6 +214,12 @@ suite() { host Linux aarch64 2.34 ok "linux aarch64" "$tmp/served.sh" --dir "$dir" installed 1.1.0 + host Linux armv7l 2.36 + ok "linux armv7" "$tmp/served.sh" --dir "$dir" --version 1.0.0 + installed 1.0.0 + host Linux aarch64 2.34 + ok "linux aarch64 again" "$tmp/served.sh" --dir "$dir" + installed 1.1.0 host Darwin arm64 ok "macOS arm64" "$tmp/served.sh" --dir "$dir" --version 1.0.0 installed 1.0.0 @@ -214,7 +230,7 @@ suite() { host Darwin x86_64 refuse "intel mac" "only Apple silicon" "$tmp/served.sh" --dir "$dir" host Linux riscv64 2.39 - refuse "unsupported arch" "x86_64 and aarch64" "$tmp/served.sh" --dir "$dir" + refuse "unsupported arch" "x86_64, aarch64, and armv7" "$tmp/served.sh" --dir "$dir" host FreeBSD amd64 refuse "unsupported os" "winget" "$tmp/served.sh" --dir "$dir" host Linux x86_64 2.31 diff --git a/quest/m1/README.md b/quest/m1/README.md index da300e96d79..c3aa0c85207 100644 --- a/quest/m1/README.md +++ b/quest/m1/README.md @@ -50,7 +50,6 @@ moves what remains of them once their claims merge. - [Watch sources default to the decoder's probe](/quest/m1/watch-supported-default.md) - a source built without `in.supported` plays instead of selecting nothing - [Push-to-talk's press-to-audible latency fits a budget on the defaults](/quest/m1/push-to-talk-latency.md) - press to audible on the browser defaults, excluding device output, stays under a kixtop-measured budget that `just test push-to-talk` enforces - [TS fidelity and recovery](/quest/m1/ts-reliability/README.md) - both modes have explicit profiles, automated validation, loss tests, and a dedicated guide -- [MoQ on rind](/quest/m1/rind/README.md) - every MoQ crate takes its crypto from rind, a pure-Rust graviola fork, so no build compiles C crypto - [Tests run on a mocked clock](/quest/m1/mock-clock-tests/README.md) - about 300 tests stop proving nothing happened by waiting, sleeping to settle, or asserting on elapsed time - [moq-mux reads only the base layer's H.265 SPS](/quest/m1/h265-base-layer-sps.md) - a layered MV-HEVC or SHVC stream imports as its base layer instead of misreading an enhancement-layer SPS, which still reaches the track - [Lifecycles are explicit state](/quest/m1/explicit-state/README.md) - every lifecycle the 2026-11-07 audit found implicit is one enum or union, fixing the bugs in the 11 lifecycles it redesigns, with review and agent rules against new ones diff --git a/quest/m1/rind/README.md b/quest/m1/rind/README.md deleted file mode 100644 index d76ed06fb84..00000000000 --- a/quest/m1/rind/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# [M] MoQ on rind - -## Goal - -Every MoQ crate takes its crypto from [rind](https://github.com/moq-dev/rind), -a pure-Rust fork of graviola, so no build compiles C crypto: on every release -target, including armv7 Android, `cargo tree -e normal,build -i` finds no -aws-lc-sys, ring, or `cc` in a crypto crate's graph. rind is MoQ's only crypto, -replacing aws-lc-rs, ring, and the RustCrypto `hmac`/`sha1`/`sha2`/`p256`/`p384` -crates in MoQ's own code. - -Non-goals: CPUs or targets rind refuses (see Plan). moq-tokio's iroh backend, -which hard-wired aws-lc-rs or ring, was deleted instead. - -## Plan - -Decided with the maintainer on 2026-10-26 (planning interview). This -supersedes the m3 pure-crypto epic, which only moved moq-relay to graviola once -upstream graviola and ACME releases made it cheap. rind owns those gaps -instead, so every crate drops C, not just the relay. - -- rind lives at moq-dev/rind, a GitHub fork of ctz/graviola with moq's repo - setup. Its own quests live in its `quest/` tree; its - [MoQ coverage epic](https://github.com/moq-dev/rind/blob/main/quest/m1/moq/README.md) - carries rind's plan. -- MoQ uses rind's own API plus its adapter crates (`rind-rustls`, - `rind-jsonwebtoken`, ...), never a ring facade through `[patch.crates-io]`, - so a published crate built with `cargo install` also compiles no C. -- Unsupported is refused, never a fallback, and one backend compiles per - arch: rind runs on x86_64 and aarch64 with graviola's CPU features, and on - armv7 through libcrux. A host missing a CPU feature fails at startup with an - error naming it. wasm32 and other targets do not build rind; nothing in MoQ - needs native crypto there. -- Raspberry Pi 4, CM4, and Zero 2 W lack aarch64 crypto extensions. Decided - 2026-10-31 (maintainer): rind picks a NEON path for them at startup, as ring - and aws-lc-rs do, so their aarch64 builds keep running, and every area - that runs in moq-cli or moq-relay switches only once that rind release - ships. This keeps - [cli-packaging](/quest/m3/cli-packaging.md)'s Pi 4 V4L2 publishing and - [embedded video](/quest/m5/video-embedded.md) on those boards. -- x86_64 CPUs without AVX2, BMI2, ADX, or AES-NI get the same treatment - (maintainer, 2026-11-01): rind picks slower paths for them at startup, and - the same areas wait on that release too. -- moq-tokio's and moq-quic's `aws-lc-rs` and `ring` features are removed, not - kept as alternatives, so there is one provider and no exclusion gate. -- The migration waits for rind's armv7 support, so no target is dropped. - Decided 2026-10-31 (maintainer): each area waits only on the rind pieces it - uses, so most areas switch on rind 0.1.2 (published 2026-11-01), which runs on - CPUs without the crypto extensions (e2ee, which no binary links, switched - on 0.1.0). Relay ACME, the one area that waited on `rind-instant-acme`, is - removed for now instead (maintainer, 2026-11-03), and returns on rind in m5. - Every area has landed, and the workspace declares no aws-lc-rs dependency; - the epic's own work below removes what still reaches it. -- Split per area, each landing once rind covers it. Docs a change makes stale - (CPU requirements, removed features) are edited inline in that area's PR; no - separate docs page. - -The epic's own work, once every child has merged: - -- Remove aws-lc-rs and ring from the workspace, and add a CI guard that no - release target's graph holds aws-lc-sys, ring, or `cc` through a crypto - crate. -- Add an `armv7-unknown-linux-gnueabihf` moq-cli release with v4l2, and point - `doc/bin/cli.md`'s board note at it for boards running a 32-bit OS. diff --git a/quest/m2/README.md b/quest/m2/README.md index 062bef3c7a3..3c39d8d2f25 100644 --- a/quest/m2/README.md +++ b/quest/m2/README.md @@ -197,7 +197,6 @@ quests that require them. - [Native playout sync keeps tracks decoupled](/quest/m2/mux-sync.md) - `moq_mux::timeline` becomes `moq_mux::sync`, and one slow track no longer stalls or moves another - [JS time values are types, not numbers](/quest/m2/js-time-types.md) - every public JS duration and instant is a `Clock.Duration` or `Clock.Instant` object, so a unit mistake fails to compile - [Small API fixes before the cut](/quest/m2/api-shape/README.md) - one path and one spelling per item, names by role, and no dead or wrong-role public surface across net, transport, media, native, apps, JS, and bindings -- [MoQ on rind](/quest/m1/rind/README.md) - every MoQ crate takes its crypto from rind, a pure-Rust graviola fork, so no build compiles C crypto (held in m1 by an open claim) - [moq auth serve bounds what a leaked token or public caller can do](/quest/m2/auth-serve-policy.md) - tokens need an `exp` unless the operator opts out, and a public listener authenticates relays - [Finishing a producer returns a Finished handle](/quest/m2/finished-handle.md) - `finish(self)` consumes moq-net's and the media crates' producers, so appending after finish doesn't compile - [Cut readiness](/quest/m2/cut-gate/README.md) - the checks the cut needs that break nothing: main no slower than release, vendored fixes ported, and moq-c at parity diff --git a/rs/justfile b/rs/justfile index 23a8ab90add..2a561d83db6 100644 --- a/rs/justfile +++ b/rs/justfile @@ -55,6 +55,7 @@ lint *args: cargo sort --check --no-format . $(cargo metadata --locked --no-deps --format-version 1 | jq -r '.packages[] | select(.name != "workspace-hack") | .manifest_path | rtrimstr("/Cargo.toml")') cargo hakari generate --diff python3 sh/rs/hakari.py + python3 sh/rs/crypto.py # Auto-fix clippy/format/shear/sort. [positional-arguments] @@ -301,15 +302,15 @@ coroutines: run bash sh/rs/coroutines.sh rs/moq-auth/Cargo.toml -- --no-default-features finish -# Prove moq-crypto's key-only build, which moq-auth depends on, leaves out the transport and aws-lc-rs, then lint and test it alone; a workspace build unifies the default features back in. +# Prove moq-crypto's key-only build, which moq-auth depends on, leaves out the transport, then lint and test it alone; a workspace build unifies the default features back in. crypto-key: #!/usr/bin/env bash set -euo pipefail source sh/checks.sh key_only_dependencies() { graph=$(cargo tree --locked -p moq-crypto --no-default-features --features serde -e normal --prefix none) || return - if grep -E '^(aws-lc-rs|moq-net) ' <<<"$graph"; then - echo "moq-crypto without sign or e2ee must not depend on moq-net or aws-lc-rs" >&2 + if grep -E '^moq-net ' <<<"$graph"; then + echo "moq-crypto without sign or e2ee must not depend on moq-net" >&2 return 1 fi } diff --git a/rs/moq-archive/Cargo.toml b/rs/moq-archive/Cargo.toml index adc0dfeee9c..678fc348bf1 100644 --- a/rs/moq-archive/Cargo.toml +++ b/rs/moq-archive/Cargo.toml @@ -30,7 +30,8 @@ async-trait = { workspace = true } axum = { workspace = true } criterion = { package = "bench-harness", path = "../bench-harness" } kio = { path = "../kio", features = ["manual"] } -object_store = { workspace = true, features = ["fs", "aws"] } +moq-crypto = { workspace = true, features = ["provider"] } +object_store = { workspace = true, features = ["fs", "aws-base", "reqwest"] } s3s = "0.17" s3s-fs = "0.17" tempfile = { workspace = true } diff --git a/rs/moq-archive/src/producer/backends.rs b/rs/moq-archive/src/producer/backends.rs index 45909f16ed9..305bc0bfe03 100644 --- a/rs/moq-archive/src/producer/backends.rs +++ b/rs/moq-archive/src/producer/backends.rs @@ -253,6 +253,8 @@ struct Server { impl Server { async fn new() -> Self { + // The S3 client is reqwest on rustls, which has no provider of its own. + moq_crypto::provider::install_default().unwrap(); let dir = tempfile::tempdir().unwrap(); std::fs::create_dir(dir.path().join("archive")).unwrap(); let service = S3ServiceBuilder::new(s3s_fs::FileSystem::new(dir.path()).unwrap()).build(); diff --git a/rs/moq-auth/Cargo.toml b/rs/moq-auth/Cargo.toml index 6af31b4fbba..eeddd18b0a9 100644 --- a/rs/moq-auth/Cargo.toml +++ b/rs/moq-auth/Cargo.toml @@ -57,8 +57,6 @@ anyhow = { workspace = true } criterion = { package = "bench-harness", path = "../bench-harness" } kio = { path = "../kio", features = ["manual", "runtime", "sim"] } moq-auth = { path = ".", features = ["client", "serve"] } -moq-auth-published = { package = "moq-auth", version = "=0.2.1", default-features = false } -moq-token = "0.7" tempfile = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread", "test-util"] } tracing-test = { workspace = true } diff --git a/rs/moq-auth/src/crypto.rs b/rs/moq-auth/src/crypto.rs index 5355debeb88..e8a13dc17a7 100644 --- a/rs/moq-auth/src/crypto.rs +++ b/rs/moq-auth/src/crypto.rs @@ -27,8 +27,8 @@ pub(crate) fn tls() -> crate::Result { #[cfg(test)] mod tests { - /// The dev-dependencies turn on jsonwebtoken's aws-lc backend, so signing alone can't show - /// that rind is the provider. + /// Another crate may turn on a jsonwebtoken backend, so signing alone can't show that rind is + /// the provider. #[test] fn installs_rind_when_none_is_installed() { super::init().unwrap(); diff --git a/rs/moq-auth/tests/released_token.rs b/rs/moq-auth/tests/released_token.rs index ec90fe30c0c..b619fc3ad14 100644 --- a/rs/moq-auth/tests/released_token.rs +++ b/rs/moq-auth/tests/released_token.rs @@ -1,105 +1,105 @@ -//! Tokens we sign against the verifier moq-relay 0.14 shipped (`moq-token` 0.7). +//! The token and grant encodings released verifiers depend on. //! -//! A grant of subtrees is written as legacy `put`/`get` prefixes, which 0.14 reads -//! with the same scope. Anything a prefix can't say is written as -//! `publish`/`subscribe`, which 0.14 reads as granting nothing and refuses, rather -//! than misreading an exact grant as a prefix. +//! moq-relay 0.14 verifies with `moq-token` 0.7, which reads `put`/`get` prefixes and +//! refuses `publish`/`subscribe`. Published moq-auth 0.2.1 reads pattern arrays and +//! refuses a role written as an object. Both are frozen, so each test pins the exact +//! JSON we write: a subtree grant one they read with the same scope, and anything else +//! a shape they refuse in full rather than misread. The shapes were checked against +//! both releases when the crates were dropped as dev-dependencies, since each pulls in +//! a C crypto library. use moq_auth::{Algorithm, Claims, Key}; +use serde_json::{Value, json}; fn patterns(texts: &[&str]) -> moq_auth::Patterns { texts.iter().map(|text| text.parse().unwrap()).collect() } -/// A key pair both crates hold: ours signs, the released one verifies. -fn keys() -> (Key, moq_token::Key) { +/// Sign and verify `claims` with our own key, returning the JSON written on the wire. +fn wire(claims: &Claims) -> Value { let key = Key::generate(Algorithm::HS256, None).unwrap(); - let released = moq_token::Key::from_str(&key.to_str().unwrap()).unwrap(); - (key, released) + let verified = key.verify(&key.sign(claims).unwrap()).unwrap(); + let wire = serde_json::to_value(claims).unwrap(); + assert_eq!(serde_json::to_value(verified).unwrap(), wire); + wire +} + +/// The grant a relay hands an auth callback for `claims`, as JSON. +fn grant(claims: &Claims) -> Value { + let mut grant = moq_auth::Grant::new(claims.publish.clone(), claims.subscribe.clone()); + (grant.publish_rate, grant.subscribe_rate) = (claims.publish_rate, claims.subscribe_rate); + let wire = serde_json::to_value(&grant).unwrap(); + assert_eq!(serde_json::from_value::(wire.clone()).unwrap(), grant); + wire } #[test] -fn subtree_grants_verify_on_0_14_with_the_same_scope() { - let (key, released) = keys(); +fn subtree_grants_are_written_as_legacy_prefixes() { let claims = Claims::default() .with_root("room") .with_publish(patterns(&["alice/**"])) .with_subscribe(patterns(&["**"])); - let verified = released.verify(&key.sign(&claims).unwrap()).unwrap(); - assert_eq!(verified.root, "room"); - assert_eq!(verified.publish, ["alice"]); - assert_eq!(verified.subscribe, [""]); + assert_eq!(wire(&claims), json!({"root": "room", "put": ["alice"], "get": [""]})); + + let claims = Claims::default() + .with_root("room") + .with_publish(patterns(&["alice/**", "bob/**"])); + assert_eq!(wire(&claims), json!({"root": "room", "put": ["alice", "bob"]})); + assert_eq!(grant(&claims), json!({"publish": ["alice/**", "bob/**"]})); } #[test] -fn exact_grants_are_refused_by_0_14() { - let (key, released) = keys(); - for claims in [ - Claims::default().with_root("room").with_publish(patterns(&["alice"])), - Claims::default().with_subscribe(patterns(&["*/chat"])), +fn exact_grants_are_written_as_patterns() { + for (claims, expected) in [ + ( + Claims::default().with_root("room").with_publish(patterns(&["alice"])), + json!({"root": "room", "publish": ["alice"]}), + ), + ( + Claims::default().with_subscribe(patterns(&["*/chat"])), + json!({"subscribe": ["*/chat"]}), + ), // One exact grant moves the whole document to patterns. - Claims::default() - .with_publish(patterns(&["alice/**"])) - .with_subscribe(patterns(&["bob"])), + ( + Claims::default() + .with_publish(patterns(&["alice/**"])) + .with_subscribe(patterns(&["bob"])), + json!({"publish": ["alice/**"], "subscribe": ["bob"]}), + ), + ( + Claims::default() + .with_root("room") + .with_publish(patterns(&["alice", "*/chat"])), + json!({"root": "room", "publish": ["*/chat", "alice"]}), + ), ] { - assert!(released.verify(&key.sign(&claims).unwrap()).is_err(), "{claims:?}"); - } -} - -#[test] -fn patterns_keep_the_published_auth_wire_shape() { - let key = Key::generate(Algorithm::HS256, None).unwrap(); - let released = moq_auth_published::Key::from_str(&key.to_str().unwrap()).unwrap(); - for publish in [["alice/**", "bob/**"], ["alice", "*/chat"]] { - let claims = Claims::default().with_root("room").with_publish(patterns(&publish)); - let ours = key.sign(&claims).unwrap(); - let verified = released.verify(&ours).unwrap(); - assert_eq!( - serde_json::to_value(&verified).unwrap(), - serde_json::to_value(&claims).unwrap() - ); - let theirs = released.sign(&verified).unwrap(); - assert_eq!( - serde_json::to_value(key.verify(&theirs).unwrap()).unwrap(), - serde_json::to_value(&claims).unwrap() - ); - let grant = moq_auth::Grant::new(claims.publish, claims.subscribe); - let wire = serde_json::to_value(&grant).unwrap(); - let published: moq_auth_published::Grant = serde_json::from_value(wire.clone()).unwrap(); - assert_eq!(serde_json::to_value(published).unwrap(), wire); + assert_eq!(wire(&claims), expected, "{claims:?}"); + let mut grant_json = expected; + grant_json.as_object_mut().unwrap().remove("root"); + assert_eq!(grant(&claims), grant_json, "{claims:?}"); } } /// A capped role is an object every published verifier refuses in full, so an old /// relay never admits the paths while dropping the cap. #[test] -fn capped_roles_are_refused_in_full_by_published_auth() { - let key = Key::generate(Algorithm::HS256, None).unwrap(); - let published = moq_auth_published::Key::from_str(&key.to_str().unwrap()).unwrap(); - let legacy = moq_token::Key::from_str(&key.to_str().unwrap()).unwrap(); +fn capped_roles_are_written_as_objects() { let rate = moq_auth::Rate::from_bps(8_000_000).unwrap(); - for publish in [true, false] { - // Subtrees alone would be written as legacy prefixes, which a cap must not be. - let mut claims = Claims::default() - .with_publish(patterns(&["alice/**"])) - .with_subscribe(patterns(&["**"])); - claims = match publish { - true => claims.with_publish_rate(rate), - false => claims.with_subscribe_rate(rate), - }; - let token = key.sign(&claims).unwrap(); - let verified = key.verify(&token).unwrap(); - assert_eq!( - (verified.publish_rate, verified.subscribe_rate), - (claims.publish_rate, claims.subscribe_rate) - ); - assert!(published.verify(&token).is_err(), "{claims:?}"); - assert!(legacy.verify(&token).is_err(), "{claims:?}"); - - let mut grant = moq_auth::Grant::new(claims.publish.clone(), claims.subscribe.clone()); - (grant.publish_rate, grant.subscribe_rate) = (claims.publish_rate, claims.subscribe_rate); - let wire = serde_json::to_value(&grant).unwrap(); - assert_eq!(serde_json::from_value::(wire.clone()).unwrap(), grant); - assert!(serde_json::from_value::(wire).is_err()); + // Subtrees alone would be written as legacy prefixes, which a cap must not be. + let claims = Claims::default() + .with_publish(patterns(&["alice/**"])) + .with_subscribe(patterns(&["**"])); + for (claims, expected) in [ + ( + claims.clone().with_publish_rate(rate), + json!({"publish": {"path": ["alice/**"], "rate": 8_000_000}, "subscribe": ["**"]}), + ), + ( + claims.with_subscribe_rate(rate), + json!({"publish": ["alice/**"], "subscribe": {"path": ["**"], "rate": 8_000_000}}), + ), + ] { + assert_eq!(wire(&claims), expected, "{claims:?}"); + assert_eq!(grant(&claims), expected, "{claims:?}"); } } diff --git a/rs/moq-cli/src/auth.rs b/rs/moq-cli/src/auth.rs index 7ce136a8097..451c9f0d3a5 100644 --- a/rs/moq-cli/src/auth.rs +++ b/rs/moq-cli/src/auth.rs @@ -1116,6 +1116,8 @@ mod tests { /// Drive the same Usage grammar the binary exposes, rather than building /// `Command` directly, so the flags stay part of what's under test. async fn run(args: &[&str]) -> anyhow::Result<()> { + // `main` installs rind's provider before any subcommand, and reqwest reads it. + moq_tokio::crypto::install_default().unwrap(); let mut cli = crate::args::Invocation::try_parse_from(args.iter().copied()).map_err(|err| anyhow::anyhow!("{err}"))?; match cli.stages.remove(0) { diff --git a/rs/moq-relay/src/internal.rs b/rs/moq-relay/src/internal.rs index fd4955a28eb..1c31927aa9c 100644 --- a/rs/moq-relay/src/internal.rs +++ b/rs/moq-relay/src/internal.rs @@ -1607,6 +1607,7 @@ mod tests { /// and forking both the socket options and the disabled-listener contract. #[tokio::test] async fn serve_hosts_merged_routes_alongside_the_defaults() { + moq_tokio::crypto::install_default().unwrap(); let listen = Some("127.0.0.1:0".parse().unwrap()); let internal = Internal::new(Config { listen }, moq_net::stats::Registry::disabled()) .bind() diff --git a/rs/moq-relay/src/test_support.rs b/rs/moq-relay/src/test_support.rs index 087f64f34be..91de5f8704e 100644 --- a/rs/moq-relay/src/test_support.rs +++ b/rs/moq-relay/src/test_support.rs @@ -60,6 +60,7 @@ mod tests { #[tokio::test] async fn fixture_binds_ephemeral_ports_and_reports_ready() { + moq_tokio::crypto::install_default().unwrap(); let fixture = test_relay().await.expect("load test relay"); assert_ne!(fixture.quic.port(), 0); assert_ne!(fixture.http.port(), 0); diff --git a/rs/moq-relay/tests/integration/embed.rs b/rs/moq-relay/tests/integration/embed.rs index 8cd2f762b10..b2e7f2ba22f 100644 --- a/rs/moq-relay/tests/integration/embed.rs +++ b/rs/moq-relay/tests/integration/embed.rs @@ -515,6 +515,7 @@ async fn worker_tokio_webrtc_feed() { /// An embedder-owned accept loop joins the relay's own /metrics exposition. #[tokio::test] async fn embedded_listener_health_reaches_metrics() { + moq_tokio::crypto::install_default().unwrap(); let dir = tempfile::tempdir().expect("tempdir"); let (cert, key) = certificate(dir.path()); let mut config = http_and_quic(&cert, &key, "127.0.0.1:0".into()); diff --git a/rs/moq-relay/tests/integration/refusals.rs b/rs/moq-relay/tests/integration/refusals.rs index 6bb073888b0..708fee2fd0e 100644 --- a/rs/moq-relay/tests/integration/refusals.rs +++ b/rs/moq-relay/tests/integration/refusals.rs @@ -206,6 +206,7 @@ async fn lan_refusals_are_counted() { /// An auth server whose connection fails is `unavailable`, apart from a refusal. #[tokio::test] async fn unavailable_auth_server_is_counted() { + moq_tokio::crypto::install_default().unwrap(); // Listen to reserve the port on every OS, then hang up before answering HTTP. let listener = tokio::net::TcpListener::bind("127.0.0.1:0") .await diff --git a/rs/workspace-hack/Cargo.toml b/rs/workspace-hack/Cargo.toml index 838cb68d234..76636c02fd0 100644 --- a/rs/workspace-hack/Cargo.toml +++ b/rs/workspace-hack/Cargo.toml @@ -25,10 +25,8 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] anyhow = { version = "1", features = ["backtrace"] } -aws-lc-rs = { version = "1" } base64-2b5c6dc72f624058 = { package = "base64", version = "0.23" } base64-3c51e837cfc5589a = { package = "base64", version = "0.22" } -base64ct = { version = "1", default-features = false, features = ["alloc"] } bytemuck = { version = "1", default-features = false, features = ["derive", "extern_crate_alloc", "min_const_generics"] } byteorder = { version = "1" } bytes = { version = "1", features = ["serde"] } @@ -38,13 +36,10 @@ clap = { version = "4", features = ["cargo", "derive"] } clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "help", "std", "suggestions", "usage"] } const-oid = { version = "0.10", default-features = false, features = ["db"] } crossbeam-utils = { version = "0.8" } -crypto-common-6f8ce4dd05d13bba = { package = "crypto-common", version = "0.2", default-features = false, features = ["getrandom"] } -crypto-common-c65f7effa3be6d31 = { package = "crypto-common", version = "0.1", default-features = false, features = ["std"] } -ctutils = { version = "0.4", default-features = false, features = ["subtle"] } -der-c38e5c1d305a1b54 = { package = "der", version = "0.8", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } -der-ca01ad9e24f5d932 = { package = "der", version = "0.7", default-features = false, features = ["oid", "pem", "std"] } +crypto-common = { version = "0.1", default-features = false, features = ["std"] } +der = { version = "0.8", default-features = false, features = ["alloc", "derive", "flagset", "oid"] } derive_more = { version = "2", features = ["debug", "display", "error", "from"] } -digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "oid", "std"] } +digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "std"] } digest-a6292c17cd707f01 = { package = "digest", version = "0.11", features = ["alloc", "mac", "oid"] } either = { version = "1", features = ["use_std"] } fastrand = { version = "2", features = ["js"] } @@ -61,12 +56,9 @@ futures-util = { version = "0.3", features = ["channel", "io", "sink"] } hashbrown = { version = "0.17", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4" } hmac = { version = "0.12", default-features = false, features = ["reset"] } -hybrid-array = { version = "0.4", default-features = false, features = ["alloc", "subtle", "zeroize"] } hyper = { version = "1", features = ["full"] } hyper-util = { version = "0.1", features = ["server-auto", "service", "tokio"] } indexmap = { version = "2", features = ["serde"] } -jsonwebtoken = { version = "11", features = ["aws_lc_rs"] } -lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } log = { version = "0.4", default-features = false, features = ["std"] } md-5-93f6ce9d446188ac = { package = "md-5", version = "0.10" } md-5-a6292c17cd707f01 = { package = "md-5", version = "0.11" } @@ -76,42 +68,30 @@ nom-181b0d20215bb231 = { package = "nom", version = "8" } num-bigint = { version = "0.4" } num-complex = { version = "0.4" } num-integer = { version = "0.1", features = ["i128"] } -num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } -num-traits = { version = "0.2", features = ["i128", "libm"] } -object_store = { version = "0.14", default-features = false, features = ["aws", "azure-base", "fs", "gcp-base"] } +num-traits = { version = "0.2", features = ["i128"] } +object_store = { version = "0.14", default-features = false, features = ["aws-base", "azure-base", "fs", "gcp-base", "reqwest"] } once_cell = { version = "1" } percent-encoding = { version = "2" } -pkcs1 = { version = "0.7", default-features = false, features = ["pem", "pkcs8", "std"] } -pkcs8-93f6ce9d446188ac = { package = "pkcs8", version = "0.10", default-features = false, features = ["pem", "std"] } -pkcs8-a6292c17cd707f01 = { package = "pkcs8", version = "0.11", default-features = false, features = ["pem", "std"] } portable-atomic = { version = "1" } -ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } proptest = { version = "1", default-features = false, features = ["handle-panics"] } -rand = { version = "0.8" } -rand_chacha = { version = "0.3", default-features = false, features = ["std"] } rcgen = { version = "0.14", default-features = false, features = ["pem"] } regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "std", "unicode"] } regex-syntax = { version = "0.8" } -reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls", "rustls-no-provider", "stream"] } +reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls-no-provider", "stream"] } rustls = { version = "0.23", default-features = false, features = ["std", "tls12"] } -rustls-pki-types = { version = "1", features = ["std"] } semver = { version = "1", features = ["serde"] } serde = { version = "1", features = ["alloc", "derive", "rc"] } serde_core = { version = "1", features = ["alloc", "rc"] } serde_json = { version = "1", features = ["preserve_order", "raw_value", "unbounded_depth"] } serde_spanned = { version = "1", default-features = false, features = ["serde", "std"] } serde_with = { version = "3", features = ["base64", "hex", "json"] } -sha2-93f6ce9d446188ac = { package = "sha2", version = "0.10" } -sha2-a6292c17cd707f01 = { package = "sha2", version = "0.11" } -signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } +sha2 = { version = "0.10" } siphasher = { version = "1" } slab = { version = "0.4" } smallvec = { version = "1", default-features = false, features = ["const_new", "union", "write"] } socket2 = { version = "0.6", default-features = false, features = ["all"] } -spin = { version = "0.9" } -spki-c38e5c1d305a1b54 = { package = "spki", version = "0.8", default-features = false, features = ["pem", "std"] } -spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features = false, features = ["pem", "std"] } -subtle = { version = "2", features = ["const-generics"] } +spki = { version = "0.8", default-features = false, features = ["alloc"] } +subtle = { version = "2" } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1", features = ["full", "test-util"] } tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } @@ -133,10 +113,8 @@ zeroize = { version = "1", features = ["derive"] } [build-dependencies] anyhow = { version = "1", features = ["backtrace"] } -aws-lc-rs = { version = "1" } base64-2b5c6dc72f624058 = { package = "base64", version = "0.23" } base64-3c51e837cfc5589a = { package = "base64", version = "0.22" } -base64ct = { version = "1", default-features = false, features = ["alloc"] } bytemuck = { version = "1", default-features = false, features = ["derive", "extern_crate_alloc", "min_const_generics"] } byteorder = { version = "1" } bytes = { version = "1", features = ["serde"] } @@ -147,14 +125,11 @@ clap = { version = "4", features = ["cargo", "derive"] } clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "help", "std", "suggestions", "usage"] } const-oid = { version = "0.10", default-features = false, features = ["db"] } crossbeam-utils = { version = "0.8" } -crypto-common-6f8ce4dd05d13bba = { package = "crypto-common", version = "0.2", default-features = false, features = ["getrandom"] } -crypto-common-c65f7effa3be6d31 = { package = "crypto-common", version = "0.1", default-features = false, features = ["std"] } -ctutils = { version = "0.4", default-features = false, features = ["subtle"] } -der-c38e5c1d305a1b54 = { package = "der", version = "0.8", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } -der-ca01ad9e24f5d932 = { package = "der", version = "0.7", default-features = false, features = ["oid", "pem", "std"] } +crypto-common = { version = "0.1", default-features = false, features = ["std"] } +der = { version = "0.8", default-features = false, features = ["alloc", "derive", "flagset", "oid"] } derive_more = { version = "2", features = ["debug", "display", "error", "from"] } derive_more-impl = { version = "2", features = ["debug", "display", "error", "from"] } -digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "oid", "std"] } +digest-93f6ce9d446188ac = { package = "digest", version = "0.10", features = ["mac", "std"] } digest-a6292c17cd707f01 = { package = "digest", version = "0.11", features = ["alloc", "mac", "oid"] } displaydoc = { version = "0.2" } either = { version = "1", features = ["use_std"] } @@ -172,12 +147,9 @@ futures-util = { version = "0.3", features = ["channel", "io", "sink"] } hashbrown = { version = "0.17", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4" } hmac = { version = "0.12", default-features = false, features = ["reset"] } -hybrid-array = { version = "0.4", default-features = false, features = ["alloc", "subtle", "zeroize"] } hyper = { version = "1", features = ["full"] } hyper-util = { version = "0.1", features = ["server-auto", "service", "tokio"] } indexmap = { version = "2", features = ["serde"] } -jsonwebtoken = { version = "11", features = ["aws_lc_rs"] } -lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } log = { version = "0.4", default-features = false, features = ["std"] } md-5-93f6ce9d446188ac = { package = "md-5", version = "0.10" } md-5-a6292c17cd707f01 = { package = "md-5", version = "0.11" } @@ -187,44 +159,32 @@ nom-181b0d20215bb231 = { package = "nom", version = "8" } num-bigint = { version = "0.4" } num-complex = { version = "0.4" } num-integer = { version = "0.1", features = ["i128"] } -num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } -num-traits = { version = "0.2", features = ["i128", "libm"] } -object_store = { version = "0.14", default-features = false, features = ["aws", "azure-base", "fs", "gcp-base"] } +num-traits = { version = "0.2", features = ["i128"] } +object_store = { version = "0.14", default-features = false, features = ["aws-base", "azure-base", "fs", "gcp-base", "reqwest"] } once_cell = { version = "1" } percent-encoding = { version = "2" } -pkcs1 = { version = "0.7", default-features = false, features = ["pem", "pkcs8", "std"] } -pkcs8-93f6ce9d446188ac = { package = "pkcs8", version = "0.10", default-features = false, features = ["pem", "std"] } -pkcs8-a6292c17cd707f01 = { package = "pkcs8", version = "0.11", default-features = false, features = ["pem", "std"] } portable-atomic = { version = "1" } -ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] } proc-macro2 = { version = "1" } proptest = { version = "1", default-features = false, features = ["handle-panics"] } quote = { version = "1" } -rand = { version = "0.8" } -rand_chacha = { version = "0.3", default-features = false, features = ["std"] } rcgen = { version = "0.14", default-features = false, features = ["pem"] } regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "std", "unicode"] } regex-syntax = { version = "0.8" } -reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls", "rustls-no-provider", "stream"] } +reqwest = { version = "0.13", default-features = false, features = ["gzip", "http2", "json", "rustls-no-provider", "stream"] } rustls = { version = "0.23", default-features = false, features = ["std", "tls12"] } -rustls-pki-types = { version = "1", features = ["std"] } semver = { version = "1", features = ["serde"] } serde = { version = "1", features = ["alloc", "derive", "rc"] } serde_core = { version = "1", features = ["alloc", "rc"] } serde_json = { version = "1", features = ["preserve_order", "raw_value", "unbounded_depth"] } serde_spanned = { version = "1", default-features = false, features = ["serde", "std"] } serde_with = { version = "3", features = ["base64", "hex", "json"] } -sha2-93f6ce9d446188ac = { package = "sha2", version = "0.10" } -sha2-a6292c17cd707f01 = { package = "sha2", version = "0.11" } -signature = { version = "2", default-features = false, features = ["digest", "rand_core", "std"] } +sha2 = { version = "0.10" } siphasher = { version = "1" } slab = { version = "0.4" } smallvec = { version = "1", default-features = false, features = ["const_new", "union", "write"] } socket2 = { version = "0.6", default-features = false, features = ["all"] } -spin = { version = "0.9" } -spki-c38e5c1d305a1b54 = { package = "spki", version = "0.8", default-features = false, features = ["pem", "std"] } -spki-ca01ad9e24f5d932 = { package = "spki", version = "0.7", default-features = false, features = ["pem", "std"] } -subtle = { version = "2", features = ["const-generics"] } +spki = { version = "0.8", default-features = false, features = ["alloc"] } +subtle = { version = "2" } syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } @@ -248,8 +208,6 @@ winnow-dff4ba8e3ae991db = { package = "winnow", version = "1", features = ["simd zeroize = { version = "1", features = ["derive"] } [target.aarch64-apple-darwin.dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } block2 = { version = "0.6" } crossbeam-epoch = { version = "0.9" } @@ -258,10 +216,11 @@ errno = { version = "0.3" } flate2 = { version = "1", features = ["zlib-rs"] } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } libc = { version = "0.2", features = ["extra_traits"] } nix = { version = "0.31", features = ["net", "uio"] } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } objc2 = { version = "0.6" } objc2-core-audio = { version = "0.3", default-features = false, features = ["AudioHardware", "AudioHardwareDeprecated", "objc2", "objc2-core-audio-types", "objc2-foundation", "std"] } objc2-core-audio-types = { version = "0.3" } @@ -273,17 +232,13 @@ objc2-metal = { version = "0.3" } objc2-quartz-core = { version = "0.3", default-features = false, features = ["CALayer", "CAMediaTiming", "CAMetalLayer", "objc2-core-foundation", "objc2-core-graphics", "objc2-metal", "std"] } regex = { version = "1" } rustix = { version = "1", features = ["fs", "termios"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } security-framework-sys = { version = "2" } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.aarch64-apple-darwin.build-dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } block2 = { version = "0.6" } crossbeam-epoch = { version = "0.9" } @@ -292,10 +247,11 @@ errno = { version = "0.3" } flate2 = { version = "1", features = ["zlib-rs"] } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } libc = { version = "0.2", features = ["extra_traits"] } nix = { version = "0.31", features = ["net", "uio"] } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } objc2 = { version = "0.6" } objc2-core-audio = { version = "0.3", default-features = false, features = ["AudioHardware", "AudioHardwareDeprecated", "objc2", "objc2-core-audio-types", "objc2-foundation", "std"] } objc2-core-audio-types = { version = "0.3" } @@ -307,17 +263,13 @@ objc2-metal = { version = "0.3" } objc2-quartz-core = { version = "0.3", default-features = false, features = ["CALayer", "CAMediaTiming", "CAMetalLayer", "objc2-core-foundation", "objc2-core-graphics", "objc2-metal", "std"] } regex = { version = "1" } rustix = { version = "1", features = ["fs", "termios"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } security-framework-sys = { version = "2" } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.aarch64-unknown-linux-gnu.dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } crossbeam-epoch = { version = "0.9" } @@ -328,31 +280,28 @@ flate2 = { version = "1", features = ["zlib-rs"] } futures-io = { version = "0.3" } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } itertools = { version = "0.13" } libc = { version = "0.2", features = ["extra_traits"] } linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } nix = { version = "0.31", features = ["net", "uio"] } nom-15128469a54ed75a = { package = "nom", version = "7" } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } proc-macro2 = { version = "1" } quick-xml = { version = "0.41", features = ["overlapped-lists", "serialize"] } quote = { version = "1" } regex = { version = "1" } rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } tokio = { version = "1", default-features = false, features = ["tracing"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } uuid = { version = "1", default-features = false, features = ["serde"] } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.aarch64-unknown-linux-gnu.build-dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } crossbeam-epoch = { version = "0.9" } @@ -363,38 +312,34 @@ flate2 = { version = "1", features = ["zlib-rs"] } futures-io = { version = "0.3" } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } itertools = { version = "0.13" } libc = { version = "0.2", features = ["extra_traits"] } linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } nix = { version = "0.31", features = ["net", "uio"] } nom-15128469a54ed75a = { package = "nom", version = "7" } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } quick-xml = { version = "0.41", features = ["overlapped-lists", "serialize"] } regex = { version = "1" } rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } tokio = { version = "1", default-features = false, features = ["tracing"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } uuid = { version = "1", default-features = false, features = ["serde"] } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.x86_64-pc-windows-msvc.dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } crossbeam-epoch = { version = "0.9" } flate2 = { version = "1", features = ["zlib-rs"] } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } regex = { version = "1" } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } winapi = { version = "0.3", default-features = false, features = ["cfg", "evntrace", "in6addr", "inaddr", "minwinbase", "minwindef", "ntsecapi", "processthreadsapi", "sysinfoapi", "winbase", "windef", "winioctl"] } @@ -405,18 +350,15 @@ windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", feat zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.x86_64-pc-windows-msvc.build-dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } crossbeam-epoch = { version = "0.9" } flate2 = { version = "1", features = ["zlib-rs"] } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } regex = { version = "1" } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } winapi = { version = "0.3", default-features = false, features = ["cfg", "evntrace", "in6addr", "inaddr", "minwinbase", "minwindef", "ntsecapi", "processthreadsapi", "sysinfoapi", "winbase", "windef", "winioctl"] } @@ -427,8 +369,6 @@ windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", feat zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.x86_64-unknown-linux-gnu.dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } crossbeam-epoch = { version = "0.9" } @@ -439,31 +379,28 @@ flate2 = { version = "1", features = ["zlib-rs"] } futures-io = { version = "0.3" } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } itertools = { version = "0.13" } libc = { version = "0.2", features = ["extra_traits"] } linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } nix = { version = "0.31", features = ["net", "uio"] } nom-15128469a54ed75a = { package = "nom", version = "7" } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } proc-macro2 = { version = "1" } quick-xml = { version = "0.41", features = ["overlapped-lists", "serialize"] } quote = { version = "1" } regex = { version = "1" } rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } syn-7b89eefb6aaa9bf3 = { package = "syn", version = "3", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } tokio = { version = "1", default-features = false, features = ["tracing"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } uuid = { version = "1", default-features = false, features = ["serde"] } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } [target.x86_64-unknown-linux-gnu.build-dependencies] -aws-lc-rs = { version = "1", default-features = false, features = ["prebuilt-nasm"] } -aws-lc-sys = { version = "0.47", default-features = false, features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["std"] } bytemuck = { version = "1", default-features = false, features = ["aarch64_simd"] } crossbeam-epoch = { version = "0.9" } @@ -474,20 +411,19 @@ flate2 = { version = "1", features = ["zlib-rs"] } futures-io = { version = "0.3" } getrandom = { version = "0.4", default-features = false, features = ["std", "sys_rng"] } half = { version = "2", default-features = false, features = ["num-traits"] } -hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "tls12"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "tls12"] } hyper-util = { version = "0.1", default-features = false, features = ["client-legacy", "client-proxy"] } itertools = { version = "0.13" } libc = { version = "0.2", features = ["extra_traits"] } linux-raw-sys = { version = "0.12", features = ["auxvec", "elf", "if_ether", "ioctl", "net", "netlink", "no_std", "prctl", "system", "xdp"] } nix = { version = "0.31", features = ["net", "uio"] } nom-15128469a54ed75a = { package = "nom", version = "7" } +num-traits = { version = "0.2", default-features = false, features = ["libm"] } quick-xml = { version = "0.41", features = ["overlapped-lists", "serialize"] } regex = { version = "1" } rustix = { version = "1", features = ["event", "net", "param", "pipe", "process", "shm", "system", "termios", "thread", "time"] } -rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs", "aws_lc_rs"] } -rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "std"] } tokio = { version = "1", default-features = false, features = ["tracing"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["tls12"] } tower = { version = "0.5", default-features = false, features = ["retry", "timeout"] } tower-http = { version = "0.6", default-features = false, features = ["decompression-gzip", "follow-redirect"] } uuid = { version = "1", default-features = false, features = ["serde"] } diff --git a/sh/dart/generate.sh b/sh/dart/generate.sh index ad5a4c87932..3e4bbe02e4a 100755 --- a/sh/dart/generate.sh +++ b/sh/dart/generate.sh @@ -20,7 +20,7 @@ command -v dart >/dev/null 2>&1 || { # Debug builds use the environment dart/moq_ffi/hook/build.dart gets, so the hook's # own Cargo run during `dart test` finds this build fresh. Dart filters a hook's -# environment, and build scripts such as aws-lc-sys's rerun when a variable they +# environment, and build scripts such as openh264-sys2's rerun when a variable they # track (CC, PKG_CONFIG, ...) changes, rebuilding everything above them. This # mirrors includeHookEnvironmentVariable from the hooks_runner in the pinned Dart # SDK (1.5.0 in Dart 3.13); sh/dart/check.sh fails once the two drift apart. diff --git a/sh/rs/crypto.py b/sh/rs/crypto.py new file mode 100644 index 00000000000..219c6ed77c1 --- /dev/null +++ b/sh/rs/crypto.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python3 +"""Fail when a build target's dependency graph compiles C crypto. + +rind is MoQ's only crypto, so on every target a workflow names, the workspace's +normal and build dependencies hold no C crypto crate, and no crypto crate +reaches `cc`. Each target is walked on its own: `--target all` turns on custom +cfgs no build sets, such as libcrux's Valgrind hooks. Run from `just rs lint`. +""" + +import re +import subprocess +import sys +from collections import defaultdict +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] + +# C crypto libraries, refused anywhere in the graph. +C_CRYPTO = {"aws-lc-sys", "ring", "openssl-sys"} +# Crypto crates that must compile without a C toolchain. +CRYPTO = re.compile(r"^(rind|rind-.+|libcrux-.+|rustls|rustls-.+)$") + + +def run(*args: str) -> str: + return subprocess.run(args, cwd=ROOT, check=True, capture_output=True, text=True).stdout + + +known = set(run("rustc", "--print", "target-list").split()) +named = set() +for workflow in (ROOT / ".github/workflows").glob("*.yml"): + named |= set(re.findall(r"\b[a-z0-9_]+(?:-[a-z0-9_]+){2,3}\b", workflow.read_text())) +targets = sorted(named & known) +if not targets: + sys.exit("error: no build target found in .github/workflows") + +errors = [] +for target in targets: + graph = run( + "cargo", + "tree", + "--locked", + "--workspace", + "--all-features", + "--target", + target, + "-e", + "normal,build", + "--prefix", + "depth", + "--format", + "{p}", + ) + # A repeated node is printed once in full, so collecting every edge recovers the graph. + children = defaultdict(set) + nodes = set() + path = [] + for line in graph.splitlines(): + match = re.match(r"^(\d+)(\S+) ", line) + if not match: + continue + depth, name = int(match[1]), match[2] + nodes.add(name) + del path[depth:] + if path: + children[path[-1]].add(name) + path.append(name) + + for name in sorted(C_CRYPTO & nodes): + errors.append(f"{target}: {name} is C crypto; use rind") + for root in sorted(name for name in nodes if CRYPTO.match(name)): + seen, stack = {root}, [root] + while stack: + for child in children[stack.pop()] - seen: + seen.add(child) + stack.append(child) + if "cc" in seen: + errors.append(f"{target}: crypto crate {root} reaches cc") + +if errors: + print("\n".join(errors), file=sys.stderr) + print( + "Find the edge: cargo tree --workspace --all-features -e normal,build --target -i ", + file=sys.stderr, + ) + sys.exit(1) +print(f"no C crypto on {len(targets)} targets: {' '.join(targets)}") From 246cd23ae5b712d6cbfaf281c6fa199625c0d036 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 23:14:52 -0800 Subject: [PATCH 3/6] quest: cli-packaging's release feature replaces moq-cli's linux-features Co-Authored-By: Claude Opus 5.5 --- quest/m3/cli-packaging.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quest/m3/cli-packaging.md b/quest/m3/cli-packaging.md index fa6fdc34cf4..e743d08487a 100644 --- a/quest/m3/cli-packaging.md +++ b/quest/m3/cli-packaging.md @@ -38,14 +38,17 @@ than at run. Then verify the shipped artifact runs `moq devices` and `moq play` on each platform, since a feature that compiles into the binary and then fails to open a device is the same gap one layer down. -Also enable `v4l2` in the Linux ARM release build, so a released binary on a -Raspberry Pi 4 publishes from `moq import capture` through the V4L2 M2M +Also enable `v4l2` in the Linux ARM release builds, so a released binary on a +Raspberry Pi 4 (or a 32-bit board on the armv7 release) publishes from `moq import capture` through the V4L2 M2M hardware encoder (`rs/moq-video/src/v4l2.rs`, already run on a Pi 4's `bcm2835-codec`) with no GStreamer detour. That Pi 4 run covered only 640x360 once, so the Pi 4 check also covers `set_bitrate` on a running encoder (congestion control retunes through it) and 1080p, which codes as 1088 rows and relies on the compose rectangle to crop back. +`moq-cli.yml` already passes `linux-features: v4l2` to `release-binary.yml`, +a no-op until `capture` is on; `release` replaces it there. + Add a board hardware note to `doc/bin/cli.md` next to the capture build instructions: Raspberry Pi 5 has no video encoder and Jetson Orin Nano ships without NVENC; Pi 4, CM4, Zero 2 W, and Orin NX and above encode. RK3588 From aea22c364ccb4715388964b6a3b85a27e058dad6 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 23:22:09 -0800 Subject: [PATCH 4/6] fix(release): package a prebuilt cross binary, and give the auth bench rind's provider Co-Authored-By: Claude Opus 5.5 --- rs/moq-auth/benches/verify.rs | 2 ++ sh/rs/package-binary.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rs/moq-auth/benches/verify.rs b/rs/moq-auth/benches/verify.rs index 8c9abbd0bd9..c5ccbf7ab3e 100644 --- a/rs/moq-auth/benches/verify.rs +++ b/rs/moq-auth/benches/verify.rs @@ -340,6 +340,8 @@ impl Bench { runtime.spawn(async move { server.serve(listener).await }); let mut request = Request::new("bench", Transport::Quic, "/demo"); request.query = Some(format!("jwt={token}")); + // reqwest reads rustls's process default, which a binary's main installs. + moq_crypto::provider::install_default().unwrap(); let client = reqwest::Client::new(); let post = move || { let response = client.post(&url).json(&request).send(); diff --git a/sh/rs/package-binary.sh b/sh/rs/package-binary.sh index cfda98d1ad7..e0f5d82c2a4 100755 --- a/sh/rs/package-binary.sh +++ b/sh/rs/package-binary.sh @@ -83,10 +83,10 @@ if [[ -z "$TARGET" ]]; then echo "Detected target: $TARGET" fi -# Release builds must match the host. A mismatch would silently mislabel the -# archive, so reject it before building. +# The nix build targets the host, so a different target would silently mislabel +# the archive; reject it before building. A prebuilt --binary names its own target. HOST_TARGET=$(rustc -vV | awk '/^host:/ {print $2}') -if [[ "$TARGET" != "$HOST_TARGET" ]]; then +if [[ -z "$BINARY" && "$TARGET" != "$HOST_TARGET" ]]; then echo "Error: unsupported cross ($HOST_TARGET -> $TARGET); refusing to mislabel the archive." >&2 exit 1 fi From bd2464f945ed1b1b62d19ece3640c8343901ed57 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sun, 8 Nov 2026 17:33:54 -0800 Subject: [PATCH 5/6] fix(rind): armhf apt command, little-endian armv7 only, Mach-O scrub by target, quest notes Co-Authored-By: Claude Opus 5.5 --- doc/setup/install.md | 2 ++ infra/moq-sh/install.sh | 3 ++- infra/moq-sh/install.test.sh | 2 ++ quest/m1/README.md | 2 +- quest/m2/README.md | 3 +++ quest/m2/recut-held.md | 4 ++-- sh/rs/package-binary.sh | 2 +- 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/setup/install.md b/doc/setup/install.md index c5f4ca8e7db..b883efb2735 100644 --- a/doc/setup/install.md +++ b/doc/setup/install.md @@ -101,6 +101,8 @@ sudo apt update sudo apt install moq-relay moq gstreamer1.0-moq ``` +On `armhf`, install `moq` alone instead: `sudo apt install moq`. + ## Fedora, RHEL, and openSUSE Fedora 39+, RHEL 9, Rocky 9, AlmaLinux 9. On openSUSE use `zypper addrepo`. diff --git a/infra/moq-sh/install.sh b/infra/moq-sh/install.sh index 86511e14d21..891280bf940 100755 --- a/infra/moq-sh/install.sh +++ b/infra/moq-sh/install.sh @@ -69,7 +69,8 @@ detect_target() { case "$arch" in x86_64 | amd64) target=x86_64-unknown-linux-gnu ;; aarch64 | arm64) target=aarch64-unknown-linux-gnu ;; - armv7* | armv8l) target=armv7-unknown-linux-gnueabihf ;; + # Only little-endian (`l`) is published; big-endian ARM reports armv7b. + armv7l | armv8l) target=armv7-unknown-linux-gnueabihf ;; *) die "no moq build for Linux on $arch; x86_64, aarch64, and armv7 are published. Try: cargo install moq-cli" ;; esac check_glibc diff --git a/infra/moq-sh/install.test.sh b/infra/moq-sh/install.test.sh index fb3ac8e165a..8745014df30 100755 --- a/infra/moq-sh/install.test.sh +++ b/infra/moq-sh/install.test.sh @@ -231,6 +231,8 @@ suite() { refuse "intel mac" "only Apple silicon" "$tmp/served.sh" --dir "$dir" host Linux riscv64 2.39 refuse "unsupported arch" "x86_64, aarch64, and armv7" "$tmp/served.sh" --dir "$dir" + host Linux armv7b 2.36 + refuse "big-endian armv7" "x86_64, aarch64, and armv7" "$tmp/served.sh" --dir "$dir" host FreeBSD amd64 refuse "unsupported os" "winget" "$tmp/served.sh" --dir "$dir" host Linux x86_64 2.31 diff --git a/quest/m1/README.md b/quest/m1/README.md index 5cf7c5c2ff6..9c67b0e7c59 100644 --- a/quest/m1/README.md +++ b/quest/m1/README.md @@ -25,7 +25,7 @@ because a downstream iGPU transcode trial needs it now. Held here by open claims: a quest's branch is its path, so a claimed quest cannot move until its PR merges, and an epic moves with its children. These breaking epics and quests stay in m1 for now and are listed in m2's -`Required`, so the cut still waits on them: drop-set, rind, and +`Required`, so the cut still waits on them: drop-set and stream-credit. The [re-cut follow-up](/quest/m2/recut-held.md) moves what remains of them once their claims merge. diff --git a/quest/m2/README.md b/quest/m2/README.md index e14443459b9..af3c2373fd1 100644 --- a/quest/m2/README.md +++ b/quest/m2/README.md @@ -131,6 +131,9 @@ Changed 2026-10-26 (maintainer): pure-Rust crypto moved to m3 until upstream graviola and ACME releases make it cheap, so the cut ships on aws-lc-rs. Dropping the `rsa` crate from moq-auth's production graph stays in m1. +Changed 2026-11-08: the rind epic finished in m1, so the cut ships on rind +with no C crypto; aws-lc-rs is out of the workspace. + Added 2026-10-25 (maintainer): the studio's GPU encode and source import quests are in m1 so moq-video's GPU encode and import API changes, mainly encoders taking a GPU diff --git a/quest/m2/recut-held.md b/quest/m2/recut-held.md index 10d76d7f746..da386c2b14f 100644 --- a/quest/m2/recut-held.md +++ b/quest/m2/recut-held.md @@ -3,8 +3,8 @@ ## Goal The epics that open claims held in place during the 2026-11-05 milestone -re-cut sit where the re-cut's rules put them. What remains of drop-set, -rind, and stream-credit moves from m1 to m2; and the +re-cut sit where the re-cut's rules put them. What remains of drop-set +and stream-credit moves from m1 to m2; and the probe epic moves from m2 to m3. The "held" notes in the m1, m2, and cut gate READMEs are removed, along with each held entry's extra link from m2's or the gate's `Required`. diff --git a/sh/rs/package-binary.sh b/sh/rs/package-binary.sh index e0f5d82c2a4..1c860e8dc9f 100755 --- a/sh/rs/package-binary.sh +++ b/sh/rs/package-binary.sh @@ -133,7 +133,7 @@ chmod 0755 "$PACKAGE_DIR/bin/$BIN" # Rewrite the leaked paths to load from the system dyld shared cache (via # /usr/lib), like a plain `cargo build` does. scrub-macho.sh also asserts no # /nix path survives, so this can't silently ship again. -if [[ "$(uname)" == "Darwin" ]]; then +if [[ "$TARGET" == *-apple-darwin ]]; then bin="$PACKAGE_DIR/bin/$BIN" "$SCRIPT_DIR/scrub-macho.sh" "$bin" From 2ad671a91ad8641ee57d9130a24c1af615905a9f Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sun, 8 Nov 2026 19:49:58 -0800 Subject: [PATCH 6/6] test(auth): serve's secret test hands reqwest rind's TLS Co-Authored-By: Claude Opus 5.5 --- rs/moq-auth/src/serve.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rs/moq-auth/src/serve.rs b/rs/moq-auth/src/serve.rs index a42844e80ea..9a684d19a8f 100644 --- a/rs/moq-auth/src/serve.rs +++ b/rs/moq-auth/src/serve.rs @@ -1077,7 +1077,10 @@ mod tests { let addr = listener.local_addr().unwrap(); tokio::spawn(async move { server.serve(listener).await }); - let http = reqwest::Client::new(); + let http = reqwest::Client::builder() + .use_preconfigured_tls(crate::crypto::tls().unwrap()) + .build() + .unwrap(); for (userinfo, admitted) in [ ("", false), ("relay:wrong@", false),