Implement TryFrom for NonIdentity/ZeroScalar

daxpedda · daxpedda · commit 203fd36dd4dc · 2025-05-17T19:51:42.000+02:00
diff --git a/bign256/src/arithmetic/scalar.rs b/bign256/src/arithmetic/scalar.rs
@@ -231,6 +231,14 @@ impl TryFrom<U256> for Scalar {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::Scalar;
diff --git a/bp256/src/r1/arithmetic.rs b/bp256/src/r1/arithmetic.rs
@@ -2,7 +2,7 @@
 
 use super::BrainpoolP256r1;
 use crate::{FieldElement, Scalar};
-use elliptic_curve::{CurveArithmetic, PrimeCurveArithmetic};
+use elliptic_curve::{CurveArithmetic, Error, PrimeCurveArithmetic};
 use primeorder::{PrimeCurveParams, point_arithmetic};
 
 /// Elliptic curve point in affine coordinates.
@@ -76,3 +76,11 @@ impl From<&Scalar> for ScalarPrimitive {
         ScalarPrimitive::new(scalar.into()).unwrap()
     }
 }
+
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
diff --git a/bp256/src/t1/arithmetic.rs b/bp256/src/t1/arithmetic.rs
@@ -2,7 +2,7 @@
 
 use super::BrainpoolP256t1;
 use crate::{FieldElement, Scalar};
-use elliptic_curve::{CurveArithmetic, PrimeCurveArithmetic};
+use elliptic_curve::{CurveArithmetic, Error, PrimeCurveArithmetic};
 use primeorder::{PrimeCurveParams, point_arithmetic};
 
 /// Elliptic curve point in affine coordinates.
@@ -76,3 +76,11 @@ impl From<&Scalar> for ScalarPrimitive {
         ScalarPrimitive::new(scalar.into()).unwrap()
     }
 }
+
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
diff --git a/bp384/src/r1/arithmetic.rs b/bp384/src/r1/arithmetic.rs
@@ -2,7 +2,7 @@
 
 use super::BrainpoolP384r1;
 use crate::{FieldElement, Scalar};
-use elliptic_curve::{CurveArithmetic, PrimeCurveArithmetic};
+use elliptic_curve::{CurveArithmetic, Error, PrimeCurveArithmetic};
 use primeorder::{PrimeCurveParams, point_arithmetic};
 
 /// Elliptic curve point in affine coordinates.
@@ -82,3 +82,11 @@ impl From<&Scalar> for ScalarPrimitive {
         ScalarPrimitive::new(scalar.into()).unwrap()
     }
 }
+
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
diff --git a/bp384/src/t1/arithmetic.rs b/bp384/src/t1/arithmetic.rs
@@ -2,7 +2,7 @@
 
 use super::BrainpoolP384t1;
 use crate::{FieldElement, Scalar};
-use elliptic_curve::{CurveArithmetic, PrimeCurveArithmetic};
+use elliptic_curve::{CurveArithmetic, Error, PrimeCurveArithmetic};
 use primeorder::{PrimeCurveParams, point_arithmetic};
 
 /// Elliptic curve point in affine coordinates.
@@ -82,3 +82,11 @@ impl From<&Scalar> for ScalarPrimitive {
         ScalarPrimitive::new(scalar.into()).unwrap()
     }
 }
+
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
diff --git a/k256/src/arithmetic/affine.rs b/k256/src/arithmetic/affine.rs
@@ -329,6 +329,14 @@ impl From<&PublicKey> for AffinePoint {
     }
 }
 
