p384: use generic prime order formulas

Uses the generic implementation of Renes-Costello-Batina 2015 added to the `elliptic-curve` crate: RustCrypto/traits#1022
RustCrypto · Jun 12, 2022 · a4db652 · a4db652
1 parent d3386b7
commit a4db652
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 517 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/p384/Cargo.toml b/p384/Cargo.toml
@@ -17,7 +17,7 @@ edition = "2021"
 rust-version = "1.57"
 
 [dependencies]
-elliptic-curve = { version = "0.12", default-features = false, features = ["hazmat", "sec1"] }
+elliptic-curve = { version = "0.12.1", default-features = false, features = ["hazmat", "sec1"] }
 
 # optional dependencies
 ecdsa-core = { version = "0.14", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/p384/src/arithmetic/field.rs b/p384/src/arithmetic/field.rs
@@ -28,8 +28,8 @@ use self::field_impl::*;
 use crate::FieldBytes;
 use core::ops::{AddAssign, MulAssign, Neg, SubAssign};
 use elliptic_curve::{
-    bigint::{self, ArrayEncoding, Encoding, Integer, Limb, U384},
-    subtle::{Choice, ConstantTimeEq, ConstantTimeLess, CtOption},
+    bigint::{self, Encoding, Limb, U384},
+    subtle::{Choice, ConstantTimeEq, CtOption},
 };
 
 /// Constant representing the modulus
@@ -40,7 +40,7 @@ pub(crate) const MODULUS: U384 = U384::from_be_hex("ffffffffffffffffffffffffffff
 #[derive(Clone, Copy, Debug)]
 pub struct FieldElement(pub(super) U384);
 
-impl_field_element!(
+elliptic_curve::impl_field_element!(
     FieldElement,
     FieldBytes,
     U384,