From f22f4aad7dd901a690675e76ae9ca33e6826a474 Mon Sep 17 00:00:00 2001 From: Karolin Varner Date: Sun, 13 Apr 2025 12:09:12 +0200 Subject: [PATCH] feat: Fix minimum supported cargo version to 1.77 This should ensure, that our Cargo.lock file stays at version 3 when using `cargo update` or dependabot. --- .github/workflows/qc.yaml | 4 +++- cipher-traits/Cargo.toml | 1 + ciphers/Cargo.toml | 1 + constant-time/Cargo.toml | 1 + fuzz/Cargo.toml | 1 + oqs/Cargo.toml | 1 + rosenpass/Cargo.toml | 1 + rp/Cargo.toml | 1 + rust-toolchain.toml | 2 ++ secret-memory/Cargo.toml | 1 + to/Cargo.toml | 1 + util/Cargo.toml | 1 + wireguard-broker/Cargo.toml | 1 + 13 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 rust-toolchain.toml 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/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/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..fcc85b9 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.77" 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/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 }