+impl TryFrom<AffinePoint> for NonIdentity<AffinePoint> {
+    type Error = Error;
+
+    fn try_from(affine_point: AffinePoint) -> Result<Self> {
+        NonIdentity::new(affine_point).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<AffinePoint> for PublicKey {
     type Error = Error;
 
diff --git a/k256/src/arithmetic/projective.rs b/k256/src/arithmetic/projective.rs
@@ -664,6 +664,14 @@ impl From<&PublicKey> for ProjectivePoint {
     }
 }
 
+impl TryFrom<ProjectivePoint> for NonIdentity<ProjectivePoint> {
+    type Error = Error;
+
+    fn try_from(point: ProjectivePoint) -> Result<Self> {
+        NonIdentity::new(point).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<ProjectivePoint> for PublicKey {
     type Error = Error;
 
diff --git a/k256/src/arithmetic/scalar.rs b/k256/src/arithmetic/scalar.rs
@@ -12,7 +12,7 @@ use core::{
     ops::{Add, AddAssign, Mul, MulAssign, Neg, Shr, ShrAssign, Sub, SubAssign},
 };
 use elliptic_curve::{
-    Curve, ScalarPrimitive,
+    Curve, Error, ScalarPrimitive,
     bigint::{Limb, U256, U512, Word, prelude::*},
     ff::{self, Field, PrimeField},
     ops::{Invert, Reduce, ReduceNonZero},
@@ -413,6 +413,14 @@ impl From<&Scalar> for ScalarPrimitive<Secp256k1> {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl FromUintUnchecked for Scalar {
     type Uint = U256;
 
diff --git a/p192/src/arithmetic/scalar.rs b/p192/src/arithmetic/scalar.rs
@@ -253,6 +253,14 @@ impl From<&Scalar> for ScalarPrimitive<NistP192> {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<U192> for Scalar {
     type Error = Error;
 
diff --git a/p224/src/arithmetic/scalar.rs b/p224/src/arithmetic/scalar.rs
@@ -254,6 +254,14 @@ impl From<&SecretKey> for Scalar {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<Uint> for Scalar {
     type Error = Error;
 
diff --git a/p256/src/arithmetic/scalar.rs b/p256/src/arithmetic/scalar.rs
@@ -12,7 +12,7 @@ use core::{
     ops::{Add, AddAssign, Mul, MulAssign, Neg, Shr, ShrAssign, Sub, SubAssign},
 };
 use elliptic_curve::{
-    Curve, ScalarPrimitive,
+    Curve, Error, ScalarPrimitive,
     bigint::{Limb, U256, prelude::*},
     group::ff::{self, Field, PrimeField},
     ops::{Invert, Reduce, ReduceNonZero},
@@ -533,6 +533,14 @@ impl From<&Scalar> for ScalarBits {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self, Error> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl Add<Scalar> for Scalar {
     type Output = Scalar;
 
diff --git a/p384/src/arithmetic/scalar.rs b/p384/src/arithmetic/scalar.rs
@@ -292,6 +292,14 @@ impl From<&SecretKey> for Scalar {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<U384> for Scalar {
     type Error = Error;
 
diff --git a/p521/src/arithmetic/scalar.rs b/p521/src/arithmetic/scalar.rs
@@ -698,6 +698,14 @@ impl From<&SecretKey> for Scalar {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<U576> for Scalar {
     type Error = Error;
 
diff --git a/primeorder/src/affine.rs b/primeorder/src/affine.rs
@@ -367,6 +367,17 @@ where
     }
 }
 
+impl<C> TryFrom<AffinePoint<C>> for NonIdentity<AffinePoint<C>>
+where
+    C: PrimeCurveParams,
+{
+    type Error = Error;
+
+    fn try_from(affine_point: AffinePoint<C>) -> Result<Self> {
+        NonIdentity::new(affine_point).into_option().ok_or(Error)
+    }
+}
+
 impl<C> TryFrom<EncodedPoint<C>> for AffinePoint<C>
 where
     C: PrimeCurveParams,
diff --git a/primeorder/src/projective.rs b/primeorder/src/projective.rs
@@ -477,6 +477,17 @@ where
     }
 }
 
+impl<C> TryFrom<ProjectivePoint<C>> for NonIdentity<ProjectivePoint<C>>
+where
+    C: PrimeCurveParams,
+{
+    type Error = Error;
+
+    fn try_from(point: ProjectivePoint<C>) -> Result<Self> {
+        NonIdentity::new(point).into_option().ok_or(Error)
+    }
+}
+
 impl<C> TryFrom<ProjectivePoint<C>> for PublicKey<C>
 where
     C: PrimeCurveParams,
diff --git a/sm2/src/arithmetic/scalar.rs b/sm2/src/arithmetic/scalar.rs
@@ -238,6 +238,14 @@ impl From<&SecretKey> for Scalar {
     }
 }
 
+impl TryFrom<Scalar> for NonZeroScalar {
+    type Error = Error;
+
+    fn try_from(scalar: Scalar) -> Result<Self> {
+        NonZeroScalar::new(scalar).into_option().ok_or(Error)
+    }
+}
+
 impl TryFrom<U256> for Scalar {
     type Error = Error;
 

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,14 @@ impl TryFrom<U256> for Scalar {`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
	`234`	`+impl TryFrom<Scalar> for NonZeroScalar {`
	`235`	`+ type Error = Error;`
	`236`	`+`
	`237`	`+ fn try_from(scalar: Scalar) -> Result<Self> {`
	`238`	`+ NonZeroScalar::new(scalar).into_option().ok_or(Error)`
	`239`	`+ }`
	`240`	`+}`
	`241`	`+`
`234`	`242`	`#[cfg(test)]`
`235`	`243`	`mod tests {`
`236`	`244`	`use super::Scalar;`
Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,14 @@ impl From<&PublicKey> for AffinePoint {`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
	`332`	`+impl TryFrom<AffinePoint> for NonIdentity<AffinePoint> {`
	`333`	`+ type Error = Error;`
	`334`	`+`
	`335`	`+ fn try_from(affine_point: AffinePoint) -> Result<Self> {`
	`336`	`+ NonIdentity::new(affine_point).into_option().ok_or(Error)`
	`337`	`+ }`
	`338`	`+}`
	`339`	`+`
`332`	`340`	`impl TryFrom<AffinePoint> for PublicKey {`
`333`	`341`	`type Error = Error;`
`334`	`342`
Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,14 @@ impl From<&PublicKey> for ProjectivePoint {`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`
	`667`	`+impl TryFrom<ProjectivePoint> for NonIdentity<ProjectivePoint> {`
	`668`	`+ type Error = Error;`
	`669`	`+`
	`670`	`+ fn try_from(point: ProjectivePoint) -> Result<Self> {`
	`671`	`+ NonIdentity::new(point).into_option().ok_or(Error)`
	`672`	`+ }`
	`673`	`+}`
	`674`	`+`
`667`	`675`	`impl TryFrom<ProjectivePoint> for PublicKey {`
`668`	`676`	`type Error = Error;`
`669`	`677`
Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,14 @@ impl From<&Scalar> for ScalarPrimitive<NistP192> {`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
	`256`	`+impl TryFrom<Scalar> for NonZeroScalar {`
	`257`	`+ type Error = Error;`
	`258`	`+`
	`259`	`+ fn try_from(scalar: Scalar) -> Result<Self> {`
	`260`	`+ NonZeroScalar::new(scalar).into_option().ok_or(Error)`
	`261`	`+ }`
	`262`	`+}`
	`263`	`+`
`256`	`264`	`impl TryFrom<U192> for Scalar {`
`257`	`265`	`type Error = Error;`
`258`	`266`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,14 @@ impl From<&SecretKey> for Scalar {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
	`257`	`+impl TryFrom<Scalar> for NonZeroScalar {`
	`258`	`+ type Error = Error;`
	`259`	`+`
	`260`	`+ fn try_from(scalar: Scalar) -> Result<Self> {`
	`261`	`+ NonZeroScalar::new(scalar).into_option().ok_or(Error)`
	`262`	`+ }`
	`263`	`+}`
	`264`	`+`
`257`	`265`	`impl TryFrom<Uint> for Scalar {`
`258`	`266`	`type Error = Error;`
`259`	`267`