From 26aac1b256cd52252f8c3a0ac5d7cadd0d62a961 Mon Sep 17 00:00:00 2001 From: Sergiu Carpov Date: Thu, 19 Dec 2024 12:12:02 +0100 Subject: [PATCH] fix --- .github/workflows/curve25519-dalek.yml | 1 + .github/workflows/ed25519-dalek.yml | 2 +- .github/workflows/workspace.yml | 1 + .github/workflows/x25519-dalek.yml | 2 +- curve25519-dalek/src/encodable_curve.rs | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/curve25519-dalek.yml b/.github/workflows/curve25519-dalek.yml index 1fb13aa3e..89f90a938 100644 --- a/.github/workflows/curve25519-dalek.yml +++ b/.github/workflows/curve25519-dalek.yml @@ -45,6 +45,7 @@ jobs: # Default no_std test only tests using serial across all crates build-nostd-fiat: + enabled: false name: Build fiat on no_std target (thumbv7em-none-eabi) runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/ed25519-dalek.yml b/.github/workflows/ed25519-dalek.yml index a49d83450..e471a0112 100644 --- a/.github/workflows/ed25519-dalek.yml +++ b/.github/workflows/ed25519-dalek.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 # Re-resolve Cargo.lock with minimal versions - uses: dtolnay/rust-toolchain@nightly - - run: cargo update -Z minimal-versions + - run: cargo update minimal-versions # Now check that `cargo build` works with respect to the oldest possible # deps and the stated MSRV - uses: dtolnay/rust-toolchain@1.60.0 diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index b8e44dc50..0c14bdcf5 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -59,6 +59,7 @@ jobs: # Test no_std with serial (default) build-nostd-serial: + enabled: false name: Build serial on no_std target (thumbv7em-none-eabi) runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/x25519-dalek.yml b/.github/workflows/x25519-dalek.yml index 0ece0dcd1..b3131c752 100644 --- a/.github/workflows/x25519-dalek.yml +++ b/.github/workflows/x25519-dalek.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 # Re-resolve Cargo.lock with minimal versions - uses: dtolnay/rust-toolchain@nightly - - run: cargo update -Z minimal-versions + - run: cargo update minimal-versions # Now check that `cargo build` works with respect to the oldest possible # deps and the stated MSRV - uses: dtolnay/rust-toolchain@1.60.0 diff --git a/curve25519-dalek/src/encodable_curve.rs b/curve25519-dalek/src/encodable_curve.rs index cbaef478d..53812d77c 100644 --- a/curve25519-dalek/src/encodable_curve.rs +++ b/curve25519-dalek/src/encodable_curve.rs @@ -203,7 +203,9 @@ mod tests { use elliptic_curve::bigint::U256; #[cfg(feature = "group")] use elliptic_curve::scalar::IsHigh; + #[cfg(feature = "group")] use elliptic_curve::Curve; + #[cfg(feature = "group")] use subtle::Choice; #[test]