From 25ff26704d39bfceead501fedef161c07b746a5f Mon Sep 17 00:00:00 2001 From: Eugene Date: Sun, 29 Dec 2024 20:00:08 +0100 Subject: [PATCH] bump argon2 --- .vscode/settings.json | 5 +++ Cargo.lock | 94 +++++++++++-------------------------------- ssh-key/Cargo.toml | 2 +- 3 files changed, 30 insertions(+), 71 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..5683132 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "rust-analyzer.cargo.features": + "all" + +} diff --git a/Cargo.lock b/Cargo.lock index 5196f92..bfe3e95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5f451b77e2f92932dc411da6ef9f3d33efad68a6f14a7a83e559453458e85ac" dependencies = [ - "crypto-common 0.2.0-rc.0", + "crypto-common", ] [[package]] @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.3" +version = "0.6.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +checksum = "8f95281c5706985b6c00f8a2270438f968d475672aa68a4a85cddcb57a68577b" dependencies = [ "base64ct", "blake2", @@ -81,20 +81,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "e6dbf347378982186052c47f25f33fc1a6eb439ee840d778eb3ec132e304379d" dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -103,7 +94,7 @@ version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17092d478f4fadfb35a7e082f62e49f0907fdf048801d9d706277e34f9df8a78" dependencies = [ - "crypto-common 0.2.0-rc.0", + "crypto-common", ] [[package]] @@ -170,7 +161,7 @@ version = "0.5.0-pre.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71c893d5a1e8257048dbb29954d2e1f85f091a150304f1defe4ca2806da5d3f" dependencies = [ - "crypto-common 0.2.0-rc.0", + "crypto-common", "inout", "zeroize", ] @@ -203,16 +194,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "crypto-common" version = "0.2.0-rc.0" @@ -241,7 +222,7 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.11.0-pre.9", + "digest", "fiat-crypto", "rustc_version", "subtle", @@ -276,26 +257,15 @@ dependencies = [ "cipher", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.6", - "subtle", -] - [[package]] name = "digest" version = "0.11.0-pre.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" dependencies = [ - "block-buffer 0.11.0-rc.0", + "block-buffer", "const-oid", - "crypto-common 0.2.0-rc.0", + "crypto-common", "subtle", ] @@ -305,7 +275,7 @@ version = "0.7.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28e0b1a3c7540d48f58eca5ddfdeb40a44aff3047bf15fe4fb6162a673ddd5fa" dependencies = [ - "digest 0.11.0-pre.9", + "digest", "num-bigint-dig", "num-traits", "pkcs8", @@ -322,7 +292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad051af2b2d2f356d716138c76775929be913deb5b4ea217cd2613535936bef" dependencies = [ "der", - "digest 0.11.0-pre.9", + "digest", "elliptic-curve", "rfc6979", "signature", @@ -357,7 +327,7 @@ checksum = "4ed8e96bb573517f42470775f8ef1b9cd7595de52ba7a8e19c48325a92c8fe4f" dependencies = [ "base16ct", "crypto-bigint", - "digest 0.11.0-pre.9", + "digest", "ff", "group", "hybrid-array", @@ -384,16 +354,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -444,7 +404,7 @@ version = "0.13.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58" dependencies = [ - "digest 0.11.0-pre.9", + "digest", ] [[package]] @@ -590,9 +550,9 @@ dependencies = [ [[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", @@ -605,7 +565,7 @@ version = "0.13.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e11753d5193f26dc27ae698e0b536b5e511b7799c5ac475ec10783f26d164a" dependencies = [ - "digest 0.11.0-pre.9", + "digest", ] [[package]] @@ -747,7 +707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07058e83b684989ab0559f9e22322f4e3f7e49147834ed0bae40486b9e70473c" dependencies = [ "const-oid", - "digest 0.11.0-pre.9", + "digest", "num-bigint-dig", "num-integer", "num-traits", @@ -818,7 +778,7 @@ checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-pre.9", + "digest", ] [[package]] @@ -829,7 +789,7 @@ checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-pre.9", + "digest", ] [[package]] @@ -838,7 +798,7 @@ version = "2.3.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "054d71959c7051b9042c26af337f05cc930575ed2604d7d3ced3158383e59734" dependencies = [ - "digest 0.11.0-pre.9", + "digest", "rand_core", ] @@ -898,7 +858,7 @@ version = "0.3.0-pre.1" dependencies = [ "base64ct", "bytes", - "digest 0.11.0-pre.9", + "digest", "hex-literal", "pem-rfc7468", ] @@ -977,16 +937,10 @@ version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3517d72c5ca6d60f9f2e85d2c772e2652830062a685105a528d19dd823cf87d5" dependencies = [ - "crypto-common 0.2.0-rc.0", + "crypto-common", "subtle", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/ssh-key/Cargo.toml b/ssh-key/Cargo.toml index cf6d492..5a869c5 100644 --- a/ssh-key/Cargo.toml +++ b/ssh-key/Cargo.toml @@ -26,7 +26,7 @@ subtle = { version = "2", default-features = false } zeroize = { version = "1", default-features = false } # optional dependencies -argon2 = { version = "0.5", optional = true, default-features = false, features = ["alloc"] } +argon2 = { version = "=0.6.0-pre.1", optional = true, default-features = false, features = ["alloc"] } bcrypt-pbkdf = { version = "=0.11.0-pre.1", optional = true, default-features = false, features = ["alloc"] } bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false } dsa = { version = "=0.7.0-pre.1", optional = true, default-features = false }