grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deduplicating crate dependencies (part 3 of n) (#11614)

Browse Source 
* Deduplicating crate dependencies (part 3 of n, `tiny_keccak`, `tokio-timer`, and co) (#11613)

The change includes:
```
tiny-keccak
tokio-timer
textwrap
winapi
rand
rand_xorshift
scopeguard
url
```

* Update rpc/src/v1/helpers/secretstore.rs

Co-Authored-By: Andronik Ordian <write@reusable.software>

* Update util/network-devp2p/src/connection.rs

Co-Authored-By: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
This commit is contained in:
Valentin Shergin 2020-04-09 02:03:27 -07:00 committed by GitHub
parent 12cbe93fbe
commit a5820b6ef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 67 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Cargo.lock generated
View File

@ -576,7 +576,7 @@ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
"strsim 0.8.0", "strsim 0.8.0",
"textwrap 0.11.0", "textwrap",
"unicode-width", "unicode-width",
"vec_map", "vec_map",
] ]
@ -1000,7 +1000,7 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"rlp", "rlp",
"secp256k1", "secp256k1",
"tiny-keccak 2.0.1", "tiny-keccak 2.0.2",
"zeroize", "zeroize",
] ]
@ -1318,7 +1318,7 @@ dependencies = [
"mio", "mio",
"num_cpus", "num_cpus",
"parking_lot 0.10.0", "parking_lot 0.10.0",
"slab 0.4.2", "slab",
"time", "time",
"timer", "timer",
"tokio", "tokio",
@ -1474,9 +1474,9 @@ dependencies = [
"secp256k1", "secp256k1",
"serde", "serde",
"serde_json", "serde_json",
"slab 0.4.2", "slab",
"tempfile", "tempfile",
"tiny-keccak 1.5.0", "tiny-keccak 2.0.2",
] ]
[[package]] [[package]]
@ -1522,7 +1522,7 @@ dependencies = [
"spec", "spec",
"state-db", "state-db",
"time-utils", "time-utils",
"tiny-keccak 1.5.0", "tiny-keccak 2.0.2",
"trace", "trace",
"transaction-pool", "transaction-pool",
"trie-db", "trie-db",
@ -1695,7 +1695,7 @@ dependencies = [
"smallvec 1.2.0", "smallvec 1.2.0",
"tempfile", "tempfile",
"time", "time",
"tiny-keccak 1.5.0", "tiny-keccak 2.0.2",
] ]
[[package]] [[package]]
@ -2016,7 +2016,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"log", "log",
"slab 0.4.2", "slab",
"string", "string",
"tokio-io", "tokio-io",
] ]
@ -2187,7 +2187,7 @@ dependencies = [
"tokio-reactor", "tokio-reactor",
"tokio-tcp", "tokio-tcp",
"tokio-threadpool", "tokio-threadpool",
"tokio-timer 0.2.13", "tokio-timer",
"want", "want",
] ]
@ -2512,7 +2512,7 @@ dependencies = [
"jsonrpc-server-utils", "jsonrpc-server-utils",
"log", "log",
"parking_lot 0.10.0", "parking_lot 0.10.0",
"slab 0.4.2", "slab",
"ws", "ws",
] ]
@ -2533,7 +2533,7 @@ dependencies = [
"ethereum-types", "ethereum-types",
"hash-db", "hash-db",
"plain_hasher", "plain_hasher",
"tiny-keccak 1.5.0", "tiny-keccak 2.0.2",
] ]
[[package]] [[package]]
@ -2910,7 +2910,7 @@ dependencies = [
"log", "log",
"miow 0.2.1", "miow 0.2.1",
"net2", "net2",
"slab 0.4.2", "slab",
"winapi 0.2.8", "winapi 0.2.8",
] ]
@ -2923,7 +2923,7 @@ dependencies = [
"lazycell", "lazycell",
"log", "log",
"mio", "mio",
"slab 0.4.2", "slab",
] ]
[[package]] [[package]]
@ -3220,7 +3220,7 @@ dependencies = [
"spec", "spec",
"tempfile", "tempfile",
"term_size", "term_size",
"textwrap 0.9.0", "textwrap",
"toml", "toml",
"verification", "verification",
"winapi 0.3.8", "winapi 0.3.8",
@ -3287,7 +3287,7 @@ dependencies = [
"secp256k1", "secp256k1",
"sha2", "sha2",
"subtle 2.2.2", "subtle 2.2.2",
"tiny-keccak 2.0.1", "tiny-keccak 2.0.2",
"zeroize", "zeroize",
] ]
@ -3414,8 +3414,8 @@ dependencies = [
"spec", "spec",
"stats", "stats",
"tempfile", "tempfile",
"tiny-keccak 1.5.0", "tiny-keccak 2.0.2",
"tokio-timer 0.1.2", "tokio-timer",
"trace", "trace",
"transaction-pool", "transaction-pool",
"transient-hashmap", "transient-hashmap",
@ -4591,12 +4591,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e88f89a550c01e4cd809f3df4f52dc9e939f3273a2017eabd5c6d12fd98bb23" checksum = "8e88f89a550c01e4cd809f3df4f52dc9e939f3273a2017eabd5c6d12fd98bb23"
[[package]]
name = "slab"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
[[package]] [[package]]
name = "slab" name = "slab"
version = "0.4.2" version = "0.4.2"
@ -4926,15 +4920,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "textwrap"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
dependencies = [
"unicode-width",
]
[[package]] [[package]]
name = "textwrap" name = "textwrap"
version = "0.11.0" version = "0.11.0"
@ -5008,9 +4993,9 @@ dependencies = [
[[package]] [[package]]
name = "tiny-keccak" name = "tiny-keccak"
version = "2.0.1" version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2953ca5148619bc99695c1274cb54c5275bbb913c6adad87e72eaf8db9787f69" checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [ dependencies = [
"crunchy", "crunchy",
] ]
@ -5044,7 +5029,7 @@ dependencies = [
"tokio-sync", "tokio-sync",
"tokio-tcp", "tokio-tcp",
"tokio-threadpool", "tokio-threadpool",
"tokio-timer 0.2.13", "tokio-timer",
"tokio-udp", "tokio-udp",
"tokio-uds", "tokio-uds",
] ]
@ -5139,7 +5124,7 @@ dependencies = [
"mio", "mio",
"num_cpus", "num_cpus",
"parking_lot 0.9.0", "parking_lot 0.9.0",
"slab 0.4.2", "slab",
"tokio-executor", "tokio-executor",
"tokio-io", "tokio-io",
"tokio-sync", "tokio-sync",
@ -5205,20 +5190,10 @@ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"num_cpus", "num_cpus",
"slab 0.4.2", "slab",
"tokio-executor", "tokio-executor",
] ]
[[package]]
name = "tokio-timer"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6131e780037787ff1b3f8aad9da83bca02438b72277850dd6ad0d455e0e20efc"
dependencies = [
"futures",
"slab 0.3.0",
]
[[package]] [[package]]
name = "tokio-timer" name = "tokio-timer"
version = "0.2.13" version = "0.2.13"
@ -5227,7 +5202,7 @@ checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
dependencies = [ dependencies = [
"crossbeam-utils", "crossbeam-utils",
"futures", "futures",
"slab 0.4.2", "slab",
"tokio-executor", "tokio-executor",
] ]
@ -5825,7 +5800,7 @@ dependencies = [
"mio-extras", "mio-extras",
"rand 0.7.3", "rand 0.7.3",
"sha-1", "sha-1",
"slab 0.4.2", "slab",
"url 2.1.1", "url 2.1.1",
] ]

