From 89c44164124c1e78e8e0be18d01d929833915985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= Date: Sat, 5 Sep 2020 22:47:51 -0700 Subject: [PATCH] Update `digest` --- Cargo.lock | 44 ++++++++++++++++++++++++++++++++------------ Cargo.toml | 4 ++-- src/page.rs | 4 ++-- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd08606..2473dc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,13 +78,14 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471" dependencies = [ "byte-tools", + "byteorder", "crypto-mac", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -97,7 +98,7 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array", + "generic-array 0.12.3", ] [[package]] @@ -180,11 +181,11 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array", + "generic-array 0.14.4", "subtle", ] @@ -194,7 +195,16 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.4", ] [[package]] @@ -347,6 +357,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check 0.9.1", +] + [[package]] name = "getopts" version = "0.2.21" @@ -1145,7 +1165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" dependencies = [ "block-buffer", - "digest", + "digest 0.8.1", "fake-simd", "opaque-debug", ] @@ -1200,9 +1220,9 @@ dependencies = [ [[package]] name = "subtle" -version = "1.0.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" +checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" [[package]] name = "syn" @@ -1234,7 +1254,7 @@ dependencies = [ "async-trait", "blake2", "chrono", - "digest", + "digest 0.9.0", "env_logger", "hex", "horrorshow", diff --git a/Cargo.toml b/Cargo.toml index 51444a6..c6c3e08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ warp = "0.2" rand = "0.6" regex = "1.3.7" lazy_static = "*" -blake2 = "*" -digest = "*" +blake2 = "0.9" +digest = "0.9" hex = "*" walkdir = "*" async-trait = "0.1.30" diff --git a/src/page.rs b/src/page.rs index c9bb785..d24ba84 100644 --- a/src/page.rs +++ b/src/page.rs @@ -111,8 +111,8 @@ impl Headers { let id = id.unwrap_or_else(|| { let mut hasher = blake2::Blake2b::new(); - hasher.input(&source.0); - let res = hasher.result(); + hasher.update(&source.0); + let res = hasher.finalize(); hex::encode(&res.as_slice()[0..16]) });