From ebf8b23f96d5a176080bb8d78ff6331f9afd156a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 07:56:07 +0000 Subject: [PATCH] Bump pbkdf2 from 0.7.3 to 0.10.0 Bumps [pbkdf2](https://github.com/RustCrypto/password-hashes) from 0.7.3 to 0.10.0. - [Release notes](https://github.com/RustCrypto/password-hashes/releases) - [Commits](https://github.com/RustCrypto/password-hashes/compare/pbkdf2-v0.7.3...pbkdf2-v0.10.0) --- updated-dependencies: - dependency-name: pbkdf2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 105 +++++++++++++++++++++------ testsuite/cli/diem-wallet/Cargo.toml | 2 +- 2 files changed, 83 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44da7047f0fb..3bcf83ceac30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -359,9 +359,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "0.2.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fb38fd6e62e4ceec8543db40ceb714454ff173451a0f2a6c8952fdf39a2d6c" +checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] name = "bcs" @@ -473,6 +473,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -986,7 +995,7 @@ dependencies = [ "once_cell", "proptest", "proptest-derive", - "sha2", + "sha2 0.9.3", "vm", ] @@ -1123,6 +1132,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +[[package]] +name = "cpufeatures" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +dependencies = [ + "libc", +] + [[package]] name = "cpuid-bool" version = "0.1.2" @@ -1278,6 +1296,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "crypto-mac" version = "0.10.0" @@ -1497,7 +1524,7 @@ dependencies = [ "serde-name", "serde_bytes", "serde_json", - "sha2", + "sha2 0.9.3", "sha3", "static_assertions", "thiserror", @@ -1596,7 +1623,7 @@ dependencies = [ "move-lang", "move-prover", "rayon", - "sha2", + "sha2 0.9.3", "transaction-builder-generator", "vm", "walkdir", @@ -2363,12 +2390,12 @@ dependencies = [ "diem-workspace-hack", "ed25519-dalek-fiat", "hex", - "hmac", + "hmac 0.10.1", "mirai-annotations", "pbkdf2", "rand 0.8.3", "serde", - "sha2", + "sha2 0.9.3", "thiserror", ] @@ -2562,6 +2589,18 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.4", + "subtle", +] + [[package]] name = "dirs" version = "1.0.5" @@ -2666,7 +2705,7 @@ dependencies = [ "rand 0.8.3", "serde", "serde_bytes", - "sha2", + "sha2 0.9.3", "zeroize", ] @@ -3444,7 +3483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" dependencies = [ "digest 0.9.0", - "hmac", + "hmac 0.10.1", ] [[package]] @@ -3457,6 +3496,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2" +dependencies = [ + "digest 0.10.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3953,9 +4001,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.88" +version = "0.2.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" +checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" [[package]] name = "libfuzzer-sys" @@ -4422,7 +4470,7 @@ dependencies = [ "move-core-types", "move-vm-types", "once_cell", - "sha2", + "sha2 0.9.3", "smallvec", "vm", ] @@ -4474,7 +4522,7 @@ dependencies = [ "once_cell", "proptest", "serde", - "sha2", + "sha2 0.9.3", "smallvec", "vm", ] @@ -4961,12 +5009,13 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721a49e14f1803441886c688ba8b653b52e1dcc926969081d22384e300ea4106" +checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" dependencies = [ "base64ct", "rand_core 0.6.2", + "subtle", ] [[package]] @@ -4977,15 +5026,14 @@ checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" [[package]] name = "pbkdf2" -version = "0.7.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309c95c5f738c85920eb7062a2de29f3840d4f96974453fc9ac1ba078da9c627" +checksum = "a4628cc3cf953b82edcd3c1388c5715401420ce5524fedbab426bd5aba017434" dependencies = [ - "base64ct", - "crypto-mac", - "hmac", + "digest 0.10.0", + "hmac 0.12.0", "password-hash", - "sha2", + "sha2 0.10.0", ] [[package]] @@ -5941,7 +5989,7 @@ dependencies = [ "bytes 1.0.1", "futures", "hex", - "hmac", + "hmac 0.10.1", "http", "hyper", "log", @@ -5951,7 +5999,7 @@ dependencies = [ "rusoto_credential", "rustc_version", "serde", - "sha2", + "sha2 0.9.3", "time 0.2.23", "tokio", ] @@ -6464,6 +6512,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.0", +] + [[package]] name = "sha3" version = "0.9.1" diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/testsuite/cli/diem-wallet/Cargo.toml index 3172607d1a6c..6c935ceb5a84 100644 --- a/testsuite/cli/diem-wallet/Cargo.toml +++ b/testsuite/cli/diem-wallet/Cargo.toml @@ -15,7 +15,7 @@ rand = "0.8.3" hex = "0.4.3" hmac = "0.10.1" byteorder = "1.4.2" -pbkdf2 = "0.7.3" +pbkdf2 = "0.10.0" serde = "1.0.124" sha2 = "0.9.3" thiserror = "1.0.24"