4
Cargo.toml
View File

@ -76,7 +76,7 @@ serde_json = "1.0"
snapshot = { path = "ethcore/snapshot" } snapshot = { path = "ethcore/snapshot" }
spec = { path = "ethcore/spec" } spec = { path = "ethcore/spec" }
term_size = "0.3" term_size = "0.3"
textwrap = "0.9" textwrap = "0.11.0"
toml = "0.5.6" toml = "0.5.6"
verification = { path = "ethcore/verification" } verification = { path = "ethcore/verification" }
@ -90,7 +90,7 @@ tempfile = "3.1"
fake-fetch = { path = "util/fake-fetch" } fake-fetch = { path = "util/fake-fetch" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] } winapi = { version = "0.3.8", features = ["winsock2", "winuser", "shellapi"] }
[features] [features]
default = ["accounts"] default = ["accounts"]

4
accounts/ethstore/Cargo.toml
View File

@ -8,13 +8,13 @@ repository = "https://github.com/openethereum/openethereum"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
libc = "0.2" libc = "0.2"
rand = "0.7" rand = "0.7.3"
ethkey = { path = "../ethkey" } ethkey = { path = "../ethkey" }
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
rustc-hex = "2.1.0" rustc-hex = "2.1.0"
tiny-keccak = "1.4" tiny-keccak = "2.0.2"
time = "0.1.34" time = "0.1.34"
parking_lot = "0.10.0" parking_lot = "0.10.0"
parity-crypto = { version = "0.5.0", features = ["publickey"] } parity-crypto = { version = "0.5.0", features = ["publickey"] }

