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

Merge pull request #4 from fest-im/master

Browse Source 
Update dependencies (and fix a trivial warning along the way)
This commit is contained in:
Jimmy Cuadra 2018-12-03 18:50:13 -08:00 committed by GitHub
commit f6b066b73f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -11,13 +11,13 @@ repository = "https://github.com/ruma/ruma-signatures"
version = "0.4.0" version = "0.4.0"
[dependencies] [dependencies]
base64 = "0.5.0" base64 = "0.10.0"
lazy_static = "0.2.8" lazy_static = "1.2"
ring = "0.9.4" ring = "0.13.3"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
untrusted = "0.5" untrusted = "0.6.2"
url = "1.4" url = "1.7"
[dev-dependencies] [dev-dependencies]
serde_derive = "1.0" serde_derive = "1.0"

6
src/lib.rs
View File

@ -140,7 +140,7 @@ use std::collections::{HashMap, HashSet};
use std::error::Error as StdError; use std::error::Error as StdError;
use std::fmt::{Display, Formatter, Result as FmtResult}; use std::fmt::{Display, Formatter, Result as FmtResult};
use base64::{CharacterSet, Config, LineWrap, decode_config, encode_config}; use base64::{CharacterSet, Config, decode_config, encode_config};
use ring::signature::{ED25519, Ed25519KeyPair as RingEd25519KeyPair, verify}; use ring::signature::{ED25519, Ed25519KeyPair as RingEd25519KeyPair, verify};
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde::de::{Error as SerdeError, MapAccess, Unexpected, Visitor}; use serde::de::{Error as SerdeError, MapAccess, Unexpected, Visitor};
@ -155,8 +155,6 @@ lazy_static! {
static ref BASE64_CONFIG: Config = Config::new( static ref BASE64_CONFIG: Config = Config::new(
CharacterSet::Standard, CharacterSet::Standard,
false, false,
false,
LineWrap::NoWrap,
); );
} }
@ -193,7 +191,7 @@ pub fn to_canonical_json(value: &Value) -> Result<String, Error> {
let mut owned_value = value.clone(); let mut owned_value = value.clone();
{ {
let mut object = owned_value.as_object_mut().expect("safe since we checked above"); let object = owned_value.as_object_mut().expect("safe since we checked above");
object.remove("signatures"); object.remove("signatures");
object.remove("unsigned"); object.remove("unsigned");
} }