p384: scalar multiplication test vectors (#570)

Tests scalar multiplication using vectors from: http://point-at-infinity.org/ecc/nisttv
RustCrypto · May 27, 2022 · 1f35666 · 1f35666
1 parent 38ea146
commit 1f35666
Show file tree

Hide file tree

Showing 4 changed files with 283 additions and 94 deletions.
diff --git a/p384/src/arithmetic/projective.rs b/p384/src/arithmetic/projective.rs
@@ -597,9 +597,9 @@ impl TryFrom<&ProjectivePoint> for PublicKey {
 
 #[cfg(test)]
 mod tests {
-    use super::{AffinePoint, ProjectivePoint};
-    use crate::test_vectors::group::ADD_TEST_VECTORS;
-    use elliptic_curve::group::prime::PrimeCurveAffine;
+    use super::{AffinePoint, ProjectivePoint, Scalar};
+    use crate::test_vectors::group::{ADD_TEST_VECTORS, MUL_TEST_VECTORS};
+    use elliptic_curve::{group::prime::PrimeCurveAffine, PrimeField};
 
     #[test]
     fn affine_to_projective() {
@@ -708,4 +708,27 @@ mod tests {
         let generator = ProjectivePoint::GENERATOR;
         assert_eq!(generator.double() - &generator, generator);
     }
+
+    #[test]
+    fn test_vector_scalar_mult() {
+        let generator = ProjectivePoint::GENERATOR;
+
+        for (k, coords) in ADD_TEST_VECTORS
+            .iter()
+            .enumerate()
+            .map(|(k, coords)| (Scalar::from(k as u64 + 1), *coords))
+            .chain(
+                MUL_TEST_VECTORS
+                    .iter()
+                    .cloned()
+                    .map(|(k, x, y)| (Scalar::from_repr(k.into()).unwrap(), (x, y))),
+            )
+        {
+            // dbg!(&k);
+
+            let res = (generator * &k).to_affine();
+            assert_eq!(res.x.to_sec1(), coords.0.into());
+            assert_eq!(res.y.to_sec1(), coords.1.into());
+        }
+    }
 }
diff --git a/p384/src/arithmetic/scalar.rs b/p384/src/arithmetic/scalar.rs
@@ -351,7 +351,7 @@ impl From<ScalarCore<NistP384>> for Scalar {
 impl From<u64> for Scalar {
     fn from(n: u64) -> Scalar {
         let mut limbs = NonMontFe::default();
-        limbs[limbs.len() - 1] = n;
+        limbs[0] = n;
         let mut fe = Fe::default();
         fiat_p384_scalar_to_montgomery(&mut fe, &limbs);
         Scalar(fe)

diff --git a/p384/src/test_vectors.rs b/p384/src/test_vectors.rs
@@ -2,5 +2,4 @@
 
 #[cfg(test)]
 pub mod ecdsa;
-//pub mod field;
 pub mod group;