2
cli-signer/rpc-client/Cargo.toml
View File

@ -12,7 +12,7 @@ futures = "0.1"
log = "0.4" log = "0.4"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
url = "2.1.0" url = "2.1.1"
matches = "0.1" matches = "0.1"
parking_lot = "0.10.0" parking_lot = "0.10.0"
jsonrpc-core = "14.0.3" jsonrpc-core = "14.0.3"

6
ethcore/Cargo.toml
View File

@ -44,13 +44,13 @@ pod = { path = "pod", optional = true }
trie-db = "0.20.0" trie-db = "0.20.0"
parity-crypto = { version = "0.5.0", features = ["publickey"], optional = true } parity-crypto = { version = "0.5.0", features = ["publickey"], optional = true }
patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" } patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
rand = "0.7" rand = "0.7.3"
rand_xorshift = "0.2" rand_xorshift = "0.2.0"
rayon = "1.1" rayon = "1.1"
registrar = { path = "../util/registrar" } registrar = { path = "../util/registrar" }
rlp = "0.4.0" rlp = "0.4.0"
rustc-hex = "2.1.0" rustc-hex = "2.1.0"
scopeguard = "1.0.0" scopeguard = "1.1.0"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
snapshot = { path = "snapshot" } snapshot = { path = "snapshot" }

2
ethcore/blockchain/Cargo.toml
View File

@ -19,7 +19,7 @@ itertools = "0.8.2"
kvdb = "0.4.0" kvdb = "0.4.0"
log = "0.4" log = "0.4"
parity-bytes = "0.1" parity-bytes = "0.1"
rand = "0.7" rand = "0.7.3"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rayon = "1.0" rayon = "1.0"
rlp = "0.4.0" rlp = "0.4.0"

2
ethcore/engines/authority-round/Cargo.toml
View File

@ -28,7 +28,7 @@ lru-cache = "0.1"
machine = { path = "../../machine" } machine = { path = "../../machine" }
parity-bytes = "0.1" parity-bytes = "0.1"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rand = "0.7" rand = "0.7.3"
rlp = "0.4.0" rlp = "0.4.0"
time-utils = { path = "../../../util/time-utils" } time-utils = { path = "../../../util/time-utils" }
unexpected = { path = "../../../util/unexpected" } unexpected = { path = "../../../util/unexpected" }

2
ethcore/engines/clique/Cargo.toml
View File

@ -18,7 +18,7 @@ lazy_static = "1.3.0"
log = "0.4" log = "0.4"
lru-cache = "0.1" lru-cache = "0.1"
machine = { path = "../../machine" } machine = { path = "../../machine" }
rand = "0.7" rand = "0.7.3"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rlp = "0.4.0" rlp = "0.4.0"
time-utils = { path = "../../../util/time-utils" } time-utils = { path = "../../../util/time-utils" }

2
ethcore/light/Cargo.toml
View File

@ -33,7 +33,7 @@ rlp = "0.4.0"
rlp-derive = "0.1" rlp-derive = "0.1"
smallvec = "1.2.0" smallvec = "1.2.0"
futures = "0.1" futures = "0.1"
rand = "0.7" rand = "0.7.3"
bincode = "1.1" bincode = "1.1"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"

4
ethcore/private-tx/Cargo.toml
View File

@ -45,10 +45,10 @@ serde_json = "1.0"
spec = { path = "../spec" } spec = { path = "../spec" }
state-db = { path = "../state-db" } state-db = { path = "../state-db" }
time-utils = { path = "../../util/time-utils" } time-utils = { path = "../../util/time-utils" }
tiny-keccak = "1.4" tiny-keccak = "2.0.2"
trace = { path = "../trace" } trace = { path = "../trace" }
transaction-pool = "2.0.1" transaction-pool = "2.0.1"
url = "2" url = "2.1.1"
vm = { path = "../vm" } vm = { path = "../vm" }
[dev-dependencies] [dev-dependencies]

