Update ring to 0.13 and subtle to 2.0 (#1383)

This commit is contained in:
Pierre Krieger
2019-01-10 13:32:27 +01:00
committed by Bastian Köcher
parent bbbf315854
commit 42c30609d3
5 changed files with 132 additions and 148 deletions
+2 -2
View File
@@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
substrate-primitives = { path = "../primitives" }
parity-crypto = { version = "0.1", default-features = false }
parity-crypto = { version = "0.2", default-features = false }
error-chain = "0.12"
hex = "0.3"
rand = "0.4"
serde_json = "1.0"
serde = "1.0"
serde_derive = "1.0"
subtle = "0.5"
subtle = "2.0"
[dev-dependencies]
tempdir = "0.3"
+1 -1
View File
@@ -110,7 +110,7 @@ impl EncryptedKey {
let mac = blake2_256(&crypto::derive_mac(&derived_right_bits, &self.ciphertext));
if subtle::slices_equal(&mac[..], &self.mac[..]) != 1 {
if subtle::ConstantTimeEq::ct_eq(&mac[..], &self.mac[..]).unwrap_u8() != 1 {
return Err(ErrorKind::InvalidPassword.into());
}
+1 -1
View File
@@ -11,7 +11,7 @@ bytes = "0.4"
error-chain = { version = "0.12", default-features = false }
fnv = "1.0"
futures = "0.1"
libp2p = { git = "https://github.com/libp2p/rust-libp2p", rev = "d961e656a74d1bab5366d371a06f9e10d5f4a6c5", default-features = false, features = ["secio-rsa", "secio-secp256k1"] }
libp2p = { git = "https://github.com/tomaka/libp2p-rs", rev = "997d0163bc8a7e11559524ad8466bc3b1850c8ec", default-features = false, features = ["secio-rsa", "secio-secp256k1"] }
parking_lot = "0.7.1"
libc = "0.2"
log = "0.4"
+2 -2
View File
@@ -17,8 +17,8 @@ impl-serde = { version = "0.1", optional = true }
wasmi = { version = "0.4.2", optional = true }
hash-db = { git = "https://github.com/paritytech/trie", default-features = false }
hash256-std-hasher = { git = "https://github.com/paritytech/trie", default-features = false }
ring = { version = "0.12", optional = true }
untrusted = { version = "0.5", optional = true }
ring = { version = "0.13", optional = true }
untrusted = { version = "0.6", optional = true }
hex-literal = { version = "0.1", optional = true }
base58 = { version = "0.1", optional = true }
blake2-rfc = { version = "0.2.18", optional = true }