Implement Mul<NonIdentity> for NonZeroScalar (#1855)

This implements `Mul<NonIdentity> for NonZeroScalar`.

Analogous to #1854.

Author: daxpedda

elliptic-curve/src/point/non_identity.rs

@@ -175,20 +175,32 @@ where
     }
 }
 
-impl<C, P> Mul<&NonZeroScalar<C>> for &NonIdentity<P>
+impl<C, P> Mul<NonZeroScalar<C>> for &NonIdentity<P>
 where
     C: CurveArithmetic,
     P: Copy + Mul<Scalar<C>, Output = P>,
 {
     type Output = NonIdentity<P>;
 
-    fn mul(self, rhs: &NonZeroScalar<C>) -> Self::Output {
+    fn mul(self, rhs: NonZeroScalar<C>) -> Self::Output {
         NonIdentity {
             point: self.point * *rhs.as_ref(),
         }
     }
 }
 
+impl<C, P> Mul<&NonZeroScalar<C>> for &NonIdentity<P>
+where
+    C: CurveArithmetic,
+    P: Copy + Mul<Scalar<C>, Output = P>,
+{
+    type Output = NonIdentity<P>;
+
+    fn mul(self, rhs: &NonZeroScalar<C>) -> Self::Output {
+        self * *rhs
+    }
+}
+
 #[cfg(feature = "serde")]
 impl<P> Serialize for NonIdentity<P>
 where

elliptic-curve/src/scalar/nonzero.rs

@@ -3,6 +3,7 @@
 use crate::{
     CurveArithmetic, Error, FieldBytes, PrimeCurve, Scalar, ScalarPrimitive, SecretKey,
     ops::{Invert, Reduce, ReduceNonZero},
+    point::NonIdentity,
     scalar::IsHigh,
 };
 use base16ct::HexDisplay;
@@ -258,6 +259,54 @@ where
     }
 }
 
+impl<C, P> Mul<NonIdentity<P>> for NonZeroScalar<C>
+where
+    C: CurveArithmetic,
+    NonIdentity<P>: Mul<NonZeroScalar<C>, Output = NonIdentity<P>>,
+{
+    type Output = NonIdentity<P>;
+
+    fn mul(self, rhs: NonIdentity<P>) -> Self::Output {
+        rhs * self
+    }
+}
+
+impl<C, P> Mul<&NonIdentity<P>> for NonZeroScalar<C>
+where
+    C: CurveArithmetic,
+    for<'a> &'a NonIdentity<P>: Mul<NonZeroScalar<C>, Output = NonIdentity<P>>,
+{
+    type Output = NonIdentity<P>;
+
+    fn mul(self, rhs: &NonIdentity<P>) -> Self::Output {
+        rhs * self
+    }
+}
+
+impl<C, P> Mul<NonIdentity<P>> for &NonZeroScalar<C>
+where
+    C: CurveArithmetic,
+    for<'a> NonIdentity<P>: Mul<&'a NonZeroScalar<C>, Output = NonIdentity<P>>,
+{
+    type Output = NonIdentity<P>;
+
+    fn mul(self, rhs: NonIdentity<P>) -> Self::Output {
+        rhs * self
+    }
+}
+
+impl<C, P> Mul<&NonIdentity<P>> for &NonZeroScalar<C>
+where
+    C: CurveArithmetic,
+    for<'a> &'a NonIdentity<P>: Mul<&'a NonZeroScalar<C>, Output = NonIdentity<P>>,
+{
+    type Output = NonIdentity<P>;
+
+    fn mul(self, rhs: &NonIdentity<P>) -> Self::Output {
+        rhs * self
+    }
+}
+
 impl<C> PartialEq for NonZeroScalar<C>
 where
     C: CurveArithmetic,