6
ethcore/snapshot/Cargo.toml
View File

@ -32,12 +32,12 @@ keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.4.0" kvdb = "0.4.0"
log = "0.4.8" log = "0.4.8"
num_cpus = "1.10.1" num_cpus = "1.10.1"
rand = "0.7" rand = "0.7.3"
rand_xorshift = "0.2" rand_xorshift = "0.2.0"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rlp = "0.4.2" rlp = "0.4.2"
rlp-derive = "0.1" rlp-derive = "0.1"
scopeguard = "1.0.0" scopeguard = "1.1.0"
snappy = { package = "parity-snappy", version ="0.1.0" } snappy = { package = "parity-snappy", version ="0.1.0" }
state-db = { path = "../state-db" } state-db = { path = "../state-db" }
trie-db = "0.20.0" trie-db = "0.20.0"

4
ethcore/snapshot/snapshot-tests/Cargo.toml
View File

@ -28,8 +28,8 @@ kvdb-rocksdb = "0.6.0"
log = "0.4.8" log = "0.4.8"
parking_lot = "0.10.0" parking_lot = "0.10.0"
parity-crypto = { version = "0.5.0", features = ["publickey"] } parity-crypto = { version = "0.5.0", features = ["publickey"] }
rand = "0.7" rand = "0.7.3"
rand_xorshift = "0.2" rand_xorshift = "0.2.0"
rlp = "0.4.2" rlp = "0.4.2"
snappy = { package = "parity-snappy", version ="0.1.0" } snappy = { package = "parity-snappy", version ="0.1.0" }
snapshot = { path = "../../snapshot", features = ["test-helpers"] } snapshot = { path = "../../snapshot", features = ["test-helpers"] }

4
ethcore/sync/Cargo.toml
View File

@ -28,7 +28,7 @@ network = { package = "ethcore-network", path = "../../util/network" }
parity-runtime = "0.1.1" parity-runtime = "0.1.1"
parity-crypto = { version = "0.5.0", features = ["publickey"] } parity-crypto = { version = "0.5.0", features = ["publickey"] }
parity-util-mem = "0.5.1" parity-util-mem = "0.5.1"
rand = "0.7" rand = "0.7.3"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rlp = "0.4.0" rlp = "0.4.0"
snapshot = { path = "../snapshot" } snapshot = { path = "../snapshot" }
@ -42,6 +42,6 @@ ethcore = { path = "..", features = ["test-helpers"] }
ethcore-io = { path = "../../util/io", features = ["mio"] } ethcore-io = { path = "../../util/io", features = ["mio"] }
kvdb-memorydb = "0.4.0" kvdb-memorydb = "0.4.0"
machine = { path = "../machine" } machine = { path = "../machine" }
rand_xorshift = "0.2" rand_xorshift = "0.2.0"
rustc-hex = "2.1.0" rustc-hex = "2.1.0"
spec = { path = "../spec" } spec = { path = "../spec" }

2
miner/Cargo.toml
View File

@ -11,7 +11,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
ethash = { path = "../ethash", optional = true } ethash = { path = "../ethash", optional = true }
fetch = { path = "../util/fetch", optional = true } fetch = { path = "../util/fetch", optional = true }
hyper = { version = "0.12", optional = true } hyper = { version = "0.12", optional = true }
url = { version = "2", optional = true } url = { version = "2.1.1", optional = true }
# Miner # Miner
ansi_term = "0.11" ansi_term = "0.11"

8
rpc/Cargo.toml
View File

@ -12,8 +12,8 @@ ansi_term = "0.11"
futures = "0.1.6" futures = "0.1.6"
log = "0.4" log = "0.4"
order-stat = "0.1" order-stat = "0.1"
rand = "0.7" rand = "0.7.3"
rand_xorshift = "0.2" rand_xorshift = "0.2.0"
rustc-hex = "2.1.0" rustc-hex = "2.1.0"
semver = "0.9" semver = "0.9"
serde = "1.0" serde = "1.0"
@ -21,8 +21,8 @@ serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
parking_lot = "0.10.0" parking_lot = "0.10.0"
tempfile = "3.1" tempfile = "3.1"
tiny-keccak = "1.4" tiny-keccak = "2.0.2"
tokio-timer = "0.1" tokio-timer = "0.2.13"
transient-hashmap = "0.4" transient-hashmap = "0.4"
itertools = "0.8.2" itertools = "0.8.2"

