From 8d29d05761918456900516d89294db01febdc64b Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Sat, 23 May 2020 21:14:30 -0400 Subject: [PATCH] Upgrade sha2 to 0.8.2 release Resolves #326 --- Cargo.lock | 21 +++++---------------- zebra-chain/Cargo.toml | 3 +-- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3657968..ac739b6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,7 +214,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" dependencies = [ - "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2", ] [[package]] @@ -399,7 +399,7 @@ dependencies = [ "curve25519-dalek", "rand_core 0.5.1", "serde", - "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2", "thiserror", ] @@ -1520,20 +1520,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.8.1" -source = "git+https://github.com/RustCrypto/hashes?rev=30b416a#30b416ad34c3291c66a1ac1bd90c25c6fcd1d4b3" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" +checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" dependencies = [ "block-buffer", "digest", @@ -2088,7 +2077,7 @@ dependencies = [ "ripemd160", "secp256k1", "serde", - "sha2 0.8.1 (git+https://github.com/RustCrypto/hashes?rev=30b416a)", + "sha2", "thiserror", "x25519-dalek", ] diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 803dea3d..ead38724 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -22,8 +22,7 @@ rand_core = "0.5.1" ripemd160 = "0.8.0" secp256k1 = { version = "0.17.2", features = ["serde"] } serde = { version = "1", features = ["serde_derive"] } -# TODO: update to crates.io version when available, #326 -sha2 = {git="https://github.com/RustCrypto/hashes", rev="30b416a", features=["compress"]} +sha2 = { version = "0.8.2", features=["compress"] } thiserror = "1" x25519-dalek = "0.6" # ZF deps