chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ring to 0.7 and serde to 1.0.

Browse Source
This commit is contained in:
Jimmy Cuadra 2017-04-20 22:41:59 -07:00
parent 0590867dc1
commit e63b0fbcd5
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.toml
View File

@ -11,12 +11,12 @@ repository = "https://github.com/ruma/ruma-signatures"
version = "0.2.1" version = "0.2.1"
[dependencies] [dependencies]
ring = "0.6.3" ring = "0.7"
rustc-serialize = "0.3.22" rustc-serialize = "0.3"
serde = "0.9.1" serde = "1.0"
serde_json = "0.9.1" serde_json = "1.0"
untrusted = "0.3.2" untrusted = "0.3"
url = "1.4.0" url = "1.4"
[dev-dependencies] [dev-dependencies]
serde_derive = "0.9.1" serde_derive = "1.0"

34
src/lib.rs
View File

@ -141,7 +141,7 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
use ring::signature::{ED25519, Ed25519KeyPair as RingEd25519KeyPair, verify}; use ring::signature::{ED25519, Ed25519KeyPair as RingEd25519KeyPair, verify};
use rustc_serialize::base64::{CharacterSet, Config, FromBase64, Newline, ToBase64}; use rustc_serialize::base64::{CharacterSet, Config, FromBase64, Newline, ToBase64};
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde::de::{Error as SerdeError, MapVisitor, Unexpected, Visitor}; use serde::de::{Error as SerdeError, MapAccess, Unexpected, Visitor};
use serde::ser::SerializeMap; use serde::ser::SerializeMap;
use serde_json::{Value, to_string}; use serde_json::{Value, to_string};
use untrusted::Input; use untrusted::Input;
@ -510,8 +510,8 @@ impl Signatures {
} }
} }
impl Deserialize for Signatures { impl<'de> Deserialize<'de> for Signatures {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize_map(SignaturesVisitor) deserializer.deserialize_map(SignaturesVisitor)
} }
} }
@ -529,18 +529,20 @@ impl Serialize for Signatures {
} }
} }
impl Visitor for SignaturesVisitor { impl<'de> Visitor<'de> for SignaturesVisitor {
type Value = Signatures; type Value = Signatures;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
write!(formatter, "digital signatures") write!(formatter, "digital signatures")
} }
fn visit_map<M>(self, mut visitor: M) -> Result<Self::Value, M::Error> fn visit_map<M>(self, mut visitor: M) -> Result<Self::Value, M::Error> where M: MapAccess<'de> {
where M: MapVisitor { let mut signatures = match visitor.size_hint() {
let mut signatures = Signatures::with_capacity(visitor.size_hint().0); Some(capacity) => Signatures::with_capacity(capacity),
None => Signatures::new(),
};
while let Some((server_name, signature_set)) = visitor.visit::<String, SignatureSet>()? { while let Some((server_name, signature_set)) = visitor.next_entry::<String, SignatureSet>()? {
if let Err(_) = signatures.insert(&server_name, signature_set) { if let Err(_) = signatures.insert(&server_name, signature_set) {
return Err(M::Error::invalid_value(Unexpected::Str(&server_name), &self)); return Err(M::Error::invalid_value(Unexpected::Str(&server_name), &self));
} }
@ -587,8 +589,8 @@ impl SignatureSet {
} }
} }
impl Deserialize for SignatureSet { impl<'de> Deserialize<'de> for SignatureSet {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
deserializer.deserialize_map(SignatureSetVisitor) deserializer.deserialize_map(SignatureSetVisitor)
} }
} }
@ -606,18 +608,20 @@ impl Serialize for SignatureSet {
} }
} }
impl Visitor for SignatureSetVisitor { impl<'de> Visitor<'de> for SignatureSetVisitor {
type Value = SignatureSet; type Value = SignatureSet;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
write!(formatter, "a set of digital signatures") write!(formatter, "a set of digital signatures")
} }
fn visit_map<M>(self, mut visitor: M) -> Result<Self::Value, M::Error> fn visit_map<M>(self, mut visitor: M) -> Result<Self::Value, M::Error> where M: MapAccess<'de> {
where M: MapVisitor { let mut signature_set = match visitor.size_hint() {
let mut signature_set = SignatureSet::with_capacity(visitor.size_hint().0); Some(capacity) => SignatureSet::with_capacity(capacity),
None => SignatureSet::new(),
};
while let Some((key, value)) = visitor.visit::<String, String>()? { while let Some((key, value)) = visitor.next_entry::<String, String>()? {
let (algorithm, version) = split_id(&key).map_err(|split_error| { let (algorithm, version) = split_id(&key).map_err(|split_error| {
match split_error { match split_error {
SplitError::InvalidLength(length) => M::Error::invalid_length(length, &self), SplitError::InvalidLength(length) => M::Error::invalid_length(length, &self),