4
rpc/src/v1/helpers/secretstore.rs
View File

@ -23,7 +23,7 @@ use bytes::Bytes;
use jsonrpc_core::Error; use jsonrpc_core::Error;
use v1::helpers::errors; use v1::helpers::errors;
use v1::types::EncryptedDocumentKey; use v1::types::EncryptedDocumentKey;
use tiny_keccak::Keccak; use tiny_keccak::{Keccak, Hasher};
/// Initialization vector length. /// Initialization vector length.
const INIT_VEC_LEN: usize = 16; const INIT_VEC_LEN: usize = 16;
@ -95,7 +95,7 @@ pub fn decrypt_document_with_shadow(decrypted_secret: Public, common_point: Publ
/// Calculate Keccak(ordered servers set) /// Calculate Keccak(ordered servers set)
pub fn ordered_servers_keccak(servers_set: BTreeSet<H512>) -> H256 { pub fn ordered_servers_keccak(servers_set: BTreeSet<H512>) -> H256 {
let mut servers_set_keccak = Keccak::new_keccak256(); let mut servers_set_keccak = Keccak::v256();
for server in servers_set { for server in servers_set {
servers_set_keccak.update(&server.0); servers_set_keccak.update(&server.0);
} }

8
rpc/src/v1/impls/pubsub.rs
View File

@ -17,7 +17,7 @@
//! Parity-specific PUB-SUB rpc implementation. //! Parity-specific PUB-SUB rpc implementation.
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::{Duration, Instant};
use parking_lot::RwLock; use parking_lot::RwLock;
use jsonrpc_core::{self as core, Result, MetaIoHandler}; use jsonrpc_core::{self as core, Result, MetaIoHandler};
@ -43,12 +43,8 @@ impl<S: core::Middleware<Metadata>> PubSubClient<S> {
let poll_manager = Arc::new(RwLock::new(GenericPollManager::new(rpc))); let poll_manager = Arc::new(RwLock::new(GenericPollManager::new(rpc)));
let pm2 = Arc::downgrade(&poll_manager); let pm2 = Arc::downgrade(&poll_manager);
let timer = tokio_timer::wheel()
.tick_duration(Duration::from_millis(500))
.build();
// Start ticking // Start ticking
let interval = timer.interval(Duration::from_millis(1000)); let interval = tokio_timer::Interval::new(Instant::now() + Duration::from_millis(500), Duration::from_millis(1000));
executor.spawn(interval executor.spawn(interval
.map_err(|e| warn!("Polling timer error: {:?}", e)) .map_err(|e| warn!("Polling timer error: {:?}", e))
.for_each(move |_| { .for_each(move |_| {

2
updater/Cargo.toml
View File

@ -21,7 +21,7 @@ parity-bytes = "0.1"
parity-hash-fetch = { path = "hash-fetch" } parity-hash-fetch = { path = "hash-fetch" }
parity-path = "0.1" parity-path = "0.1"
parity-version = { path = "../util/version" } parity-version = { path = "../util/version" }
rand = "0.7" rand = "0.7.3"
parking_lot = "0.10.0" parking_lot = "0.10.0"
semver = "0.9" semver = "0.9"
target_info = "0.1" target_info = "0.1"

2
updater/hash-fetch/Cargo.toml
View File

@ -12,7 +12,7 @@ futures = "0.1"
log = "0.4" log = "0.4"
mime = "0.3" mime = "0.3"
mime_guess = "2.0.1" mime_guess = "2.0.1"
rand = "0.7" rand = "0.7.3"
rustc-hex = "2.1.0" rustc-hex = "2.1.0"
fetch = { path = "../../util/fetch" } fetch = { path = "../../util/fetch" }
parity-bytes = "0.1" parity-bytes = "0.1"

2
util/fetch/Cargo.toml
View File

@ -13,7 +13,7 @@ hyper-rustls = "0.18"
http = "0.1" http = "0.1"
log = "0.4" log = "0.4"
tokio = "0.1.22" tokio = "0.1.22"
url = "2" url = "2.1.1"
bytes = "0.4" bytes = "0.4"
[features] [features]

2
util/keccak-hasher/Cargo.toml
View File

@ -8,6 +8,6 @@ license = "GPL-3.0"
[dependencies] [dependencies]
ethereum-types = "0.8.0" ethereum-types = "0.8.0"
tiny-keccak = "1.4.2" tiny-keccak = "2.0.2"
hash-db = "0.15.0" hash-db = "0.15.0"
plain_hasher = "0.2" plain_hasher = "0.2"

5
util/keccak-hasher/src/lib.rs
View File

@ -31,8 +31,11 @@ impl Hasher for KeccakHasher {
type StdHasher = PlainHasher; type StdHasher = PlainHasher;
const LENGTH: usize = 32; const LENGTH: usize = 32;
fn hash(x: &[u8]) -> Self::Out { fn hash(x: &[u8]) -> Self::Out {
use tiny_keccak::Hasher;
let mut out = [0; 32]; let mut out = [0; 32];
Keccak::keccak256(x, &mut out); let mut keccak256 = Keccak::v256();
keccak256.update(x);
keccak256.finalize(&mut out);
out.into() out.into()
} }
} }

4
util/network-devp2p/Cargo.toml
View File

@ -28,13 +28,13 @@ parity-crypto = { version = "0.5.0", features = ["publickey"] }
parity-path = "0.1" parity-path = "0.1"
parity-snappy = "0.1" parity-snappy = "0.1"
parking_lot = "0.10.0" parking_lot = "0.10.0"
rand = "0.7" rand = "0.7.3"
rlp = "0.4.0" rlp = "0.4.0"
secp256k1 = "0.17" secp256k1 = "0.17"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
slab = "0.4.2" slab = "0.4.2"
tiny-keccak = "1.4" tiny-keccak = "2.0.2"
[dev-dependencies] [dev-dependencies]
assert_matches = "1.2" assert_matches = "1.2"

6
util/network-devp2p/src/connection.rs
View File

@ -31,7 +31,7 @@ use mio::deprecated::{EventLoop, Handler, TryRead, TryWrite};
use mio::tcp::TcpStream; use mio::tcp::TcpStream;
use parity_bytes::Bytes; use parity_bytes::Bytes;
use rlp::{Rlp, RlpStream}; use rlp::{Rlp, RlpStream};
use tiny_keccak::Keccak; use tiny_keccak::{Keccak, Hasher};
use ethcore_io::{IoContext, StreamToken}; use ethcore_io::{IoContext, StreamToken};
use network::Error; use network::Error;
@ -329,12 +329,12 @@ impl EncryptedConnection {
(&mut key_material[32..64]).copy_from_slice(key_material_keccak.as_bytes()); (&mut key_material[32..64]).copy_from_slice(key_material_keccak.as_bytes());
let mac_encoder_key: Secret = Secret::copy_from_slice(&key_material[32..64]).expect("can create Secret from 32 bytes; qed"); let mac_encoder_key: Secret = Secret::copy_from_slice(&key_material[32..64]).expect("can create Secret from 32 bytes; qed");
let mut egress_mac = Keccak::new_keccak256(); let mut egress_mac = Keccak::v256();
let mut mac_material = H256::from_slice(&key_material[32..64]) ^ handshake.remote_nonce; let mut mac_material = H256::from_slice(&key_material[32..64]) ^ handshake.remote_nonce;
egress_mac.update(mac_material.as_bytes()); egress_mac.update(mac_material.as_bytes());
egress_mac.update(if handshake.originated { &handshake.auth_cipher } else { &handshake.ack_cipher }); egress_mac.update(if handshake.originated { &handshake.auth_cipher } else { &handshake.ack_cipher });
let mut ingress_mac = Keccak::new_keccak256(); let mut ingress_mac = Keccak::v256();
mac_material = H256::from_slice(&key_material[32..64]) ^ handshake.nonce; mac_material = H256::from_slice(&key_material[32..64]) ^ handshake.nonce;
ingress_mac.update(mac_material.as_bytes()); ingress_mac.update(mac_material.as_bytes());
ingress_mac.update(if handshake.originated { &handshake.ack_cipher } else { &handshake.auth_cipher }); ingress_mac.update(if handshake.originated { &handshake.ack_cipher } else { &handshake.auth_cipher });