ecdsa: fix digest+hazmat feature combo (#283)

Also CIs for `arithmetic`+`hazmat` and `digest`+`hazmat` feature combos
RustCrypto · Apr 21, 2021 · f1f0e57 · f1f0e57
1 parent b11cfa3
commit f1f0e57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ecdsa.yml b/.github/workflows/ecdsa.yml
@@ -36,8 +36,10 @@ jobs:
           override: true
       - run: cargo build --no-default-features --release --target ${{ matrix.target }}
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features arithmetic
+      - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features arithmetic,hazmat
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features dev
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features digest
+      - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features digest,hazmat
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features hazmat
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features pkcs8
       - run: cargo build --no-default-features --release --target ${{ matrix.target }} --features pem

diff --git a/ecdsa/src/hazmat.rs b/ecdsa/src/hazmat.rs
@@ -15,9 +15,7 @@
 use {
     crate::SignatureSize,
     core::borrow::Borrow,
-    elliptic_curve::{
-        ff::PrimeField, ops::Invert, FieldBytes, Order, ProjectiveArithmetic, Scalar,
-    },
+    elliptic_curve::{ff::PrimeField, ops::Invert, FieldBytes, ProjectiveArithmetic, Scalar},
     signature::Error,
 };
 
@@ -27,7 +25,7 @@ use crate::signature::{digest::Digest, PrehashSignature};
 #[cfg(any(feature = "arithmetic", feature = "digest"))]
 use crate::{
     elliptic_curve::{generic_array::ArrayLength, weierstrass::Curve},
-    Signature,
+    Order, Signature,
 };
 
 /// Try to sign the given prehashed message using ECDSA.