From 86135ddeb085416ac5a9cc86cc9c643dd00f031f Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 9 Nov 2018 11:20:56 +0100 Subject: [PATCH 1/3] Update base64 to latest version --- Cargo.toml | 2 +- src/lib.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c03a0e1..3bd44cf1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/ruma/ruma-signatures" version = "0.4.0" [dependencies] -base64 = "0.5.0" +base64 = "0.10.0" lazy_static = "0.2.8" ring = "0.9.4" serde = "1.0" diff --git a/src/lib.rs b/src/lib.rs index 62b6e557..441ac25b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -140,7 +140,7 @@ use std::collections::{HashMap, HashSet}; use std::error::Error as StdError; 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 serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::de::{Error as SerdeError, MapAccess, Unexpected, Visitor}; @@ -155,8 +155,6 @@ lazy_static! { static ref BASE64_CONFIG: Config = Config::new( CharacterSet::Standard, false, - false, - LineWrap::NoWrap, ); } From bd23e42cfca20964b69039dcccd1f7302bfac38c Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 9 Nov 2018 11:24:35 +0100 Subject: [PATCH 2/3] Update lazy_static, url, ring, untrusted --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3bd44cf1..338553ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,12 +12,12 @@ version = "0.4.0" [dependencies] base64 = "0.10.0" -lazy_static = "0.2.8" -ring = "0.9.4" +lazy_static = "1.2" +ring = "0.13.3" serde = "1.0" serde_json = "1.0" -untrusted = "0.5" -url = "1.4" +untrusted = "0.6.2" +url = "1.7" [dev-dependencies] serde_derive = "1.0" From 1334fc37e5b33725ab62935ee7b66f1ac1bb56aa Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 9 Nov 2018 11:28:36 +0100 Subject: [PATCH 3/3] Remove unused mut --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 441ac25b..d2c4f9b0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -191,7 +191,7 @@ pub fn to_canonical_json(value: &Value) -> Result { 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("unsigned"); }