diff --git a/.github/workflows/qc.yaml b/.github/workflows/qc.yaml index 7264ce3..5a25111 100644 --- a/.github/workflows/qc.yaml +++ b/.github/workflows/qc.yaml @@ -159,6 +159,7 @@ jobs: cargo-fuzz: runs-on: ubicloud-standard-2-ubuntu-2204 + env: steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 @@ -173,7 +174,7 @@ jobs: - name: Install nightly toolchain run: | rustup toolchain install nightly - rustup default nightly + rustup override nightly - name: Install cargo-fuzz run: cargo install cargo-fuzz - name: Run fuzzing @@ -209,4 +210,5 @@ jobs: files: ./target/grcov/lcov verbose: true env: + RUSTUP_TOOLCHAIN: 1.81 CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index aeeec36..98e590d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -500,9 +500,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] diff --git a/cipher-traits/Cargo.toml b/cipher-traits/Cargo.toml index 15f24ff..f2656a1 100644 --- a/cipher-traits/Cargo.toml +++ b/cipher-traits/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal traits for cryptographic primitives" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [dependencies] thiserror = { workspace = true } diff --git a/ciphers/Cargo.toml b/ciphers/Cargo.toml index c5fd366..9e34a08 100644 --- a/ciphers/Cargo.toml +++ b/ciphers/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal ciphers and other cryptographic primitives use homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [features] experiment_libcrux_all = [ diff --git a/constant-time/Cargo.toml b/constant-time/Cargo.toml index 9c85e0d..a4faab5 100644 --- a/constant-time/Cargo.toml +++ b/constant-time/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal utilities for constant time crypto implementat homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/flake.nix b/flake.nix index d232bfa..1e84d67 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ nativeBuildInputs = with pkgs; [ cargo-audit cargo-release + cargo-msrv rustfmt nodePackages.prettier nushell # for the .ci/gen-workflow-files.nu script diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 073e91f..b4c1eb9 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -3,6 +3,7 @@ name = "rosenpass-fuzzing" version = "0.0.1" publish = false edition = "2021" +rust-version = "1.77" [features] experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux_all"] diff --git a/oqs/Cargo.toml b/oqs/Cargo.toml index 6a69563..b562e74 100644 --- a/oqs/Cargo.toml +++ b/oqs/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal bindings to liboqs" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [dependencies] rosenpass-cipher-traits = { workspace = true } diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml index 62f2149..2e65b95 100644 --- a/rosenpass/Cargo.toml +++ b/rosenpass/Cargo.toml @@ -8,6 +8,7 @@ description = "Build post-quantum-secure VPNs with WireGuard!" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [[bin]] name = "rosenpass" diff --git a/rp/Cargo.toml b/rp/Cargo.toml index 82121db..918e331 100644 --- a/rp/Cargo.toml +++ b/rp/Cargo.toml @@ -6,6 +6,7 @@ license = "MIT OR Apache-2.0" description = "Build post-quantum-secure VPNs with WireGuard!" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" +rust-version = "1.77" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..83025f9 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.77.0" diff --git a/secret-memory/Cargo.toml b/secret-memory/Cargo.toml index e186ec7..53c14da 100644 --- a/secret-memory/Cargo.toml +++ b/secret-memory/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal utilities for storing secrets in memory" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [dependencies] anyhow = { workspace = true } diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 4405302..babb9a4 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1344,6 +1344,13 @@ criteria = "safe-to-deploy" delta = "0.5.13 -> 0.5.14" aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml" +[[audits.mozilla.audits.crossbeam-channel]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +delta = "0.5.14 -> 0.5.15" +notes = "Fixes a regression from an earlier version which could lead to a double free" +aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml" + [[audits.mozilla.audits.crunchy]] who = "Erich Gubler " criteria = "safe-to-deploy" diff --git a/to/Cargo.toml b/to/Cargo.toml index bda13f3..1692a0b 100644 --- a/to/Cargo.toml +++ b/to/Cargo.toml @@ -8,6 +8,7 @@ description = "Flexible destination parameters" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [dev-dependencies] doc-comment = { workspace = true } diff --git a/util/Cargo.toml b/util/Cargo.toml index d6bdf00..49d66fb 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal utilities" homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/wireguard-broker/Cargo.toml b/wireguard-broker/Cargo.toml index cfc74e9..2ee2d47 100644 --- a/wireguard-broker/Cargo.toml +++ b/wireguard-broker/Cargo.toml @@ -8,6 +8,7 @@ description = "Rosenpass internal broker that runs as root and supplies exchange homepage = "https://rosenpass.eu/" repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" +rust-version = "1.77" [dependencies] thiserror = { workspace = true }