Skip to content

Implement serde for NonZeroScalar #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Dec 26, 2022
Merged

Implement serde for NonZeroScalar #1178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions elliptic-curve/src/scalar/nonzero.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ use crate::{
bigint::Encoding as _,
ops::{Invert, Reduce, ReduceNonZero},
rand_core::{CryptoRng, RngCore},
Curve, Error, FieldBytes, IsHigh, PrimeCurve, Result, Scalar, ScalarArithmetic, ScalarCore,
SecretKey,
Curve, Error, FieldBytes, IsHigh, PrimeCurve, Scalar, ScalarArithmetic, ScalarCore, SecretKey,
};
use base16ct::HexDisplay;
use core::{
Expand All @@ -19,6 +18,9 @@ use generic_array::GenericArray;
use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
use zeroize::Zeroize;

#[cfg(feature = "serde")]
use serdect::serde::{de, ser, Deserialize, Serialize};

/// Non-zero scalar type.
///
/// This type ensures that its value is not zero, ala `core::num::NonZero*`.
Expand Down Expand Up @@ -260,7 +262,7 @@ where
{
type Error = Error;

fn try_from(bytes: &[u8]) -> Result<Self> {
fn try_from(bytes: &[u8]) -> Result<Self, Error> {
if bytes.len() == C::UInt::BYTE_SIZE {
Option::from(NonZeroScalar::from_repr(GenericArray::clone_from_slice(
bytes,
Expand Down Expand Up @@ -319,7 +321,7 @@ where
{
type Err = Error;

fn from_str(hex: &str) -> Result<Self> {
fn from_str(hex: &str) -> Result<Self, Error> {
let mut bytes = FieldBytes::<C>::default();

if base16ct::mixed::decode(hex, &mut bytes)?.len() == bytes.len() {
Expand All @@ -330,6 +332,35 @@ where
}
}

#[cfg(feature = "serde")]
#[cfg_attr(docsrs, doc(cfg(feature = "serde")))]
impl<C> Serialize for NonZeroScalar<C>
where
C: Curve + ScalarArithmetic,
{
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: ser::Serializer,
{
ScalarCore::from(self).serialize(serializer)
}
}

#[cfg(feature = "serde")]
#[cfg_attr(docsrs, doc(cfg(feature = "serde")))]
impl<'de, C> Deserialize<'de> for NonZeroScalar<C>
where
C: Curve + ScalarArithmetic,
{
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: de::Deserializer<'de>,
{
Option::from(Self::new(ScalarCore::deserialize(deserializer)?.into()))
.ok_or_else(|| de::Error::custom("expected non-zero scalar"))
}
}

#[cfg(all(test, feature = "dev"))]
mod tests {
use crate::dev::{NonZeroScalar, Scalar};
Expand Down