From aca2900a61e48ab794f30fd7541d31c31fb494ea Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 27 Jul 2024 14:04:33 -0600 Subject: [PATCH] Bump `password-hash` dependency to v0.6.0-rc.0 --- .readme/Cargo.lock | 96 +++++++++++++++++++--------------------- .readme/Cargo.toml | 6 +-- Cargo.lock | 4 +- argon2/Cargo.toml | 4 +- balloon-hash/Cargo.toml | 2 +- password-auth/Cargo.toml | 4 +- pbkdf2/Cargo.toml | 2 +- scrypt/Cargo.toml | 4 +- 8 files changed, 56 insertions(+), 66 deletions(-) diff --git a/.readme/Cargo.lock b/.readme/Cargo.lock index 9c96ce79..62466a47 100644 --- a/.readme/Cargo.lock +++ b/.readme/Cargo.lock @@ -4,35 +4,36 @@ version = 3 [[package]] name = "argon2" -version = "0.5.0-pre.0" +version = "0.6.0-pre.0" dependencies = [ "base64ct", "blake2", + "cpufeatures", "password-hash", ] [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "blake2" -version = "0.10.6" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +checksum = "e6dbf347378982186052c47f25f33fc1a6eb439ee840d778eb3ec132e304379d" dependencies = [ "digest", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "17092d478f4fadfb35a7e082f62e49f0907fdf048801d9d706277e34f9df8a78" dependencies = [ - "generic-array", + "crypto-common", ] [[package]] @@ -43,9 +44,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.4.3" +version = "0.5.0-pre.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "c71c893d5a1e8257048dbb29954d2e1f85f091a150304f1defe4ca2806da5d3f" dependencies = [ "crypto-common", "inout", @@ -53,44 +54,33 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "8c070b79a496dccd931229780ad5bbedd535ceff6c3565605a8e440e18e1aa2b" dependencies = [ - "generic-array", - "typenum", + "hybrid-array", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.11.0-pre.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" dependencies = [ "block-buffer", "crypto-common", "subtle", ] -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.8" @@ -104,33 +94,42 @@ dependencies = [ [[package]] name = "hmac" -version = "0.12.1" +version = "0.13.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58" dependencies = [ "digest", ] +[[package]] +name = "hybrid-array" +version = "0.2.0-rc.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d306b679262030ad8813a82d4915fc04efff97776e4db7f8eb5137039d56400" +dependencies = [ + "typenum", +] + [[package]] name = "inout" -version = "0.1.3" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "bbc33218cf9ce7b927426ee4ad3501bcc5d8c26bf5fb4a82849a083715aca427" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] name = "libc" -version = "0.2.139" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "password-hash" -version = "0.5.0" +version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +checksum = "ec3b470a56963403c40f9dbb41eaee539759de9d026d3324da705a0ae0d269cd" dependencies = [ "base64ct", "rand_core", @@ -139,7 +138,7 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.12.0-pre" +version = "0.13.0-pre.0" dependencies = [ "digest", "hmac", @@ -168,16 +167,17 @@ dependencies = [ [[package]] name = "salsa20" -version = "0.10.2" +version = "0.11.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +checksum = "ea4ef53595bd236cf843530a2db25c792acb34e619320d0423e6cbc6d8e3c8c5" dependencies = [ + "cfg-if", "cipher", ] [[package]] name = "scrypt" -version = "0.11.0-pre" +version = "0.12.0-pre.0" dependencies = [ "password-hash", "pbkdf2", @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5" dependencies = [ "cfg-if", "cpufeatures", @@ -204,15 +204,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "version_check" -version = "0.9.4" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "wasi" diff --git a/.readme/Cargo.toml b/.readme/Cargo.toml index 265f8e77..632f52c4 100644 --- a/.readme/Cargo.toml +++ b/.readme/Cargo.toml @@ -8,11 +8,7 @@ edition = "2021" publish = false [dependencies] -password-hash = "=0.6.0-pre.0" +password-hash = "0.6.0-rc.0" argon2 = { path = "../argon2" } pbkdf2 = { path = "../pbkdf2", features = ["simple"] } scrypt = { path = "../scrypt" } - -[patch.crates-io] -salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } - diff --git a/Cargo.lock b/Cargo.lock index 6fc6394a..fb85b917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,9 +325,9 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.6.0-pre.0" +version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729c85c9293ba93ed2b92983c462cd6d5acc5d747a47188e5c71a216753a7d4" +checksum = "ec3b470a56963403c40f9dbb41eaee539759de9d026d3324da705a0ae0d269cd" dependencies = [ "base64ct", "rand_core", diff --git a/argon2/Cargo.toml b/argon2/Cargo.toml index 47333cbb..07f29a13 100644 --- a/argon2/Cargo.toml +++ b/argon2/Cargo.toml @@ -21,7 +21,7 @@ base64ct = "1" blake2 = { version = "=0.11.0-pre.4", default-features = false } # optional dependencies -password-hash = { version = "=0.6.0-pre.0", optional = true } +password-hash = { version = "0.6.0-rc.0", optional = true } zeroize = { version = "1", default-features = false, optional = true } [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] @@ -29,7 +29,7 @@ cpufeatures = "0.2.12" [dev-dependencies] hex-literal = "0.4" -password-hash = { version = "=0.6.0-pre.0", features = ["rand_core"] } +password-hash = { version = "0.6.0-rc.0", features = ["rand_core"] } [features] default = ["alloc", "password-hash", "rand"] diff --git a/balloon-hash/Cargo.toml b/balloon-hash/Cargo.toml index 4303b5de..b3015537 100644 --- a/balloon-hash/Cargo.toml +++ b/balloon-hash/Cargo.toml @@ -18,7 +18,7 @@ digest = { version = "=0.11.0-pre.9", default-features = false } crypto-bigint = { version = "0.6.0-rc.2", default-features = false, features = ["hybrid-array"] } # optional dependencies -password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true } +password-hash = { version = "0.6.0-rc.0", default-features = false, optional = true } rayon = { version = "1.7", optional = true } zeroize = { version = "1", default-features = false, optional = true } diff --git a/password-auth/Cargo.toml b/password-auth/Cargo.toml index fd293e9c..801bd604 100644 --- a/password-auth/Cargo.toml +++ b/password-auth/Cargo.toml @@ -17,13 +17,13 @@ edition = "2021" rust-version = "1.72" [dependencies] -password-hash = { version = "=0.6.0-pre.0", features = ["alloc", "rand_core"] } +password-hash = { version = "0.6.0-rc.0", features = ["alloc", "rand_core"] } rand_core = { version = "0.6", features = ["getrandom"] } # optional dependencies argon2 = { version = "=0.6.0-pre.0", optional = true, default-features = false, features = ["alloc", "simple"], path = "../argon2" } pbkdf2 = { version = "=0.13.0-pre.0", optional = true, default-features = false, features = ["simple"], path = "../pbkdf2" } -scrypt = { version = "=0.12.0-pre.0", optional = true, default-features = false, features = ["simple"], path = "../scrypt" } +scrypt = { version = "=0.12.0-pre.0", optional = true, default-features = false, features = ["simple"], path = "../scrypt" } [features] default = ["argon2", "std"] diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml index d47fc3a2..3115d487 100644 --- a/pbkdf2/Cargo.toml +++ b/pbkdf2/Cargo.toml @@ -18,7 +18,7 @@ digest = { version = "=0.11.0-pre.9", features = ["mac"] } # optional dependencies rayon = { version = "1.7", optional = true } -password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true, features = ["rand_core"] } +password-hash = { version = "0.6.0-rc.0", default-features = false, optional = true, features = ["rand_core"] } hmac = { version = "=0.13.0-pre.4", default-features = false, optional = true } sha1 = { version = "=0.11.0-pre.4", default-features = false, optional = true } sha2 = { version = "=0.11.0-pre.4", default-features = false, optional = true } diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml index 901b8ee1..17134786 100644 --- a/scrypt/Cargo.toml +++ b/scrypt/Cargo.toml @@ -19,10 +19,10 @@ salsa20 = { version = "=0.11.0-pre.1", default-features = false } sha2 = { version = "=0.11.0-pre.4", default-features = false } # optional dependencies -password-hash = { version = "=0.6.0-pre.0", default-features = false, features = ["rand_core"], optional = true } +password-hash = { version = "0.6.0-rc.0", default-features = false, features = ["rand_core"], optional = true } [dev-dependencies] -password-hash = { version = "=0.6.0-pre.0", features = ["rand_core"] } +password-hash = { version = "0.6.0-rc.0", features = ["rand_core"] } [features] default = ["simple", "std"]