Merge pull request #90 from fjarri/nonzero-mul

Use the new nonzero scalar * nonzero scalar implementation in elliptic-curve 0.10.7
nucypher · Jan 15, 2022 · cd3266b · cd3266b
2 parents c752d02 + 5d61ba7
commit cd3266b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/umbral-pre/Cargo.toml b/umbral-pre/Cargo.toml
@@ -21,7 +21,7 @@ pyo3 = { version = "0.15", optional = true }
 
 # These packages are among the dependencies of the packages above.
 # Their versions should be updated when the main packages above are updated.
-elliptic-curve = { version = "0.11" }
+elliptic-curve = { version = "0.11.7" }
 digest = "0.9"
 generic-array = "0.14"
 aead = { version = "0.4", default-features = false }

diff --git a/umbral-pre/src/curve.rs b/umbral-pre/src/curve.rs
@@ -285,17 +285,7 @@ impl Mul<&NonZeroCurveScalar> for &NonZeroCurveScalar {
     type Output = NonZeroCurveScalar;
 
     fn mul(self, other: &NonZeroCurveScalar) -> NonZeroCurveScalar {
-        let scalar: BackendScalar = self.0.mul(&(*other.0));
-
-        // Converting from CtOption
-        let maybe_nz_scalar: Option<BackendNonZeroScalar> =
-            BackendNonZeroScalar::new(scalar).into();
-
-        // RustCrypto does not support multiplying non-zero scalars preserving the invariant.
-        // But we know it always results in a non-zero scalar, so we can safely unwrap.
-        NonZeroCurveScalar::from_backend_scalar(
-            maybe_nz_scalar.expect("The product of two non-zero scalars must be non-zero"),
-        )
+        NonZeroCurveScalar(self.0.mul(other.0))
     }
 }