diff --git a/Cargo.lock b/Cargo.lock index d126d8156e1..fb78bf07a11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -334,7 +334,7 @@ version = "0.2.0" dependencies = [ "base64 0.13.0", "chrono", - "hmac", + "hmac 0.10.1", "reqwest", "sha-1 0.9.1", ] @@ -540,7 +540,7 @@ dependencies = [ "aes-gcm", "base64 0.12.3", "hkdf", - "hmac", + "hmac 0.8.1", "rand", "sha2 0.9.1", "time 0.2.22", @@ -588,6 +588,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +dependencies = [ + "generic-array 0.14.4", + "subtle", +] + [[package]] name = "ctor" version = "0.1.16" @@ -739,9 +749,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd" dependencies = [ "atty", "humantime", @@ -1020,7 +1030,7 @@ dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.0", + "quick-error", "serde", "serde_json", ] @@ -1053,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9" dependencies = [ "digest 0.9.0", - "hmac", + "hmac 0.8.1", ] [[package]] @@ -1062,7 +1072,17 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac", + "crypto-mac 0.8.0", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.0", "digest 0.9.0", ] @@ -1143,12 +1163,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "humantime" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error 1.2.3", -] +checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" @@ -1989,12 +2006,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index 26a6a22a464..558b96488bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ diesel = { version = "1.4.0", features = ["postgres", "serde_json", "chrono", "r diesel_full_text_search = "1.0.0" docopt = "1.0" dotenv = "0.15" -env_logger = "0.7" +env_logger = "0.8" failure = "0.1.1" flate2 = "1.0" futures-channel = { version = "0.3.1", default-features = false } diff --git a/src/s3/Cargo.toml b/src/s3/Cargo.toml index b0a63ebb67e..912db3c9e87 100644 --- a/src/s3/Cargo.toml +++ b/src/s3/Cargo.toml @@ -17,5 +17,5 @@ path = "lib.rs" base64 = "0.13" chrono = "0.4" sha-1 = "0.9" -hmac = "0.8" +hmac = "0.10" reqwest = { version = "0.10", features = ["blocking"] }