diff --git a/Cargo.lock b/Cargo.lock index f9a9af8..baf7916 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,6 +48,7 @@ dependencies = [ "cipher 0.5.2", "cpubits", "cpufeatures 0.3.0", + "zeroize", ] [[package]] @@ -76,6 +77,7 @@ dependencies = [ "ctr 0.10.0", "ghash 0.6.0", "subtle", + "zeroize", ] [[package]] @@ -133,9 +135,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", - "blake2", + "blake2 0.10.6", "cpufeatures 0.2.17", - "password-hash", + "password-hash 0.5.0", +] + +[[package]] +name = "argon2" +version = "0.6.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af50940b73bf4e16c15c448a2b121c63f2d68e3e54b6a8731673cb4aa0cdff5" +dependencies = [ + "base64ct", + "blake2 0.11.0-rc.6", + "cpufeatures 0.3.0", + "password-hash 0.6.1", ] [[package]] @@ -243,11 +257,22 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2" dependencies = [ - "blowfish", + "blowfish 0.9.1", "pbkdf2 0.12.2", "sha2 0.10.9", ] +[[package]] +name = "bcrypt-pbkdf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144e573728da132683b9488acd528274c790e07fc06ff81ee29f9d8f8b1041e0" +dependencies = [ + "blowfish 0.10.0", + "pbkdf2 0.13.0", + "sha2 0.11.0", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -287,6 +312,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2" +version = "0.11.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -303,6 +337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" dependencies = [ "hybrid-array", + "zeroize", ] [[package]] @@ -342,6 +377,16 @@ dependencies = [ "cipher 0.4.4", ] +[[package]] +name = "blowfish" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ce3946557b35e71d1bbe07ec385073ce9eda05043f95de134eb578fcf1a298" +dependencies = [ + "byteorder", + "cipher 0.5.2", +] + [[package]] name = "bollard" version = "0.17.1" @@ -606,8 +651,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", + "cipher 0.5.2", "cpufeatures 0.3.0", "rand_core 0.10.1", + "zeroize", ] [[package]] @@ -619,7 +666,7 @@ dependencies = [ "aead 0.5.2", "chacha20 0.9.1", "cipher 0.4.4", - "poly1305", + "poly1305 0.8.0", "zeroize", ] @@ -657,6 +704,7 @@ dependencies = [ "block-buffer 0.12.0", "crypto-common 0.2.2", "inout 0.2.2", + "zeroize", ] [[package]] @@ -846,9 +894,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.7.0-rc.28" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dacf199529fb801ae62a9aafdc01b189e9504c0d1ee1512a4c16bcd8666a93" +checksum = "42a0d26b245348befa0c121944541476763dcc46ede886c88f9d12e1697d27c3" dependencies = [ "cpubits", "ctutils", @@ -885,11 +933,11 @@ dependencies = [ [[package]] name = "crypto-primes" -version = "0.7.0-pre.9" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6081ce8b60c0e533e2bba42771b94eb6149052115f4179744d5779883dc98583" +checksum = "21f41f23de7d24cdbda7f0c4d9c0351f99a4ceb258ef30e5c1927af8987ffe5a" dependencies = [ - "crypto-bigint 0.7.0-rc.28", + "crypto-bigint 0.7.3", "libm", "rand_core 0.10.1", ] @@ -913,7 +961,7 @@ dependencies = [ "aead 0.5.2", "cipher 0.4.4", "generic-array 0.14.7", - "poly1305", + "poly1305 0.8.0", "salsa20 0.10.2", "subtle", "zeroize", @@ -1169,6 +1217,15 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "des" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916a94e407b54f9034d71dd748234cd1e516ced6284009906ae246f177eafe5a" +dependencies = [ + "cipher 0.5.2", +] + [[package]] name = "digest" version = "0.10.7" @@ -1348,16 +1405,16 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.17.0-rc.16" +version = "0.17.0-rc.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91bbdd377139884fafcad8dc43a760a3e1e681aa26db910257fa6535b70e1829" +checksum = "54fb064faabbee66e1fc8e5c5a9458d4269dc2d8b638fe86a425adb2510d1a96" dependencies = [ "der 0.8.0", "digest 0.11.3", - "elliptic-curve 0.14.0-rc.28", + "elliptic-curve 0.14.0-rc.32", "rfc6979 0.5.0", "signature 3.0.0", - "spki 0.8.0-rc.4", + "spki 0.8.0", "zeroize", ] @@ -1372,11 +1429,11 @@ dependencies = [ [[package]] name = "ed25519" -version = "3.0.0-rc.4" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e914c7c52decb085cea910552e24c63ac019e3ab8bf001ff736da9a9d9d890" +checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a" dependencies = [ - "pkcs8 0.11.0-rc.11", + "pkcs8 0.11.0", "signature 3.0.0", ] @@ -1394,12 +1451,12 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "3.0.0-pre.6" +version = "3.0.0-pre.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053618a4c3d3bc24f188aa660ae75a46eeab74ef07fb415c61431e5e7cd4749b" +checksum = "20449acd54b660981ae5caa2bcb56d1fe7f25f2e37a38ec507400fab034d4bb6" dependencies = [ "curve25519-dalek 5.0.0-pre.6", - "ed25519 3.0.0-rc.4", + "ed25519 3.0.0", "rand_core 0.10.1", "serde", "sha2 0.11.0", @@ -1435,19 +1492,19 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.14.0-rc.28" +version = "0.14.0-rc.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde7860544606d222fd6bd6d9f9a0773321bf78072a637e1d560a058c0031978" +checksum = "cda94f31325c4275e9706adecbb6f0650dee2f904c915a98e3d81adaaaa757aa" dependencies = [ "base16ct 1.0.0", - "crypto-bigint 0.7.0-rc.28", + "crypto-bigint 0.7.3", "crypto-common 0.2.2", "digest 0.11.3", "hkdf 0.13.0", "hybrid-array", "once_cell", "pem-rfc7468 1.0.0", - "pkcs8 0.11.0-rc.11", + "pkcs8 0.11.0", "rand_core 0.10.1", "rustcrypto-ff", "rustcrypto-group", @@ -2053,6 +2110,18 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +[[package]] +name = "gloo-timers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "482ce8a491a501da4cd806bd190275363d674f2845005c6ddbd5d3e1dd54495d" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "gobject-sys" version = "0.18.0" @@ -2584,35 +2653,6 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" -[[package]] -name = "internal-russh-forked-ssh-key" -version = "0.6.18+upstream-0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f8a978272e3cbdf4768f7363eb1c8e1e6ba63c52a3ed05e29e222da4aec7cb" -dependencies = [ - "argon2", - "bcrypt-pbkdf", - "crypto-bigint 0.7.0-rc.28", - "ecdsa 0.17.0-rc.16", - "ed25519-dalek 3.0.0-pre.6", - "hex", - "hmac 0.13.0", - "num-bigint-dig", - "p256 0.14.0-rc.7", - "p384 0.14.0-rc.7", - "p521 0.14.0-rc.7", - "rand_core 0.10.1", - "rsa 0.10.0-rc.16", - "sec1 0.8.1", - "sha1 0.11.0", - "sha2 0.11.0", - "signature 3.0.0", - "ssh-cipher", - "ssh-encoding", - "subtle", - "zeroize", -] - [[package]] name = "internal-russh-num-bigint" version = "0.5.0" @@ -3080,13 +3120,14 @@ dependencies = [ [[package]] name = "ml-kem" -version = "0.3.0-rc.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8198b5db27ac9773534c371751a59dc18aec8b80aa141e69abfdd1dec2e3f78c" +checksum = "5e15f3e5b957493873e396a66914e83e616b6afe335cdef7efe5c6e1216aba66" dependencies = [ "hybrid-array", "kem", "module-lattice", + "pkcs8 0.11.0", "rand_core 0.10.1", "sha3", ] @@ -3221,7 +3262,6 @@ dependencies = [ "num-iter", "num-traits", "rand 0.8.6", - "serde", "smallvec", "zeroize", ] @@ -3566,14 +3606,14 @@ dependencies = [ [[package]] name = "p256" -version = "0.14.0-rc.7" +version = "0.14.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "018bfbb86e05fd70a83e985921241035ee09fcd369c4a2c3680b389a01d2ad28" +checksum = "8b97e3bf0465157ae90975ff52dbeb1362ba618924878c9f74c25baa27a65f9a" dependencies = [ - "ecdsa 0.17.0-rc.16", - "elliptic-curve 0.14.0-rc.28", + "ecdsa 0.17.0-rc.18", + "elliptic-curve 0.14.0-rc.32", "primefield", - "primeorder 0.14.0-rc.7", + "primeorder 0.14.0-rc.9", "sha2 0.11.0", ] @@ -3591,15 +3631,15 @@ dependencies = [ [[package]] name = "p384" -version = "0.14.0-rc.7" +version = "0.14.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c91df688211f5957dbe2ab599dcbcaade8d6d3cdc15c5b350d350d7d07ce423" +checksum = "437f30ebcb1e16ff48acead5f08bd69fbcdbc82421687bb48af5c315a0bfab03" dependencies = [ - "ecdsa 0.17.0-rc.16", - "elliptic-curve 0.14.0-rc.28", + "ecdsa 0.17.0-rc.18", + "elliptic-curve 0.14.0-rc.32", "fiat-crypto 0.3.0", "primefield", - "primeorder 0.14.0-rc.7", + "primeorder 0.14.0-rc.9", "sha2 0.11.0", ] @@ -3619,15 +3659,15 @@ dependencies = [ [[package]] name = "p521" -version = "0.14.0-rc.7" +version = "0.14.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de6cd9451de522549d36cc78a1b45a699a3d55a872e8ea0c8f0318e502d99e2c" +checksum = "4e9fd792bab86ecf6249561752fb5a413511f999887107dd054bbda5143743d7" dependencies = [ "base16ct 1.0.0", - "ecdsa 0.17.0-rc.16", - "elliptic-curve 0.14.0-rc.28", + "ecdsa 0.17.0-rc.18", + "elliptic-curve 0.14.0-rc.32", "primefield", - "primeorder 0.14.0-rc.7", + "primeorder 0.14.0-rc.9", "sha2 0.11.0", ] @@ -3709,6 +3749,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "password-hash" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aab41826031698d6ffcd9cff78ef56ef998e39dc7e5067cdfebe373842d4723b" +dependencies = [ + "phc", +] + [[package]] name = "pathdiff" version = "0.2.3" @@ -3722,7 +3771,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", ] [[package]] @@ -3759,6 +3807,16 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "phc" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44dc769b75f93afdddd8c7fa12d685292ddeff1e66f7f0f3a234cf1818afe892" +dependencies = [ + "base64ct", + "ctutils", +] + [[package]] name = "phf" version = "0.13.1" @@ -3842,24 +3900,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e" dependencies = [ "der 0.8.0", - "spki 0.8.0-rc.4", + "spki 0.8.0", ] [[package]] name = "pkcs5" -version = "0.8.0-rc.13" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a777c6e26664bc9504b3ce3f6133f8f20d9071f130a4f9fcbd3186959d8dd6" +checksum = "279a91971a1d8eb1260a30938eae3be9cb67b472dffecb222fbbbe2fd2dc1453" dependencies = [ "aes 0.9.0", - "aes-gcm 0.11.0-rc.3", "cbc 0.2.0", "der 0.8.0", "pbkdf2 0.13.0", "rand_core 0.10.1", "scrypt", "sha2 0.11.0", - "spki 0.8.0-rc.4", + "spki 0.8.0", ] [[package]] @@ -3874,14 +3931,14 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.11.0-rc.11" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12922b6296c06eb741b02d7b5161e3aaa22864af38dfa025a1a3ba3f68c84577" +checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ "der 0.8.0", "pkcs5", "rand_core 0.10.1", - "spki 0.8.0-rc.4", + "spki 0.8.0", ] [[package]] @@ -3940,6 +3997,17 @@ dependencies = [ "universal-hash 0.5.1", ] +[[package]] +name = "poly1305" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00baa632505d05512f48a963e16051c54fda9a95cc9acea1a4e3c90991c4a2e" +dependencies = [ + "cpufeatures 0.3.0", + "universal-hash 0.6.1", + "zeroize", +] + [[package]] name = "polyval" version = "0.6.2" @@ -4026,11 +4094,11 @@ dependencies = [ [[package]] name = "primefield" -version = "0.14.0-rc.7" +version = "0.14.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93401c13cc7ff24684571cfca9d3cf9ebabfaf3d4b7b9963ade41ec54da196b5" +checksum = "1b52e6ee42db392378a95622b463c9740631171d1efce43fa445a569c1600cb6" dependencies = [ - "crypto-bigint 0.7.0-rc.28", + "crypto-bigint 0.7.3", "crypto-common 0.2.2", "rand_core 0.10.1", "rustcrypto-ff", @@ -4049,11 +4117,11 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.14.0-rc.7" +version = "0.14.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c5c8a39bcd764bfedf456e8d55e115fe86dda3e0f555371849f2a41cbc9706" +checksum = "0556580e42c19833f5d232aca11a7687a503ee41f937b54f5ae1d50fc2a6a36a" dependencies = [ - "elliptic-curve 0.14.0-rc.28", + "elliptic-curve 0.14.0-rc.32", ] [[package]] @@ -4532,52 +4600,47 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-rc.16" +version = "0.10.0-rc.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb9fd8c1edd9e6a2693623baf0fe77ff05ce022a5d7746900ffc38a15c233de" +checksum = "30b2aa4ba0d89f73d1e332df05be0eeab8840351c36ca5654341dfdb57bb3caf" dependencies = [ "const-oid 0.10.2", - "crypto-bigint 0.7.0-rc.28", + "crypto-bigint 0.7.3", "crypto-primes", "digest 0.11.3", "pkcs1 0.8.0-rc.4", - "pkcs8 0.11.0-rc.11", + "pkcs8 0.11.0", "rand_core 0.10.1", "sha2 0.11.0", "signature 3.0.0", - "spki 0.8.0-rc.4", + "spki 0.8.0", "zeroize", ] [[package]] name = "russh" -version = "0.60.2" +version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e358980fe9b079b99da387117864ee6f0a3fd02f39e5b5fde6af9c2895374" +checksum = "f67013f080c226e5a34db1c71f2567f44d95a6300005bb6cd4e2c8fe3c326d1b" dependencies = [ - "aead 0.6.0-rc.10", - "aes 0.8.4", "aes 0.9.0", - "aes-gcm 0.11.0-rc.3", "aws-lc-rs", "bitflags 2.11.1", - "block-padding 0.3.3", + "block-padding 0.4.2", "byteorder", "bytes", - "cbc 0.1.2", "cbc 0.2.0", "cipher 0.5.2", - "crypto-bigint 0.7.0-rc.28", + "crypto-bigint 0.7.3", "ctr 0.10.0", - "ctr 0.9.2", "curve25519-dalek 5.0.0-pre.6", "data-encoding", "delegate", "der 0.8.0", - "digest 0.10.7", - "ecdsa 0.17.0-rc.16", - "ed25519-dalek 3.0.0-pre.6", - "elliptic-curve 0.14.0-rc.28", + "digest 0.11.3", + "ecdsa 0.17.0-rc.18", + "ed25519-dalek 3.0.0-pre.7", + "elliptic-curve 0.14.0-rc.32", "enum_dispatch", "flate2", "futures", @@ -4586,10 +4649,8 @@ dependencies = [ "ghash 0.6.0", "hex-literal", "hkdf 0.13.0", - "hmac 0.12.1", "hmac 0.13.0", "inout 0.1.4", - "internal-russh-forked-ssh-key", "internal-russh-num-bigint", "keccak", "log", @@ -4597,32 +4658,30 @@ dependencies = [ "ml-kem", "module-lattice", "num-bigint", - "p256 0.14.0-rc.7", - "p384 0.14.0-rc.7", - "p521 0.14.0-rc.7", + "p256 0.14.0-rc.9", + "p384 0.14.0-rc.9", + "p521 0.14.0-rc.9", "pageant", - "pbkdf2 0.12.2", "pbkdf2 0.13.0", "pkcs1 0.8.0-rc.4", "pkcs5", - "pkcs8 0.11.0-rc.11", + "pkcs8 0.11.0", "polyval 0.7.1", "rand 0.10.1", "rand_core 0.10.1", - "rsa 0.10.0-rc.16", + "rsa 0.10.0-rc.18", "russh-cryptovec", "russh-util", "salsa20 0.11.0", "scrypt", "sec1 0.8.1", - "sha1 0.10.6", - "sha1 0.11.0", - "sha2 0.10.9", + "sha1", "sha2 0.11.0", "sha3", "signature 3.0.0", - "spki 0.8.0-rc.4", - "ssh-encoding", + "spki 0.8.0", + "ssh-encoding 0.3.0-rc.9", + "ssh-key 0.7.0-rc.10", "subtle", "thiserror 2.0.18", "tokio", @@ -4633,32 +4692,34 @@ dependencies = [ [[package]] name = "russh-cryptovec" -version = "0.59.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36140e8a20297bc2e8338807c3d9ca911f7fa49d7539cbcd6d48d3befd70efd8" +checksum = "443f6bbcfacb34a1aab2b12b99bf08e0c63abdc5a0db261901365df9d57fff51" dependencies = [ "log", "nix 0.31.2", - "ssh-encoding", + "ssh-encoding 0.3.0-rc.9", "windows-sys 0.61.2", ] [[package]] name = "russh-sftp" -version = "2.1.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09daa0ebcf53fb18d7b16167586a68b5bf2cfa3eaad49e661a19302552a2b879" +checksum = "9ed8949eca4163c18a8f59ff96d32cf61e9c13b9735e21ef32b3907f4aafa1a9" dependencies = [ "bitflags 2.11.1", "bytes", "chrono", "dashmap", + "gloo-timers", "log", "serde", "serde_bytes", "thiserror 2.0.18", "tokio", "tokio-util", + "wasm-bindgen-futures", ] [[package]] @@ -5272,17 +5333,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.11.0" @@ -5532,9 +5582,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.8.0-rc.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8baeff88f34ed0691978ec34440140e1572b68c7dd4a495fd14a3dc1944daa80" +checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", "der 0.8.0", @@ -5552,11 +5602,31 @@ dependencies = [ "chacha20 0.9.1", "cipher 0.4.4", "ctr 0.9.2", - "poly1305", - "ssh-encoding", + "poly1305 0.8.0", + "ssh-encoding 0.2.0", "subtle", ] +[[package]] +name = "ssh-cipher" +version = "0.3.0-rc.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10db6f219196a8528f9ec904d9d45cdad692d65b0e57e72be4dedd1c5fddce36" +dependencies = [ + "aead 0.6.0-rc.10", + "aes 0.9.0", + "aes-gcm 0.11.0-rc.3", + "cbc 0.2.0", + "chacha20 0.10.0", + "cipher 0.5.2", + "ctr 0.10.0", + "ctutils", + "des", + "poly1305 0.9.0", + "ssh-encoding 0.3.0-rc.9", + "zeroize", +] + [[package]] name = "ssh-encoding" version = "0.2.0" @@ -5564,18 +5634,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" dependencies = [ "base64ct", - "bytes", "pem-rfc7468 0.7.0", "sha2 0.10.9", ] +[[package]] +name = "ssh-encoding" +version = "0.3.0-rc.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abf34aa716da5d5b4c496936d042ea282ab392092cd68a72ef6a8863ff8c96a" +dependencies = [ + "base64ct", + "bytes", + "crypto-bigint 0.7.3", + "ctutils", + "digest 0.11.3", + "pem-rfc7468 1.0.0", + "zeroize", +] + [[package]] name = "ssh-key" version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3" dependencies = [ - "bcrypt-pbkdf", + "bcrypt-pbkdf 0.10.0", "ed25519-dalek 2.2.0", "num-bigint-dig", "p256 0.13.2", @@ -5586,12 +5670,38 @@ dependencies = [ "sec1 0.7.3", "sha2 0.10.9", "signature 2.2.0", - "ssh-cipher", - "ssh-encoding", + "ssh-cipher 0.2.0", + "ssh-encoding 0.2.0", "subtle", "zeroize", ] +[[package]] +name = "ssh-key" +version = "0.7.0-rc.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45735ce3dea95690e4a9e414c4cfde7f79835063c3dcd35881df85a84118e74b" +dependencies = [ + "argon2 0.6.0-rc.8", + "bcrypt-pbkdf 0.11.0", + "ctutils", + "ed25519-dalek 3.0.0-pre.7", + "hex", + "hmac 0.13.0", + "p256 0.14.0-rc.9", + "p384 0.14.0-rc.9", + "p521 0.14.0-rc.9", + "rand_core 0.10.1", + "rsa 0.10.0-rc.18", + "sec1 0.8.1", + "sha1", + "sha2 0.11.0", + "signature 3.0.0", + "ssh-cipher 0.3.0-rc.9", + "ssh-encoding 0.3.0-rc.9", + "zeroize", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -5766,9 +5876,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", @@ -6114,7 +6224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -6281,6 +6391,7 @@ dependencies = [ "bytes", "futures-core", "futures-sink", + "futures-util", "pin-project-lite", "tokio", ] @@ -6699,7 +6810,7 @@ dependencies = [ "serde_json", "serialport", "sha2 0.10.9", - "ssh-key", + "ssh-key 0.6.7", "sysinfo", "tauri", "tauri-build", @@ -6720,7 +6831,7 @@ dependencies = [ name = "voltius-crypto" version = "0.4.0" dependencies = [ - "argon2", + "argon2 0.5.3", "base64 0.22.1", "chacha20poly1305", "hkdf 0.12.4", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 214f6d4..6fdbd81 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -24,8 +24,8 @@ tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "fs", " uuid = { version = "1", features = ["v4"] } chrono = { version = "0.4", features = ["serde"] } dirs = "6" -russh = "0.60" -russh-sftp = "2.1" +russh = "0.61" +russh-sftp = "2.3" tokio-util = { version = "0.7", default-features = false } tauri-plugin-dialog = "2" async-trait = "0.1"