From 7e24b0429f75e81d02e8c02884c060c87e6d98c5 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 19 Jan 2026 11:35:15 -0800 Subject: [PATCH] bump dependencies to latest pre-releases Signed-off-by: Arthur Gautier --- Cargo.lock | 976 ++++++++++++------ Cargo.toml | 22 +- tests/roundtrip/expected/fixtures.rs | 17 +- .../expected/req_parse_certificates.rs | 43 +- 4 files changed, 703 insertions(+), 355 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c7f67f..d2053a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,30 +19,32 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" -version = "0.5.2" +version = "0.6.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +checksum = "67a578e7d4edaef88aeb9cdd81556f4a62266ce26601317c006a79e8bc58b5af" dependencies = [ - "crypto-common", - "generic-array", + "bytes", + "crypto-common 0.2.0-rc.11", + "inout", ] [[package]] name = "aes" -version = "0.8.4" +version = "0.9.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "fd9e1c818b25efb32214df89b0ec22f01aa397aaeb718d1022bf0635a3bfd1a8" dependencies = [ "cfg-if", "cipher", "cpufeatures", + "zeroize", ] [[package]] name = "aes-gcm" -version = "0.10.3" +version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +checksum = "7f5c07f414d7dc0755870f84c7900425360288d24e0eae4836f9dee19a30fa5f" dependencies = [ "aead", "aes", @@ -50,6 +52,17 @@ dependencies = [ "ctr", "ghash", "subtle", + "zeroize", +] + +[[package]] +name = "aes-kw" +version = "0.3.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02eaa2d54d0fad0116e4b1efb65803ea0bf059ce970a67cd49718d87e807cb51" +dependencies = [ + "aes", + "const-oid", ] [[package]] @@ -133,14 +146,15 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "argon2" -version = "0.5.3" +version = "0.6.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +checksum = "39b5afeb474438603309cd6e638f6baff5b8f4eb4605d63c761516712e044e5c" dependencies = [ "base64ct", "blake2", "cpufeatures", "password-hash", + "zeroize", ] [[package]] @@ -197,9 +211,9 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.2.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +checksum = "fd307490d624467aa6f74b0eabb77633d1f758a7b25f12bceb0b22e08d9726f6" [[package]] name = "base64" @@ -209,15 +223,30 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + +[[package]] +name = "bitfields" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "d866f92dc1574aa8da443eacb06ad8fbe4056dbc1b7c3aae508cbccd46c7e706" +dependencies = [ + "bitfields-impl", +] [[package]] -name = "bitfield" -version = "0.14.0" +name = "bitfields-impl" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" +checksum = "c09459e6af3016ea58af8332e31d5da117d33a621bad7019355eefccc4a567d4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "thiserror 2.0.18", +] [[package]] name = "bitflags" @@ -227,11 +256,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2" -version = "0.10.6" +version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +checksum = "679065eb2b85a078ace42411e657bef3a6afe93a40d1b9cb04e39ca303cc3f36" dependencies = [ - "digest", + "digest 0.11.0-rc.7", ] [[package]] @@ -244,32 +273,32 @@ dependencies = [ ] [[package]] -name = "block-padding" -version = "0.3.3" +name = "block-buffer" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +checksum = "96eb4cdd6cf1b31d671e9efe75c5d1ec614776856cefbe109ca373554a6d514f" dependencies = [ - "generic-array", + "hybrid-array", + "zeroize", ] [[package]] -name = "blowfish" -version = "0.9.1" +name = "block-padding" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +checksum = "710f1dd022ef4e93f8a438b4ba958de7f64308434fa6a87104481645cc30068b" dependencies = [ - "byteorder", - "cipher", + "hybrid-array", ] [[package]] -name = "bstr" -version = "1.10.0" +name = "blowfish" +version = "0.10.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "8ecfb049d43f70154a8a232d709710dc7350bda1fa7d0e539a252f0938adad8e" dependencies = [ - "memchr", - "serde", + "byteorder", + "cipher", ] [[package]] @@ -295,15 +324,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" + +[[package]] +name = "bzip2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" +dependencies = [ + "libbz2-rs-sys", +] [[package]] name = "camellia" -version = "0.1.0" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" +checksum = "1990a33d1b30b126cad2c46751fe4e8b1537fa44740b2225fbce3f41a0a902e1" dependencies = [ "byteorder", "cipher", @@ -315,7 +353,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd3ee3a298842065dc489180c34a4fe4bbbb8643bb422009d79558a099fb42e5" dependencies = [ - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -332,9 +370,9 @@ dependencies = [ [[package]] name = "cast5" -version = "0.11.1" +version = "0.12.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911" +checksum = "9599f459272594c70731c77b2b44d7a00223fee19b1fb6f21b14e07c8db5f651" dependencies = [ "cipher", ] @@ -352,9 +390,9 @@ dependencies = [ [[package]] name = "cfb-mode" -version = "0.8.2" +version = "0.9.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" +checksum = "d3cc156b68fbd681bbd460ad975e12be2946d649c3346e26d0df369e7878a50b" dependencies = [ "cipher", ] @@ -365,6 +403,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chacha20" +version = "0.10.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31cd65b2ca03198c223cd9a8fa1152c4ec251cd79049f6dc584152ad3fb5ba9d" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "rand_core 0.10.0-rc-5", + "zeroize", +] + [[package]] name = "chrono" version = "0.4.38" @@ -381,12 +432,14 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.4" +version = "0.5.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "b557bad79bc426785757001b5d732f323ae965363983d758295c1a1935496880" dependencies = [ - "crypto-common", + "block-buffer 0.11.0", + "crypto-common 0.2.0-rc.11", "inout", + "zeroize", ] [[package]] @@ -431,15 +484,21 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmac" -version = "0.7.2" +version = "0.8.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" +checksum = "a4f22bad4cbf035f087384fa49d3c5d105af29801fe3d04831a737a982d67cd0" dependencies = [ "cipher", "dbl", - "digest", + "digest 0.11.0-rc.7", ] +[[package]] +name = "cmov" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1888fb431ee159b513b5c2f249e03f1c9d788f7bd842927619dbeb88764039" + [[package]] name = "colorchoice" version = "1.0.2" @@ -448,9 +507,9 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "const-oid" -version = "0.9.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] name = "const-str" @@ -458,6 +517,15 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -466,9 +534,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -490,12 +558,16 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.5" +version = "0.7.0-rc.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +checksum = "f9f9a78b88bb8255ec59a81423aa92ada22f96883f9ae59dcb68613907636ae5" dependencies = [ - "generic-array", - "rand_core", + "ctutils", + "getrandom 0.4.0-rc.0", + "hybrid-array", + "num-traits", + "rand_core 0.10.0-rc-5", + "serdect", "subtle", "zeroize", ] @@ -507,29 +579,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.0-rc.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2bcc93d5cde6659e8649fc412894417ebc14dee54cfc6ee439c683a4a58342" +dependencies = [ + "getrandom 0.4.0-rc.0", + "hybrid-array", + "rand_core 0.10.0-rc-5", +] + +[[package]] +name = "crypto-primes" +version = "0.7.0-pre.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6372ba15f988d7cd77e9cfbc42b269601c006f2f16a21a72b886136caf04bfb" +dependencies = [ + "crypto-bigint", + "libm", + "rand_core 0.10.0-rc-5", +] + [[package]] name = "ctr" -version = "0.9.2" +version = "0.10.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "3d0ec605a95e78815a4c4b8040217d56d5a1ab37043851ee9e7e65b89afa00e3" dependencies = [ "cipher", ] +[[package]] +name = "ctutils" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1005a6d4446f5120ef475ad3d2af2b30c49c2c9c6904258e3bb30219bebed5e4" +dependencies = [ + "cmov", + "subtle", +] + [[package]] name = "curve25519-dalek" -version = "4.1.3" +version = "5.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +checksum = "6ae8b2fe5e4995d7fd08a7604e794dc569a65ed19659f5939d529813ed816d38" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest", + "digest 0.11.0-rc.7", "fiat-crypto", "rustc_version", "subtle", @@ -584,18 +687,18 @@ dependencies = [ [[package]] name = "dbl" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" +checksum = "f0d7a944e61df464668c5f51f56cc667396a8821434273112948ea0b66e405d7" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] name = "der" -version = "0.7.9" +version = "0.8.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "02c1d73e9668ea6b6a28172aa55f3ebec38507131ce179051c8033b5c6037653" dependencies = [ "const-oid", "pem-rfc7468", @@ -633,11 +736,34 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_more" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", + "unicode-xid", +] + [[package]] name = "des" -version = "0.8.1" +version = "0.9.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +checksum = "512ca722eff02fa73c43e5136f440c46f861d41f9dd7761c1f2817a5ca5d9ad7" dependencies = [ "cipher", ] @@ -648,9 +774,19 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", + "crypto-common 0.1.6", +] + +[[package]] +name = "digest" +version = "0.11.0-rc.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca14c221bd9052fd2da7c34a2eeb5ae54732db28be47c35937be71793d675422" +dependencies = [ + "block-buffer 0.11.0", "const-oid", - "crypto-common", + "crypto-common 0.2.0-rc.11", "subtle", ] @@ -662,25 +798,26 @@ checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" [[package]] name = "dsa" -version = "0.6.3" +version = "0.7.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" +checksum = "36a030a6dd3dda21116e2c7b41f13bf07e5c6e147c966ac82ec78d0f0aa0d7ae" dependencies = [ - "digest", - "num-bigint-dig", - "num-traits", + "crypto-bigint", + "crypto-primes", + "der", + "digest 0.11.0-rc.7", "pkcs8", "rfc6979", - "sha2", + "sha2 0.11.0-rc.3", "signature", "zeroize", ] [[package]] name = "eax" -version = "0.5.0" +version = "0.6.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28" +checksum = "f94e6301f354c5516bc3c2d4106353e7e4169a6f12e078e8d91e8f5172c2a044" dependencies = [ "aead", "cipher", @@ -691,23 +828,24 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.9" +version = "0.17.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +checksum = "9b41c78c24288ec2644aeb00ebc58bf8cd5ff7e9a6e2a2081ed80fa7e1262dc7" dependencies = [ "der", - "digest", + "digest 0.11.0-rc.7", "elliptic-curve", "rfc6979", "signature", "spki", + "zeroize", ] [[package]] name = "ed25519" -version = "2.2.3" +version = "3.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +checksum = "594435fe09e345ee388e4e8422072ff7dfeca8729389fbd997b3f5504c44cd47" dependencies = [ "pkcs8", "signature", @@ -715,34 +853,63 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "3.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "a4b9f613e0c236c699bf70d39f825594d9b03aadfd8dd856ea40685f782a4ef2" dependencies = [ "curve25519-dalek", "ed25519", + "rand_core 0.10.0-rc-5", "serde", - "sha2", + "sha2 0.11.0-rc.3", + "signature", "subtle", "zeroize", ] +[[package]] +name = "ed448" +version = "0.5.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca586ed223f9d5ecdfe636576d2d284fd26ddfbfb8b5289b527c736293c7926" +dependencies = [ + "signature", +] + +[[package]] +name = "ed448-goldilocks" +version = "0.14.0-pre.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "880a3baacbc794656ce9cdeb61f112183796fe96716918cabd9d6ba091451918" +dependencies = [ + "ed448", + "elliptic-curve", + "hash2curve", + "rand_core 0.10.0-rc-5", + "sha3", + "signature", + "subtle", +] + [[package]] name = "elliptic-curve" -version = "0.13.8" +version = "0.14.0-rc.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +checksum = "660a2eb4d46d49d4c0b122a8cad1fa7926b0e3e99913796243a7dc280021eadc" dependencies = [ "base16ct", "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", + "crypto-common 0.2.0-rc.11", + "digest 0.11.0-rc.7", + "getrandom 0.4.0-rc.0", "hkdf", + "hybrid-array", + "once_cell", "pem-rfc7468", "pkcs8", - "rand_core", + "rand_core 0.10.0-rc-5", + "rustcrypto-ff", + "rustcrypto-group", "sec1", "subtle", "zeroize", @@ -783,30 +950,21 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - [[package]] name = "fiat-crypto" -version = "0.2.9" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" [[package]] name = "flate2" -version = "1.0.33" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" dependencies = [ "crc32fast", "miniz_oxide", + "zlib-rs", ] [[package]] @@ -918,7 +1076,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -932,13 +1089,25 @@ dependencies = [ "wasi", ] +[[package]] +name = "getrandom" +version = "0.4.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b99f0d993a2b9b97b9a201193aa8ad21305cde06a3be9a7e1f8f4201e5cc27e" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "rand_core 0.10.0-rc-5", + "wasip2", +] + [[package]] name = "ghash" -version = "0.5.1" +version = "0.6.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +checksum = "333de57ed9494a40df4bbb866752b100819dde0d18f2264c48f5a08a85fe673d" dependencies = [ - "opaque-debug", "polyval", ] @@ -955,14 +1124,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "group" -version = "0.13.0" +name = "hash2curve" +version = "0.14.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "7dc5c1f05f9656263c30115f51eb325523721bee262db772f3dbca617bfe16f7" dependencies = [ - "ff", - "rand_core", - "subtle", + "digest 0.11.0-rc.7", + "elliptic-curve", ] [[package]] @@ -1003,20 +1171,20 @@ checksum = "5491a308e0214554f07a81d8944abe45f552871c12e3c3c6e7e5d354039a6c4c" [[package]] name = "hkdf" -version = "0.12.4" +version = "0.13.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "cfbb4225acf2b5cc4e12d384672cd6d1f0cb980ff5859ffcf144db25b593a24d" dependencies = [ "hmac", ] [[package]] name = "hmac" -version = "0.12.1" +version = "0.13.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "f1c597ac7d6cc8143e30e83ef70915e7f883b18d8bec2e2b2bce47f5bbb06d57" dependencies = [ - "digest", + "digest 0.11.0-rc.7", ] [[package]] @@ -1025,6 +1193,17 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hybrid-array" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f471e0a81b2f90ffc0cb2f951ae04da57de8baa46fa99112b062a5173a5088d0" +dependencies = [ + "subtle", + "typenum", + "zeroize", +] + [[package]] name = "iana-time-zone" version = "0.1.61" @@ -1050,9 +1229,9 @@ dependencies = [ [[package]] name = "idea" -version = "0.5.1" +version = "0.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075557004419d7f2031b8bb7f44bb43e55a83ca7b63076a8fb8fe75753836477" +checksum = "35385e4a175083ee229aad133ff79bf34fed325f863fc1a7c4d05324c050ff71" dependencies = [ "cipher", ] @@ -1075,11 +1254,11 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -1110,12 +1289,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "iter-read" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071ed4cc1afd86650602c7b11aa2e1ce30762a1c27193201cb5cee9c6ebb1294" - [[package]] name = "jobserver" version = "0.1.32" @@ -1136,35 +1309,30 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.3" +version = "0.14.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "3cbe701413868feb2738cda41501dbfa923feede3a8609a2c4ddfa2f86638d5d" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", - "once_cell", - "sha2", - "signature", + "sha2 0.11.0-rc.3", ] [[package]] name = "keccak" -version = "0.1.5" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "3d546793a04a1d3049bd192856f804cfe96356e2cf36b54b4e575155babe9f41" dependencies = [ "cpufeatures", ] [[package]] -name = "lazy_static" -version = "1.5.0" +name = "libbz2-rs-sys" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" @@ -1185,9 +1353,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "log" @@ -1197,12 +1365,12 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "md-5" -version = "0.10.6" +version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +checksum = "64dd2c9099caf8e29b629305199dddb1c6d981562b62c089afea54b0b4b5c333" dependencies = [ "cfg-if", - "digest", + "digest 0.11.0-rc.7", ] [[package]] @@ -1219,11 +1387,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -1249,41 +1418,12 @@ dependencies = [ ] [[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" +name = "nom" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" dependencies = [ - "autocfg", - "num-integer", - "num-traits", + "memchr", ] [[package]] @@ -1293,7 +1433,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1328,27 +1467,22 @@ dependencies = [ [[package]] name = "ocb3" -version = "0.1.0" +version = "0.2.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb" +checksum = "3e852b354160a7b76c609c16702662f33e25aa9511ecb0981deaedffc8447c1f" dependencies = [ "aead", "cipher", "ctr", + "dbl", "subtle", ] [[package]] name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.1" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openpgp-card" @@ -1360,59 +1494,60 @@ dependencies = [ "chrono", "hex-slice", "log", - "nom", + "nom 7.1.3", "secrecy", - "sha2", - "thiserror", + "sha2 0.10.8", + "thiserror 1.0.63", ] [[package]] name = "p256" -version = "0.13.2" +version = "0.14.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +checksum = "a23920bdbd723052dc68186e64d2c8c2a3b2998b42d61df716f67ef771ce358b" dependencies = [ "ecdsa", "elliptic-curve", + "primefield", "primeorder", - "sha2", + "sha2 0.11.0-rc.3", ] [[package]] name = "p384" -version = "0.13.0" +version = "0.14.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +checksum = "bc8a851b7eed8bfcd741f5dc17c3446eaf8031fa109003fb68f715252cfd4bc9" dependencies = [ "ecdsa", "elliptic-curve", + "fiat-crypto", + "primefield", "primeorder", - "sha2", + "sha2 0.11.0-rc.3", ] [[package]] name = "p521" -version = "0.13.3" +version = "0.14.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +checksum = "5121b1f72223718c1ada46b27c60541e6d2d0f886f7526083aa32c2c23d6686e" dependencies = [ "base16ct", "ecdsa", "elliptic-curve", + "primefield", "primeorder", - "rand_core", - "sha2", + "sha2 0.11.0-rc.3", ] [[package]] name = "password-hash" -version = "0.5.0" +version = "0.6.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +checksum = "80b7795f59c339f0458e0213b31e01f45de7f061bdfc52857386f457d94c2cb8" dependencies = [ - "base64ct", - "rand_core", - "subtle", + "phc", ] [[package]] @@ -1436,77 +1571,91 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.7.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9" dependencies = [ "base64ct", ] [[package]] name = "pgp" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6c842436d5fa2b59eac1e9b3d142b50bfff99c1744c816b1f4c2ac55a20754" +version = "0.18.0" +source = "git+https://github.com/baloo/rpgp.git?branch=baloo/rustcrypto-new-releases#d6d8233385a9656358fe94d49b3b49b0c672eea8" dependencies = [ + "aead", "aes", "aes-gcm", + "aes-kw", "argon2", "base64", - "bitfield", + "bitfields", "block-padding", "blowfish", - "bstr", "buffer-redux", "byteorder", + "bytes", + "bzip2", "camellia", "cast5", "cfb-mode", - "chrono", "cipher", "const-oid", "crc24", + "crypto-bigint", "curve25519-dalek", "derive_builder", + "derive_more", "des", - "digest", + "digest 0.11.0-rc.7", "dsa", "eax", "ecdsa", "ed25519-dalek", + "ed448-goldilocks", "elliptic-curve", "flate2", - "generic-array", "hex", "hkdf", + "hybrid-array", "idea", - "iter-read", "k256", "log", "md-5", - "nom", - "num-bigint-dig", - "num-traits", + "nom 8.0.0", "num_enum", "ocb3", "p256", "p384", "p521", - "rand", + "rand 0.10.0-rc.7", + "regex", + "replace_with", "ripemd", "rsa", "sha1", "sha1-checked", - "sha2", + "sha2 0.11.0-rc.3", "sha3", "signature", "smallvec", - "thiserror", + "snafu", "twofish", "x25519-dalek", + "x448", "zeroize", ] +[[package]] +name = "phc" +version = "0.6.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d390c5fe8d102c2c18ff39f1e72b9ad5996de282c2d831b0312f56910f5508" +dependencies = [ + "base64ct", + "subtle", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -1521,20 +1670,19 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.7.5" +version = "0.8.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e" dependencies = [ "der", - "pkcs8", "spki", ] [[package]] name = "pkcs8" -version = "0.10.2" +version = "0.11.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +checksum = "80f8fa6196ede5a9f9ee95b44ca134bddc9b70e8913f9297bd58c909f5889a09" dependencies = [ "der", "spki", @@ -1546,15 +1694,25 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "poly1305" +version = "0.9.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c0749ae91cfe6e68c77c4d48802d9720ee06aed3f7100a38975fb0962d50bc" +dependencies = [ + "cpufeatures", + "universal-hash", + "zeroize", +] + [[package]] name = "polyval" -version = "0.6.2" +version = "0.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +checksum = "1ad60831c19edda4b20878a676595c357e93a9b4e6dca2ba98d75b01066b317b" dependencies = [ "cfg-if", "cpufeatures", - "opaque-debug", "universal-hash", ] @@ -1567,11 +1725,25 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "primefield" +version = "0.14.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90de6476b10bedc43e91337d44440bec88d9c253a1676a046438ba3f5b1d81e" +dependencies = [ + "crypto-bigint", + "crypto-common 0.2.0-rc.11", + "rand_core 0.10.0-rc-5", + "rustcrypto-ff", + "subtle", + "zeroize", +] + [[package]] name = "primeorder" -version = "0.13.6" +version = "0.14.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +checksum = "e77e56adc743d5601fe3a8534fc7c25a28fbbb7470a4f13700e8fdc6817d3a0a" dependencies = [ "elliptic-curve", ] @@ -1587,22 +1759,28 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.8.5" @@ -1611,7 +1789,18 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.10.0-rc.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d3e6a909ceda8ceb12ef039b675ecf4bbe6def127e773cac109ab8347633766" +dependencies = [ + "chacha20", + "getrandom 0.4.0-rc.0", + "rand_core 0.10.0-rc-5", ] [[package]] @@ -1621,7 +1810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1630,9 +1819,15 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.10.0-rc-5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05a06e03bd1f2ae861ab9e7498b6c64ed3dadb9ce175c0464a2522a5f23c0045" + [[package]] name = "raunch" version = "1.0.1" @@ -1683,6 +1878,12 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" +[[package]] +name = "replace_with" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51743d3e274e2b18df81c4dc6caf8a5b8e15dbe799e0dca05c7617380094e884" + [[package]] name = "retainer" version = "0.3.0" @@ -1692,14 +1893,14 @@ dependencies = [ "async-lock", "async-timer", "log", - "rand", + "rand 0.8.5", ] [[package]] name = "rfc6979" -version = "0.4.0" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +checksum = "63b8e2323084c987a72875b2fd682b7307d5cf14d47e3875bb5e89948e8809d4" dependencies = [ "hmac", "subtle", @@ -1707,32 +1908,30 @@ dependencies = [ [[package]] name = "ripemd" -version = "0.1.3" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +checksum = "1fc804eb044d044dcfa77f973ace1f4faa1084f130d9a7ec49c274ce47afda67" dependencies = [ - "digest", + "digest 0.11.0-rc.7", ] [[package]] name = "rsa" -version = "0.9.6" +version = "0.10.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "8ff85dd219e338d42a2eada54ad71fe515717e08d53f728a8803de33b83f80b8" dependencies = [ "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", + "crypto-bigint", + "crypto-primes", + "digest 0.11.0-rc.7", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.10.0-rc-5", "sha1", - "sha2", + "sha2 0.11.0-rc.3", "signature", "spki", - "subtle", "zeroize", ] @@ -1781,16 +1980,37 @@ dependencies = [ "semver", ] +[[package]] +name = "rustcrypto-ff" +version = "0.14.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9cd37111549306f79b09aa2618e15b1e8241b7178c286821e3dd71579db4db" +dependencies = [ + "rand_core 0.10.0-rc-5", + "subtle", +] + +[[package]] +name = "rustcrypto-group" +version = "0.14.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e394cd734b5f97dfc3484fa42aad7acd912961c2bcd96c99aa05b3d6cab7cafd" +dependencies = [ + "rand_core 0.10.0-rc-5", + "rustcrypto-ff", + "subtle", +] + [[package]] name = "sec1" -version = "0.7.3" +version = "0.8.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +checksum = "5b54617aeb7e34ace1a4b72ba79bb6297e48285dc0cce064dc063ddcbf538996" dependencies = [ "base16ct", + "ctutils", "der", - "generic-array", - "pkcs8", + "hybrid-array", "subtle", "zeroize", ] @@ -1830,6 +2050,16 @@ dependencies = [ "syn", ] +[[package]] +name = "serdect" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af4a3e75ebd5599b30d4de5768e00b5095d518a79fefc3ecbaf77e665d1ec06" +dependencies = [ + "base16ct", + "serde", +] + [[package]] name = "service-binding" version = "3.0.0" @@ -1841,23 +2071,24 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "aa1ae819b9870cadc959a052363de870944a1646932d274a4e270f64bf79e5ef" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.11.0-rc.7", ] [[package]] name = "sha1-checked" -version = "0.10.0" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" +checksum = "791ea67ee2842fadd3df7482d5dcd572968573f7c2359adf2328b8d4c271de49" dependencies = [ - "digest", + "digest 0.11.0-rc.7", "sha1", + "zeroize", ] [[package]] @@ -1868,16 +2099,27 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.11.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d43dc0354d88b791216bb5c1bfbb60c0814460cc653ae0ebd71f286d0bd927" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.11.0-rc.7", ] [[package]] name = "sha3" -version = "0.10.8" +version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "2103ca0e6f4e9505eae906de5e5883e06fc3b2232fb5d6914890c7bbcb62f478" dependencies = [ - "digest", + "digest 0.11.0-rc.7", "keccak", ] @@ -1889,14 +2131,20 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signature" -version = "2.2.0" +version = "3.0.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +checksum = "c04b70a14ee5f15e2e0c785a5fdb2e9a51138dfe13ba3cf8eab037a9e60b1879" dependencies = [ - "digest", - "rand_core", + "digest 0.11.0-rc.7", + "rand_core 0.10.0-rc-5", ] +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + [[package]] name = "slab" version = "0.4.9" @@ -1912,6 +2160,27 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "snafu" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "socket2" version = "0.5.7" @@ -1922,17 +2191,11 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spki" -version = "0.7.3" +version = "0.8.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +checksum = "8baeff88f34ed0691978ec34440140e1572b68c7dd4a495fd14a3dc1944daa80" dependencies = [ "base64ct", "der", @@ -1956,7 +2219,7 @@ dependencies = [ "openpgp-card", "p256", "pgp", - "rand", + "rand 0.10.0-rc.7", "retainer", "rsa", "rstest", @@ -1964,11 +2227,11 @@ dependencies = [ "service-binding", "sha1", "signature", - "ssh-encoding", + "ssh-encoding 0.3.0-rc.4", "ssh-key", "subtle", "testresult", - "thiserror", + "thiserror 1.0.63", "tokio", "tokio-util", ] @@ -1979,17 +2242,23 @@ version = "0.5.1" dependencies = [ "libfuzzer-sys", "ssh-agent-lib", - "ssh-encoding", + "ssh-encoding 0.2.0", ] [[package]] name = "ssh-cipher" -version = "0.2.0" +version = "0.3.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f" +checksum = "88ca7fe5fcf2f30c6fcbad76c65c0aef40a09087ef9092eae072383c7d959200" dependencies = [ + "aes", + "aes-gcm", + "chacha20", "cipher", - "ssh-encoding", + "des", + "poly1305", + "ssh-encoding 0.3.0-rc.4", + "zeroize", ] [[package]] @@ -1997,30 +2266,37 @@ name = "ssh-encoding" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" + +[[package]] +name = "ssh-encoding" +version = "0.3.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25a544d1b898f016dd32083ec3a926a5bff0deb6e43c691db6eb39fa11b7c9e" dependencies = [ "base64ct", + "crypto-bigint", + "digest 0.11.0-rc.7", "pem-rfc7468", - "sha2", + "subtle", + "zeroize", ] [[package]] name = "ssh-key" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc" +version = "0.7.0-rc.6" +source = "git+https://github.com/RustCrypto/SSH.git#f79b8a4e3dc2a4717eb502cb5125b6c4caf6702e" dependencies = [ "ed25519-dalek", - "num-bigint-dig", "p256", "p384", "p521", - "rand_core", + "rand_core 0.10.0-rc-5", "rsa", "sec1", - "sha2", + "sha2 0.11.0-rc.3", "signature", "ssh-cipher", - "ssh-encoding", + "ssh-encoding 0.3.0-rc.4", "subtle", "zeroize", ] @@ -2039,9 +2315,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -2060,7 +2336,16 @@ version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.63", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] @@ -2074,6 +2359,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio" version = "1.40.0" @@ -2132,9 +2428,9 @@ dependencies = [ [[package]] name = "twofish" -version = "0.7.1" +version = "0.8.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013" +checksum = "847ec0c7ed00904725b2b3f997137890126aef984f8a644d10b153a1fea468f5" dependencies = [ "cipher", ] @@ -2151,13 +2447,25 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" -version = "0.5.1" +version = "0.6.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +checksum = "0386f227888b17b65d3e38219a7d41185035471300855c285667811907bb1677" dependencies = [ - "crypto-common", + "crypto-common 0.2.0-rc.11", "subtle", ] @@ -2185,6 +2493,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasip2" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.93" @@ -2359,15 +2676,30 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" + [[package]] name = "x25519-dalek" -version = "2.0.1" +version = "3.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +checksum = "a5887899407ca8fb861126d509bb08465c14a9c60fad1f24c59ed59630a45586" dependencies = [ "curve25519-dalek", - "rand_core", - "serde", + "rand_core 0.10.0-rc-5", + "zeroize", +] + +[[package]] +name = "x448" +version = "0.14.0-pre.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0bf18d639e7f50ad96f4f05628b2b31881881bf89ef3610b0502316683f74fa" +dependencies = [ + "ed448-goldilocks", "zeroize", ] @@ -2411,3 +2743,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zlib-rs" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3" diff --git a/Cargo.toml b/Cargo.toml index 92238f7..652b91e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,11 @@ log = { version = "0.4", optional = true } tokio = { version = "1", optional = true, features = ["rt", "net", "time"] } tokio-util = { version = "0.7", optional = true, features = ["codec"] } service-binding = { version = "^3", optional = true } -ssh-encoding = { version = "0.2" } -ssh-key = { version = "0.6", features = ["crypto", "alloc"] } +ssh-encoding = { version = "0.3.0-rc.4" } +ssh-key = { version = "0.7.0-rc.6", features = ["crypto", "alloc"] } thiserror = "1" subtle = { version = "2", default-features = false } -signature = { version = "2", features = ["alloc"] } +signature = { version = "3.0.0-rc.6", features = ["alloc"] } secrecy = "0.8" [features] @@ -40,14 +40,14 @@ agent = ["futures", "log", "tokio", "async-trait", "codec", "service-binding"] [dev-dependencies] env_logger = "0.11.5" -rand = "0.8.5" -rsa = { version = "0.9.6", features = ["sha2", "sha1"] } +rand = "0.10.0-rc.7" +rsa = { version = "0.10.0-rc.13", features = ["sha2", "sha1"] } tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync"] } -sha1 = { version = "0.10.6", default-features = false, features = ["oid"] } +sha1 = { version = "0.11.0-rc.3", default-features = false, features = ["oid"] } testresult = "0.4.1" hex-literal = "0.4.1" -ssh-key = { version = "0.6.6", features = ["p256", "rsa"] } -p256 = { version = "0.13.2" } +ssh-key = { version = "0.7.0-rc.6", features = ["p256", "rsa"] } +p256 = { version = "0.14.0-rc.5" } const-str = "0.5.7" rstest = "0.22.0" openpgp-card = "0.5.0" @@ -55,6 +55,10 @@ card-backend-pcsc = "0.5.0" clap = { version = "4.5.17", features = ["derive"] } secrecy = "0.8.0" retainer = "0.3.0" -pgp = "0.13.2" +pgp = "0.18.0" chrono = "0.4.38" interprocess = "2.2.1" + +[patch.crates-io] +ssh-key = { git = "https://github.com/RustCrypto/SSH.git" } +pgp = { git = "https://github.com/baloo/rpgp.git", branch = "baloo/rustcrypto-new-releases" } diff --git a/tests/roundtrip/expected/fixtures.rs b/tests/roundtrip/expected/fixtures.rs index f994be2..14d475e 100644 --- a/tests/roundtrip/expected/fixtures.rs +++ b/tests/roundtrip/expected/fixtures.rs @@ -20,15 +20,18 @@ pub fn demo_key() -> EcdsaKeypair { .into(), false, ), - private: EcdsaPrivateKey::from(p256::SecretKey::new( - p256::elliptic_curve::ScalarPrimitive::new( - p256::elliptic_curve::bigint::Uint::from_be_slice(&hex!( - "ffd9f2ce4d0ee5870d8dc7cf771a7669" - "a0b96fe44bb58a8a0bc75a76b4f78240" - )), + private: EcdsaPrivateKey::from( + p256::SecretKey::from_scalar( + p256::elliptic_curve::ScalarValue::new( + p256::elliptic_curve::bigint::Uint::from_be_slice(&hex!( + "ffd9f2ce4d0ee5870d8dc7cf771a7669" + "a0b96fe44bb58a8a0bc75a76b4f78240" + )), + ) + .unwrap(), ) .unwrap(), - )), + ), } } diff --git a/tests/roundtrip/expected/req_parse_certificates.rs b/tests/roundtrip/expected/req_parse_certificates.rs index b7913ad..c5af12c 100644 --- a/tests/roundtrip/expected/req_parse_certificates.rs +++ b/tests/roundtrip/expected/req_parse_certificates.rs @@ -1,8 +1,8 @@ use hex_literal::hex; -use ssh_agent_lib::proto::{AddIdentity, AddIdentityConstrained, Credential, KeyConstraint, PrivateKeyData, Request,}; -use ssh_key::{ - private::RsaPrivateKey, Algorithm, Mpint +use ssh_agent_lib::proto::{ + AddIdentity, AddIdentityConstrained, Credential, KeyConstraint, PrivateKeyData, Request, }; +use ssh_key::{private::RsaPrivateKey, Algorithm, Mpint}; use super::fixtures; @@ -12,9 +12,10 @@ pub fn expected() -> Request { credential: Credential::Cert { algorithm: Algorithm::new("ssh-rsa").unwrap(), certificate: fixtures::demo_certificate(), - privkey: PrivateKeyData::Rsa(RsaPrivateKey { - d: Mpint::from_bytes(&hex!( - " + privkey: PrivateKeyData::Rsa( + RsaPrivateKey::new( + Mpint::from_bytes(&hex!( + " 063980B05C8B42329056DE1F025EB78D 68FDF1B2631811302C75913B86E81B28 8C975E6BFF04CF464705A2CE23DE7085 C2FF79E75CFEFD393F4B0420253B5526 9F9307CC627B8AC6579C5FB3DBF9C5C3 9658A28557E83132419A98491EF0AAE3 @@ -28,10 +29,10 @@ pub fn expected() -> Request { 3D1E3645C6B7E4D8E4D95FE3B74E34FE 3E37C53D026BE9C19643AB4014BB82EF 922208AF68435BDC89BDBE0518655BB3 EA28078BEBB7BDE88FF44970181BD381 " - )) - .unwrap(), - iqmp: Mpint::from_bytes(&hex!( - " + )) + .unwrap(), + Mpint::from_bytes(&hex!( + " 00E0DD19B95C563D9198F0F4E4B19677 FD17465875757DA008B93C0138FD89D7 1A1F5669D967B69814462530642A5595 DE4EE39A838AC8D38136CC2C20F7A7E6 2BBBA10146A35A2B8FBA51B70A0B1A43 B43FD26B84AE5A7D1EF7857EAB7B2301 @@ -39,10 +40,10 @@ pub fn expected() -> Request { 4395F80A228F46F3F7DD05205D453C40 4D88712D2051CFAC3A33E888A6FEA26B 332F5AC58EDFAD6A64CB16E39280AACC 607D32F90FB6FE45B21BD288FE9D4FC6 B2" - )) - .unwrap(), - p: Mpint::from_bytes(&hex!( - " + )) + .unwrap(), + Mpint::from_bytes(&hex!( + " 00FABA9137F37DC9AB8B2821CE0C444 B03F5EA6EA5059488214ECCCC02417C 601E32E923710D2DC1417BFE293502A ED390EB93E544A51FD4686B4B520E49 F559E259B9CD1C2E08E41CFB36B4979 BD5F4F6917D73AEB4A47D7CFC7114EC @@ -50,10 +51,10 @@ pub fn expected() -> Request { 8A61399001F0F9C4C440DE7A50AB1A5 5FF1BB24F3ECDBA42CA8A34A83BC76F FC5687D9093BA4EBA91723B9AE5ACDC FC650D8D95B5E8FDA85CE957075079D 2A134F4ED9B181" - )) - .unwrap(), - q: Mpint::from_bytes(&hex!( - " + )) + .unwrap(), + Mpint::from_bytes(&hex!( + " 00E4F88607532262EAF1DB3F11D0253 5C32A7506ACB9BCD2B3E9B852A71FEA 134921015399BE8830DB4000B7F33EC 3AF71B56448178BD4D3310AD322855C 80AFF5BF29FBEEBDBBB09A3F09CD5FC 017F0D004C08C3F569E4EFC15C5FA94 @@ -61,9 +62,11 @@ pub fn expected() -> Request { 0CCDBAE1D5BC781D3DC14B3A113F939 F1DA21D2031D4F37805D36FC420A728 FFBEED8E1E1DDB8D4D232DF1E02A152 965694139F38B5A60B9198C513AC733 F51F2C04164DE1" - )) + )) + .unwrap(), + ) .unwrap(), - }), + ), comment: "baloo@angela".to_string(), }, },