saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-07 20:50:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Encode scalars canonically using Serde.

Browse source
This commit is contained in:
Henry de Valence 2017-11-22 17:01:44 -08:00
parent c1f6302879
commit f165b63ee9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/scalar.rs
View file

@ -265,7 +265,7 @@ impl Serialize for Scalar {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer where S: Serializer
{ {
serializer.serialize_bytes(self.as_bytes()) serializer.serialize_bytes(self.reduce().as_bytes())
} }
} }
@ -280,17 +280,25 @@ impl<'de> Deserialize<'de> for Scalar {
type Value = Scalar; type Value = Scalar;
fn expecting(&self, formatter: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { fn expecting(&self, formatter: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
formatter.write_str("a 32-byte scalar value") formatter.write_str("a canonically-encoded 32-byte scalar value")
} }
fn visit_bytes<E>(self, v: &[u8]) -> Result<Scalar, E> fn visit_bytes<E>(self, v: &[u8]) -> Result<Scalar, E>
where E: serde::de::Error where E: serde::de::Error
{ {
if v.len() == 32 { if v.len() == 32 {
// array_ref turns &[u8] into &[u8;32]
let mut bytes = [0u8;32]; let mut bytes = [0u8;32];
bytes.copy_from_slice(v); bytes.copy_from_slice(v);
Ok(Scalar(bytes))
static ERRMSG: &'static str = "encoding was not canonical";
Scalar::from_canonical_bytes(bytes)
.ok_or(
serde::de::Error::invalid_value(
serde::de::Unexpected::Bytes(v),
&ERRMSG,
)
)
} else { } else {
Err(serde::de::Error::invalid_length(v.len(), &self)) Err(serde::de::Error::invalid_length(v.len(), &self))
} }