From 4a6a2e51ccd9d3b0f3e5111b6d873690f5787562 Mon Sep 17 00:00:00 2001 From: Manuthor Date: Fri, 16 Jan 2026 10:36:40 +0100 Subject: [PATCH 1/7] fix: support KMS 5.15 --- Cargo.lock | 2195 ++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- findex-server | 2 +- kms | 2 +- 4 files changed, 993 insertions(+), 1208 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a786b90..899e1bab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,8 +37,10 @@ dependencies = [ [[package]] name = "actix-files" version = "0.6.9" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" +checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" dependencies = [ "actix-http", "actix-service", @@ -47,6 +49,7 @@ dependencies = [ "bitflags", "bytes", "derive_more 2.1.1", + "derive_more 2.1.1", "futures-core", "http-range", "log", @@ -60,8 +63,10 @@ dependencies = [ [[package]] name = "actix-http" version = "3.11.2" +version = "3.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49" +checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49" dependencies = [ "actix-codec", "actix-rt", @@ -74,11 +79,13 @@ dependencies = [ "bytes", "bytestring", "derive_more 2.1.1", + "derive_more 2.1.1", "encoding_rs", "flate2", - "foldhash", + "foldhash 0.1.5", "futures-core", "h2 0.3.27", + "h2 0.3.27", "http 0.2.12", "httparse", "httpdate", @@ -89,6 +96,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rand 0.9.2", + "rand 0.9.2", "sha1", "smallvec", "tokio", @@ -141,8 +149,10 @@ dependencies = [ [[package]] name = "actix-rt" version = "2.11.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" +checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" dependencies = [ "actix-macros", "futures-core", @@ -196,8 +206,10 @@ dependencies = [ [[package]] name = "actix-tls" version = "3.5.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6176099de3f58fbddac916a7f8c6db297e021d706e7a6b99947785fee14abe9f" +checksum = "6176099de3f58fbddac916a7f8c6db297e021d706e7a6b99947785fee14abe9f" dependencies = [ "actix-rt", "actix-service", @@ -225,8 +237,10 @@ dependencies = [ [[package]] name = "actix-web" version = "4.12.1" +version = "4.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6" +checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6" dependencies = [ "actix-codec", "actix-http", @@ -243,8 +257,9 @@ dependencies = [ "cfg-if", "cookie", "derive_more 2.1.1", + "derive_more 2.1.1", "encoding_rs", - "foldhash", + "foldhash 0.1.5", "futures-core", "futures-util", "impl-more", @@ -261,6 +276,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2 0.6.1", + "socket2 0.6.1", "time", "tracing", "url", @@ -359,8 +375,10 @@ dependencies = [ [[package]] name = "agnostic-lite" version = "0.6.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2460d4e5c7f8d33d33655d874c80ac888bf215794769bb7dcaa67d1a56fafb56" +checksum = "2460d4e5c7f8d33d33655d874c80ac888bf215794769bb7dcaa67d1a56fafb56" dependencies = [ "async-io", "atomic-time", @@ -373,17 +391,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.16", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.12" @@ -392,6 +399,7 @@ checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom 0.3.4", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -400,8 +408,10 @@ dependencies = [ [[package]] name = "aho-corasick" version = "1.1.4" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -458,30 +468,28 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" version = "1.0.13" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anyhow" version = "1.0.100" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] -name = "arbitrary" -version = "1.4.2" +name = "arc-swap" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" dependencies = [ - "derive_arbitrary", + "rustversion", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "argon2" version = "0.5.3" @@ -494,12 +502,6 @@ dependencies = [ "password-hash", ] -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - [[package]] name = "arrayvec" version = "0.7.6" @@ -518,7 +520,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", ] @@ -547,9 +549,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85" +checksum = "9c5bcfa8749ac45dd12cb11055aeeb6b27a3895560d60d71e3c23bf979e60514" dependencies = [ "anstyle", "bstr", @@ -575,8 +577,10 @@ dependencies = [ [[package]] name = "async-executor" version = "1.13.3" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" dependencies = [ "async-task", "concurrent-queue", @@ -589,8 +593,10 @@ dependencies = [ [[package]] name = "async-fs" version = "2.2.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" +checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" dependencies = [ "async-lock", "blocking", @@ -600,9 +606,12 @@ dependencies = [ [[package]] name = "async-io" version = "2.6.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" dependencies = [ + "autocfg", "autocfg", "cfg-if", "concurrent-queue", @@ -613,14 +622,18 @@ dependencies = [ "rustix", "slab", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] name = "async-lock" version = "3.4.2" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ + "event-listener", "event-listener", "event-listener-strategy", "pin-project-lite", @@ -640,9 +653,12 @@ dependencies = [ [[package]] name = "async-process" version = "2.5.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" +checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" dependencies = [ + "async-channel", "async-channel", "async-io", "async-lock", @@ -651,6 +667,7 @@ dependencies = [ "blocking", "cfg-if", "event-listener", + "event-listener", "futures-lite", "rustix", ] @@ -669,8 +686,10 @@ dependencies = [ [[package]] name = "async-signal" version = "0.2.13" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" dependencies = [ "async-io", "async-lock", @@ -682,13 +701,14 @@ dependencies = [ "signal-hook-registry", "slab", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] name = "async-sqlite" -version = "0.4.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a86b242350ea4ff78866f8253182dd49dddb1decd4e596b918098ed250fd2" +checksum = "556a4163d701c7d3e28c89917294cea8d2a05092c92a50307c0f2d1742058ced" dependencies = [ "crossbeam-channel", "futures-channel", @@ -727,23 +747,16 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" version = "0.1.89" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atomic-time" version = "0.1.5" @@ -763,31 +776,10 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" version = "1.5.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "aws-lc-rs" -version = "1.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88aab2464f1f25453baa7a07c84c5b7684e274054ba06817f382357f77a288" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45afffdee1e7c9126814751f88dddc747f41d91da16c9551a0f1e8a11e788a1" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", -] - [[package]] name = "axum" version = "0.7.9" @@ -799,6 +791,7 @@ dependencies = [ "bytes", "futures-util", "http 1.4.0", + "http 1.4.0", "http-body", "http-body-util", "itoa", @@ -810,7 +803,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower 0.5.2", + "tower 0.5.3", "tower-layer", "tower-service", ] @@ -825,6 +818,7 @@ dependencies = [ "bytes", "futures-util", "http 1.4.0", + "http 1.4.0", "http-body", "http-body-util", "mime", @@ -838,8 +832,10 @@ dependencies = [ [[package]] name = "backon" version = "1.6.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ "fastrand", ] @@ -876,9 +872,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bincode" @@ -889,20 +885,12 @@ dependencies = [ "serde", ] -[[package]] -name = "binstring" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0669d5a35b64fdb5ab7fb19cae13148b6b5cbdf4b8247faf54ece47f699c8cef" - [[package]] name = "bitflags" version = "2.10.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" -dependencies = [ - "serde_core", -] [[package]] name = "blake2" @@ -913,17 +901,6 @@ dependencies = [ "digest", ] -[[package]] -name = "blake2b_simd" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -933,21 +910,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "blocking" version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ + "async-channel", "async-channel", "async-task", "futures-io", @@ -958,8 +927,10 @@ dependencies = [ [[package]] name = "brotli" version = "8.0.2" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -979,19 +950,32 @@ dependencies = [ [[package]] name = "bstr" version = "1.12.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", "serde", ] +[[package]] +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +dependencies = [ + "num-traits", +] + [[package]] name = "bumpalo" version = "3.19.1" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "byteorder" @@ -1002,14 +986,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" version = "1.11.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "bytestring" version = "1.5.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289" +checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289" dependencies = [ "bytes", ] @@ -1020,20 +1008,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher 0.4.4", -] - [[package]] name = "cc" -version = "1.2.50" +version = "1.2.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" +checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" dependencies = [ "find-msvc-tools", "jobserver", @@ -1044,15 +1023,10 @@ dependencies = [ [[package]] name = "cfg-if" version = "1.0.4" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "chacha20" version = "0.9.1" @@ -1079,9 +1053,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" dependencies = [ "iana-time-zone", "js-sys", @@ -1141,9 +1115,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -1151,9 +1125,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstyle", "clap_lex", @@ -1162,8 +1136,10 @@ dependencies = [ [[package]] name = "clap_derive" version = "4.5.49" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck", "proc-macro2", @@ -1173,46 +1149,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" - -[[package]] -name = "cloudproof_findex" -version = "5.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25dad7ff37557df4cb27a20d80727d75dfa2ddcbed14f02761e8bfb1f595741" -dependencies = [ - "async-trait", - "cosmian_crypto_core 9.6.0", - "cosmian_findex 5.0.3", - "redis 0.23.3", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", -] - -[[package]] -name = "cmake" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" -dependencies = [ - "cc", -] - -[[package]] -name = "coarsetime" -version = "0.1.37" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58eb270476aa4fc7843849f8a35063e8743b4dbcdf6dd0f8ea0886980c204c2" -dependencies = [ - "libc", - "wasix", - "wasm-bindgen", -] +checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" [[package]] name = "combine" @@ -1255,9 +1194,6 @@ name = "const-oid" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -dependencies = [ - "arbitrary", -] [[package]] name = "const-random" @@ -1274,17 +1210,11 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "once_cell", "tiny-keccak", ] -[[package]] -name = "constant_time_eq" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" - [[package]] name = "convert_case" version = "0.4.0" @@ -1342,7 +1272,7 @@ dependencies = [ "base64 0.22.1", "clap", "cosmian_config_utils 0.2.0", - "cosmian_findex 8.0.0", + "cosmian_findex", "cosmian_findex_cli", "cosmian_kms_cli", "cosmian_logger 0.6.0", @@ -1360,7 +1290,7 @@ dependencies = [ "strum", "tempfile", "test_kms_server", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "url", "uuid", @@ -1376,7 +1306,7 @@ dependencies = [ "base64 0.21.7", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "toml 0.8.23", "tracing", "url", @@ -1391,7 +1321,7 @@ dependencies = [ "base64 0.21.7", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "toml 0.8.23", "tracing", "url", @@ -1403,7 +1333,7 @@ version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f12eb7e96555b6b8841966fa264e7a6dfe5e39ad0733317c088c52259e99993c" dependencies = [ - "cosmian_crypto_core 10.3.0", + "cosmian_crypto_core", "ml-kem", "serde", "serde_json", @@ -1411,42 +1341,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cosmian_crypto_core" -version = "9.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1af2d1b2b48bf77eb8719f4d66c6ef80cfecbd1f82f8c6ed70945cea1323a0" -dependencies = [ - "aead", - "aes-gcm", - "blake2", - "chacha20", - "chacha20poly1305", - "crypto_box", - "curve25519-dalek", - "digest", - "ed25519-dalek", - "elliptic-curve", - "getrandom 0.2.16", - "leb128", - "p192", - "p224", - "p256", - "p384", - "pkcs8", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "rsa", - "sha1", - "sha2", - "sha3", - "signature", - "tiny-keccak", - "uuid", - "x509-cert", - "zeroize", -] - [[package]] name = "cosmian_crypto_core" version = "10.3.0" @@ -1462,7 +1356,7 @@ dependencies = [ "curve25519-dalek", "ed25519-dalek", "gensym", - "getrandom 0.2.16", + "getrandom 0.2.17", "leb128", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -1472,21 +1366,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cosmian_findex" -version = "5.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb51a6ded995165d6343c3b74d6f25191a02cbd6a2148a1403c0583a04e9e94" -dependencies = [ - "async-trait", - "base64 0.21.7", - "cosmian_crypto_core 9.6.0", - "never", - "rand 0.8.5", - "tiny-keccak", - "zeroize", -] - [[package]] name = "cosmian_findex" version = "8.0.0" @@ -1495,7 +1374,7 @@ checksum = "b0b68f0bc9f2fdcdd01cbe32e2061c0a7c670a39b66d4178f394fa108ffbcfe5" dependencies = [ "aes 0.8.4", "agnostic-lite", - "cosmian_crypto_core 10.3.0", + "cosmian_crypto_core", "cosmian_sse_memories", "criterion", "xts-mode", @@ -1509,7 +1388,7 @@ dependencies = [ "base64 0.22.1", "clap", "cosmian_config_utils 0.2.0", - "cosmian_findex 8.0.0", + "cosmian_findex", "cosmian_findex_client", "cosmian_findex_structs", "cosmian_kms_cli", @@ -1519,7 +1398,7 @@ dependencies = [ "hex", "test_findex_server", "test_kms_server", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tracing", "uuid", @@ -1530,7 +1409,7 @@ name = "cosmian_findex_client" version = "0.4.11" dependencies = [ "base64 0.22.1", - "cosmian_findex 8.0.0", + "cosmian_findex", "cosmian_findex_structs", "cosmian_http_client", "cosmian_kms_cli", @@ -1539,7 +1418,7 @@ dependencies = [ "reqwest", "serde", "test_kms_server", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tracing", "uuid", @@ -1559,22 +1438,22 @@ dependencies = [ "async-trait", "chrono", "clap", - "cosmian_crypto_core 10.3.0", - "cosmian_findex 8.0.0", + "cosmian_crypto_core", + "cosmian_findex", "cosmian_findex_structs", "cosmian_logger 0.6.0", "cosmian_sse_memories", "dotenvy", "futures", "openssl", - "redis 0.32.7", + "redis", "reqwest", "serde", "serde_json", "tempfile", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", - "toml 0.9.10+spec-1.1.0", + "toml 0.9.11+spec-1.1.0", "tracing", "url", "uuid", @@ -1586,42 +1465,42 @@ name = "cosmian_findex_structs" version = "0.4.11" dependencies = [ "base64 0.22.1", - "cosmian_crypto_core 10.3.0", - "cosmian_findex 8.0.0", + "cosmian_crypto_core", + "cosmian_findex", "cosmian_sse_memories", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "uuid", ] [[package]] name = "cosmian_http_client" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7a15e017fe822624c88ddb306907126734e9a9f495a76f3455aa97eb463b" +checksum = "44b2705be438091a343f880385c80d46ecafda93f47c95801f7cf42a54a98588" dependencies = [ "actix-web", "derive_more 2.1.1", + "derive_more 2.1.1", "oauth2", "reqwest", - "rustls", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tracing", "url", - "webpki-roots", "x509-cert", ] [[package]] name = "cosmian_kmip" -version = "5.14.1" +version = "5.15.0" dependencies = [ "base64 0.22.1", "bitflags", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "hex", "js-sys", "kmip-derive", @@ -1634,7 +1513,7 @@ dependencies = [ "serde_json", "strum", "strum_macros 0.27.2", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", "tracing", "uuid", @@ -1643,7 +1522,7 @@ dependencies = [ [[package]] name = "cosmian_kms_access" -version = "5.14.1" +version = "5.15.0" dependencies = [ "cosmian_kmip", "serde", @@ -1651,24 +1530,25 @@ dependencies = [ [[package]] name = "cosmian_kms_base_hsm" -version = "5.14.1" +version = "5.15.0" dependencies = [ "async-trait", "cosmian_kms_interfaces", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "futures", "libloading", - "lru", + "lru 0.16.3", "pkcs11-sys", "rand 0.9.2", - "thiserror 2.0.18", + "thiserror 2.0.17", "uuid", "zeroize", ] [[package]] name = "cosmian_kms_cli" -version = "5.14.1" +version = "5.15.0" dependencies = [ "base64 0.22.1", "clap", @@ -1677,9 +1557,10 @@ dependencies = [ "cosmian_kms_client", "cosmian_kms_crypto", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "der", "hex", - "jwt-simple", + "jsonwebtoken", "leb128", "num-format", "pem", @@ -1688,7 +1569,7 @@ dependencies = [ "serde_json", "sha2", "strum", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", "tokio", "url", @@ -1699,23 +1580,24 @@ dependencies = [ [[package]] name = "cosmian_kms_client" -version = "5.14.1" +version = "5.15.0" dependencies = [ - "cosmian_crypto_core 10.3.0", + "cosmian_crypto_core", "cosmian_http_client", "cosmian_kms_client_utils", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "der", "pem", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "url", ] [[package]] name = "cosmian_kms_client_utils" -version = "5.14.1" +version = "5.15.0" dependencies = [ "base64 0.22.1", "clap", @@ -1723,27 +1605,30 @@ dependencies = [ "cosmian_kmip", "cosmian_kms_access", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "pem", "serde", "serde_json", "strum", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", "zeroize", ] [[package]] name = "cosmian_kms_crypto" -version = "5.14.1" +version = "5.15.0" dependencies = [ "aes-gcm-siv", "argon2", "base64 0.22.1", "cosmian_cover_crypt", - "cosmian_crypto_core 10.3.0", + "cosmian_crypto_core", "cosmian_kmip", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "hex", + "k256", "num-bigint-dig", "openssl", "p256", @@ -1751,7 +1636,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.18", + "thiserror 2.0.17", "uuid", "x509-parser", "zeroize", @@ -1759,20 +1644,21 @@ dependencies = [ [[package]] name = "cosmian_kms_interfaces" -version = "5.14.1" +version = "5.15.0" dependencies = [ "async-trait", "cosmian_kmip", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "num-bigint-dig", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "zeroize", ] [[package]] name = "cosmian_kms_server" -version = "5.14.1" +version = "5.15.0" dependencies = [ "actix-cors", "actix-files", @@ -1791,13 +1677,13 @@ dependencies = [ "cosmian_kms_base_hsm", "cosmian_kms_server_database", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "crypt2pay_pkcs11_loader", "dotenvy", "futures", "hex", "jsonwebtoken", "num-bigint-dig", - "openidconnect", "openssl", "opentelemetry 0.27.1", "opentelemetry-otlp 0.27.0", @@ -1811,7 +1697,7 @@ dependencies = [ "smartcardhsm_pkcs11_loader", "softhsm2_pkcs11_loader", "strum", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", "tokio", "toml 0.8.23", @@ -1825,39 +1711,43 @@ dependencies = [ [[package]] name = "cosmian_kms_server_database" -version = "5.14.1" +version = "5.15.0" dependencies = [ "async-trait", - "cloudproof_findex", - "cosmian_findex 8.0.0", + "cosmian_findex", "cosmian_kmip", "cosmian_kms_crypto", "cosmian_kms_interfaces", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "cosmian_sse_memories", - "lru", - "num-bigint-dig", + "deadpool-postgres", + "lru 0.16.3", + "mysql_async", "num_cpus", + "openssl", + "postgres-openssl", "rawsql", - "redis 0.23.3", - "redis 0.32.7", + "redis", + "rusqlite", "serde", "serde_json", - "sqlx", "strum", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", + "tokio-postgres", + "tokio-rusqlite", "url", "uuid", - "version-compare", - "zeroize", ] [[package]] name = "cosmian_logger" version = "0.5.5" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff3434d2a64271c79bb0f0b6c05d4995dd88396165b8aba92291b91ee1deb7ca" +checksum = "ff3434d2a64271c79bb0f0b6c05d4995dd88396165b8aba92291b91ee1deb7ca" dependencies = [ "opentelemetry 0.29.1", "opentelemetry-otlp 0.29.0", @@ -1865,7 +1755,7 @@ dependencies = [ "opentelemetry-stdout", "opentelemetry_sdk 0.29.0", "syslog-tracing", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "tracing-appender", "tracing-opentelemetry", @@ -1879,7 +1769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a2cffbf2bcf7470978d356c9d15f8a342c3d39224b227144cdc9378242974c6" dependencies = [ "opentelemetry 0.29.1", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "tracing-appender", "tracing-subscriber", @@ -1902,7 +1792,7 @@ dependencies = [ "serial_test", "sha3", "test_kms_server", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tracing-error", "tracing-subscriber", @@ -1924,10 +1814,11 @@ dependencies = [ "pkcs1", "pkcs11-sys", "rand 0.9.2", + "rand 0.9.2", "rsa", "serial_test", "strum_macros 0.26.4", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "zeroize", ] @@ -1939,8 +1830,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f21de5515e966a676e8d85097960e9c69c134eafdb6044b381d7ffff60c6b8c1" dependencies = [ "agnostic-lite", - "cosmian_crypto_core 10.3.0", - "redis 0.32.7", + "cosmian_crypto_core", + "redis", "tokio", ] @@ -1953,26 +1844,13 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" version = "1.5.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -2056,12 +1934,14 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" version = "0.2.4" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypt2pay_pkcs11_loader" -version = "5.14.1" +version = "5.15.0" dependencies = [ "cosmian_kms_base_hsm", ] @@ -2081,8 +1961,10 @@ dependencies = [ [[package]] name = "crypto-common" version = "0.1.7" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -2131,30 +2013,29 @@ dependencies = [ [[package]] name = "csv" version = "1.4.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", "serde_core", + "serde_core", ] [[package]] name = "csv-core" version = "0.1.13" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] -[[package]] -name = "ct-codecs" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b10589d1a5e400d61f9f38f12f884cfd080ff345de8f17efda36fe0e4a02aa8" - [[package]] name = "ctr" version = "0.9.2" @@ -2228,9 +2109,44 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.9.0" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" + +[[package]] +name = "deadpool" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" +dependencies = [ + "deadpool-runtime", + "lazy_static", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-postgres" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d697d376cbfa018c23eb4caab1fd1883dd9c906a8c034e8d9a3cb06a7e0bef9" +dependencies = [ + "async-trait", + "deadpool", + "getrandom 0.2.17", + "tokio", + "tokio-postgres", + "tracing", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" +dependencies = [ + "tokio", +] [[package]] name = "der" @@ -2238,7 +2154,6 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "arbitrary", "const-oid", "der_derive", "flagset", @@ -2274,24 +2189,15 @@ dependencies = [ [[package]] name = "deranged" version = "0.5.5" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", "serde_core", ] -[[package]] -name = "derive_arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "derive_more" version = "0.99.20" @@ -2308,8 +2214,10 @@ dependencies = [ [[package]] name = "derive_more" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] @@ -2317,8 +2225,10 @@ dependencies = [ [[package]] name = "derive_more-impl" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "convert_case 0.10.0", "proc-macro2", @@ -2386,18 +2296,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[package]] -name = "dyn-clone" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" - [[package]] name = "ecdsa" version = "0.16.9" @@ -2422,21 +2320,13 @@ dependencies = [ "signature", ] -[[package]] -name = "ed25519-compact" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ce99a9e19c84beb4cc35ece85374335ccc398240712114c85038319ed709bd" -dependencies = [ - "ct-codecs", - "getrandom 0.3.4", -] - [[package]] name = "ed25519-dalek" version = "2.2.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -2451,9 +2341,6 @@ name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -dependencies = [ - "serde", -] [[package]] name = "elliptic-curve" @@ -2467,7 +2354,6 @@ dependencies = [ "ff", "generic-array", "group", - "hkdf", "pem-rfc7468", "pkcs8", "rand_core 0.6.4", @@ -2500,11 +2386,14 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" version = "0.3.14" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] @@ -2521,8 +2410,10 @@ dependencies = [ [[package]] name = "event-listener" version = "5.4.1" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ "concurrent-queue", "parking", @@ -2535,10 +2426,17 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ + "event-listener", "event-listener", "pin-project-lite", ] +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -2560,8 +2458,10 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "feature-extension-for-smol" version = "0.2.3" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680af37225fbd411cf212f49aff82d8d00c5a882d68a9d35d725370387f163ce" +checksum = "680af37225fbd411cf212f49aff82d8d00c5a882d68a9d35d725370387f163ce" dependencies = [ "async-io", "futures-channel", @@ -2572,8 +2472,10 @@ dependencies = [ [[package]] name = "feature-extension-for-wasm-bindgen-futures" version = "0.2.3" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97c72525d3b1e0d516efba1ea6bf303774580ebe57c4b55cab5fc4c1d9c86bb2" +checksum = "97c72525d3b1e0d516efba1ea6bf303774580ebe57c4b55cab5fc4c1d9c86bb2" dependencies = [ "futures-channel", "futures-timer", @@ -2598,9 +2500,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" [[package]] name = "flagset" @@ -2610,11 +2512,12 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" [[package]] name = "flate2" -version = "1.1.5" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" dependencies = [ "crc32fast", + "libz-sys", "miniz_oxide", ] @@ -2627,17 +2530,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2650,6 +2542,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2668,18 +2566,14 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" version = "1.2.2" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures" version = "0.3.31" @@ -2722,17 +2616,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -2781,6 +2664,7 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ + "gloo-timers", "gloo-timers", "send_wrapper", ] @@ -2837,9 +2721,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -2851,15 +2735,15 @@ dependencies = [ [[package]] name = "getrandom" version = "0.3.4" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi", "wasip2", - "wasm-bindgen", ] [[package]] @@ -2875,8 +2759,10 @@ dependencies = [ [[package]] name = "glob" version = "0.3.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "gloo-timers" @@ -2904,8 +2790,10 @@ dependencies = [ [[package]] name = "h2" version = "0.3.27" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ "bytes", "fnv", @@ -2913,7 +2801,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.12.1", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -2922,9 +2810,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" dependencies = [ "atomic-waker", "bytes", @@ -2932,7 +2820,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.4.0", - "indexmap 2.12.1", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -2942,12 +2830,15 @@ dependencies = [ [[package]] name = "half" version = "2.7.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", "zerocopy", + "zerocopy", ] [[package]] @@ -2961,19 +2852,18 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.12", -] [[package]] name = "hashbrown" version = "0.15.5" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", ] [[package]] @@ -2981,14 +2871,10 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.5", + "allocator-api2", + "equivalent", + "foldhash 0.2.0", ] [[package]] @@ -2998,6 +2884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ "hashbrown 0.15.5", + "hashbrown 0.15.5", ] [[package]] @@ -3039,37 +2926,16 @@ dependencies = [ "digest", ] -[[package]] -name = "hmac-sha1-compact" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a4e188bd5d537801721276d1771f1cea235cd94961ddb2828eb76e16688356" - -[[package]] -name = "hmac-sha256" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6880c8d4a9ebf39c6e8b77007ce223f646a4d21ce29d99f70cb16420545425" -dependencies = [ - "digest", -] - -[[package]] -name = "hmac-sha512" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89e8d20b3799fa526152a5301a771eaaad80857f83e01b23216ceaafb2d9280" -dependencies = [ - "digest", -] - [[package]] name = "home" version = "0.5.12" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] @@ -3086,8 +2952,10 @@ dependencies = [ [[package]] name = "http" version = "1.4.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", "itoa", @@ -3101,6 +2969,7 @@ checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.4.0", + "http 1.4.0", ] [[package]] @@ -3112,6 +2981,7 @@ dependencies = [ "bytes", "futures-core", "http 1.4.0", + "http 1.4.0", "http-body", "pin-project-lite", ] @@ -3155,14 +3025,17 @@ dependencies = [ [[package]] name = "hyper" version = "1.8.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ + "atomic-waker", "atomic-waker", "bytes", "futures-channel", "futures-core", - "h2 0.4.12", + "h2 0.4.13", "http 1.4.0", "http-body", "httparse", @@ -3170,6 +3043,7 @@ dependencies = [ "itoa", "pin-project-lite", "pin-utils", + "pin-utils", "smallvec", "tokio", "want", @@ -3181,6 +3055,7 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ + "http 1.4.0", "http 1.4.0", "hyper", "hyper-util", @@ -3189,7 +3064,6 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots", ] [[package]] @@ -3224,8 +3098,10 @@ dependencies = [ [[package]] name = "hyper-util" version = "0.1.19" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", @@ -3233,6 +3109,7 @@ dependencies = [ "futures-core", "futures-util", "http 1.4.0", + "http 1.4.0", "http-body", "hyper", "ipnet", @@ -3240,6 +3117,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "socket2 0.6.1", + "socket2 0.6.1", "system-configuration", "tokio", "tower-service", @@ -3250,8 +3128,10 @@ dependencies = [ [[package]] name = "iana-time-zone" version = "0.1.64" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3274,8 +3154,10 @@ dependencies = [ [[package]] name = "icu_collections" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -3287,8 +3169,10 @@ dependencies = [ [[package]] name = "icu_locale_core" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -3300,8 +3184,10 @@ dependencies = [ [[package]] name = "icu_normalizer" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -3314,14 +3200,18 @@ dependencies = [ [[package]] name = "icu_normalizer_data" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" version = "2.1.2" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -3334,14 +3224,18 @@ dependencies = [ [[package]] name = "icu_properties_data" version = "2.1.2" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" version = "2.1.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", @@ -3361,8 +3255,10 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" version = "1.1.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -3393,19 +3289,16 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] name = "indexmap" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown 0.16.1", - "serde", - "serde_core", ] [[package]] @@ -3414,19 +3307,9 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ - "block-padding", "generic-array", ] -[[package]] -name = "inout" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" -dependencies = [ - "hybrid-array 0.4.5", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -3435,9 +3318,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -3470,27 +3353,39 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jobserver" version = "0.1.34" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom 0.3.4", "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", @@ -3511,32 +3406,6 @@ dependencies = [ "simple_asn1", ] -[[package]] -name = "jwt-simple" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3991f54af4b009bb6efe01aa5a4fcce9ca52f3de7a104a3f6b6e2ad36c852c48" -dependencies = [ - "anyhow", - "binstring", - "blake2b_simd", - "coarsetime", - "ct-codecs", - "ed25519-compact", - "hmac-sha1-compact", - "hmac-sha256", - "hmac-sha512", - "k256", - "p256", - "p384", - "rand 0.8.5", - "serde", - "serde_json", - "superboring", - "thiserror 2.0.18", - "zeroize", -] - [[package]] name = "k256" version = "0.13.4" @@ -3570,9 +3439,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap 2.13.0", +] + [[package]] name = "kmip-derive" -version = "5.14.1" +version = "5.15.0" dependencies = [ "quote", "syn", @@ -3601,18 +3479,21 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libloading" version = "0.8.9" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", "windows-link", + "windows-link", ] [[package]] @@ -3623,20 +3504,30 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags", "libc", - "redox_syscall 0.6.0", ] [[package]] name = "libsqlite3-sys" -version = "0.30.1" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" dependencies = [ "cc", "pkg-config", @@ -3646,14 +3537,18 @@ dependencies = [ [[package]] name = "linux-raw-sys" version = "0.11.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" version = "0.8.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "local-channel" @@ -3675,8 +3570,10 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" version = "0.4.14" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ "scopeguard", ] @@ -3684,23 +3581,29 @@ dependencies = [ [[package]] name = "log" version = "0.4.29" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" -version = "0.12.5" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" dependencies = [ "hashbrown 0.15.5", + "hashbrown 0.15.5", ] [[package]] -name = "lru-slab" -version = "0.1.2" +name = "lru" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" +dependencies = [ + "hashbrown 0.16.1", +] [[package]] name = "matchers" @@ -3730,8 +3633,10 @@ dependencies = [ [[package]] name = "memchr" version = "2.7.6" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "mime" @@ -3763,17 +3668,20 @@ checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", "simd-adler32", + "simd-adler32", ] [[package]] name = "mio" version = "1.1.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.1+wasi-snapshot-preview1", "windows-sys 0.61.2", ] @@ -3790,6 +3698,81 @@ dependencies = [ "zeroize", ] +[[package]] +name = "mysql-common-derive" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66f62cad7623a9cb6f8f64037f0c4f69c8db8e82914334a83c9788201c2c1bfa" +dependencies = [ + "darling", + "heck", + "num-bigint", + "proc-macro-crate", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn", + "termcolor", + "thiserror 2.0.17", +] + +[[package]] +name = "mysql_async" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "277ce2f2459b2af4cc6d0a0b7892381f80800832f57c533f03e2845f4ea331ea" +dependencies = [ + "bytes", + "crossbeam-queue", + "flate2", + "futures-core", + "futures-sink", + "futures-util", + "keyed_priority_queue", + "lru 0.14.0", + "mysql_common", + "native-tls", + "pem", + "percent-encoding", + "rand 0.9.2", + "serde", + "serde_json", + "socket2 0.5.10", + "thiserror 2.0.17", + "tokio", + "tokio-native-tls", + "tokio-util", + "twox-hash", + "url", +] + +[[package]] +name = "mysql_common" +version = "0.35.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052" +dependencies = [ + "base64 0.22.1", + "bitflags", + "btoi", + "byteorder", + "bytes", + "crc32fast", + "flate2", + "getrandom 0.3.4", + "mysql-common-derive", + "num-bigint", + "num-traits", + "regex", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "thiserror 2.0.17", + "uuid", +] + [[package]] name = "native-tls" version = "0.2.14" @@ -3807,12 +3790,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "never" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" - [[package]] name = "nom" version = "7.1.3" @@ -3832,10 +3809,13 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nu-ansi-term" version = "0.50.3" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] @@ -3851,8 +3831,10 @@ dependencies = [ [[package]] name = "num-bigint-dig" version = "0.8.6" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" dependencies = [ "lazy_static", "libm", @@ -3938,7 +3920,7 @@ checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ "base64 0.22.1", "chrono", - "getrandom 0.2.16", + "getrandom 0.2.17", "http 1.4.0", "rand 0.8.5", "reqwest", @@ -3977,42 +3959,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openidconnect" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c6709ba2ea764bbed26bce1adf3c10517113ddea6f2d4196e4851757ef2b2" -dependencies = [ - "base64 0.21.7", - "chrono", - "dyn-clone", - "ed25519-dalek", - "hmac", - "http 1.4.0", - "itertools 0.10.5", - "log", - "oauth2", - "p256", - "p384", - "rand 0.8.5", - "rsa", - "serde", - "serde-value", - "serde_json", - "serde_path_to_error", - "serde_plain", - "serde_with", - "sha2", - "subtle", - "thiserror 1.0.69", - "url", -] - [[package]] name = "openssl" version = "0.10.75" +version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ "bitflags", "cfg-if", @@ -4043,8 +3996,10 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" version = "0.9.111" +version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", @@ -4076,7 +4031,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", ] @@ -4089,6 +4044,7 @@ dependencies = [ "async-trait", "bytes", "http 1.4.0", + "http 1.4.0", "opentelemetry 0.29.1", "reqwest", "tracing", @@ -4103,6 +4059,7 @@ dependencies = [ "async-trait", "futures-core", "http 1.4.0", + "http 1.4.0", "opentelemetry 0.27.1", "opentelemetry-proto 0.27.0", "opentelemetry_sdk 0.27.1", @@ -4121,13 +4078,14 @@ checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656" dependencies = [ "futures-core", "http 1.4.0", + "http 1.4.0", "opentelemetry 0.29.1", "opentelemetry-http", "opentelemetry-proto 0.29.0", "opentelemetry_sdk 0.29.0", "prost", "reqwest", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tonic", "tracing", @@ -4209,20 +4167,12 @@ dependencies = [ "opentelemetry 0.29.1", "percent-encoding", "rand 0.9.2", + "rand 0.9.2", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", ] -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-multimap" version = "0.7.3" @@ -4233,30 +4183,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "p192" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0533bc6c238f2669aab8db75ae52879dc74e88d6bd3685bd4022a00fa85cd2" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sec1", -] - -[[package]] -name = "p224" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "p256" version = "0.13.2" @@ -4269,18 +4195,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "p384" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "parking" version = "2.2.1" @@ -4290,8 +4204,10 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" version = "0.12.5" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -4300,14 +4216,17 @@ dependencies = [ [[package]] name = "parking_lot_core" version = "0.9.12" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall 0.5.18", "smallvec", "windows-link", + "windows-link", ] [[package]] @@ -4327,24 +4246,17 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - [[package]] name = "pem" version = "3.0.6" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ "base64 0.22.1", "serde_core", + "serde_core", ] [[package]] @@ -4359,9 +4271,29 @@ dependencies = [ [[package]] name = "percent-encoding" version = "2.3.2" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_shared", + "serde", +] + +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.10" @@ -4422,21 +4354,6 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f9274ee0f6bf35f62117a120fa66885f3839bd5b54f6a2a9783694e3fa90cb3" -[[package]] -name = "pkcs5" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" -dependencies = [ - "aes 0.8.4", - "cbc", - "der", - "pbkdf2", - "scrypt", - "sha2", - "spki", -] - [[package]] name = "pkcs8" version = "0.10.2" @@ -4444,8 +4361,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", - "pkcs5", - "rand_core 0.6.4", "spki", ] @@ -4486,8 +4401,10 @@ dependencies = [ [[package]] name = "polling" version = "3.11.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" dependencies = [ "cfg-if", "concurrent-queue", @@ -4495,6 +4412,7 @@ dependencies = [ "pin-project-lite", "rustix", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] @@ -4522,15 +4440,61 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.12.0" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" + +[[package]] +name = "postgres-openssl" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd" +checksum = "8f86f073ad570f76e9e278ce6f05775fc723eed7daa6b4f9c2aa078080a564a0" +dependencies = [ + "openssl", + "tokio", + "tokio-openssl", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee9dd5fe15055d2b6806f4736aa0c9637217074e224bbec46d4041b91bb9491" +dependencies = [ + "base64 0.22.1", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "hmac", + "md-5", + "memchr", + "rand 0.9.2", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b858f82211e84682fecd373f68e1ceae642d8d751a1ebd13f33de6257b3e20" +dependencies = [ + "bytes", + "fallible-iterator 0.2.0", + "postgres-protocol", + "serde_core", + "serde_json", + "uuid", +] [[package]] name = "potential_utf" version = "0.1.4" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -4589,11 +4553,42 @@ dependencies = [ "elliptic-curve", ] +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit 0.23.10+spec-1.0.0", +] + +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" dependencies = [ "unicode-ident", ] @@ -4616,6 +4611,7 @@ checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", "itertools 0.14.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn", @@ -4623,7 +4619,7 @@ dependencies = [ [[package]] name = "proteccio_pkcs11_loader" -version = "5.14.1" +version = "5.15.0" dependencies = [ "cosmian_kms_base_hsm", ] @@ -4639,74 +4635,21 @@ dependencies = [ ] [[package]] -name = "quinn" -version = "0.11.9" +name = "quote" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2 0.6.1", - "thiserror 2.0.18", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" -dependencies = [ - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand 0.9.2", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.18", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2 0.6.1", - "tracing", - "windows-sys 0.60.2", -] - -[[package]] -name = "quote" -version = "1.0.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" -dependencies = [ - "proc-macro2", + "proc-macro2", ] [[package]] name = "r-efi" version = "5.3.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -4722,11 +4665,13 @@ dependencies = [ [[package]] name = "rand" version = "0.9.2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -4746,7 +4691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -4755,16 +4700,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", + "getrandom 0.3.4", ] [[package]] @@ -4776,8 +4722,10 @@ checksum = "f70b36c8415361d34d90adf494f45bc18e568f909b5946d27c79559ddd812fa8" [[package]] name = "rayon" version = "1.11.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -4786,45 +4734,22 @@ dependencies = [ [[package]] name = "rayon-core" version = "1.13.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "redis" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" -dependencies = [ - "ahash 0.7.8", - "arc-swap", - "async-trait", - "bytes", - "combine", - "futures", - "futures-util", - "itoa", - "percent-encoding", - "pin-project-lite", - "ryu", - "sha1_smol", - "socket2 0.4.10", - "tokio", - "tokio-retry", - "tokio-util", - "url", -] - [[package]] name = "redis" version = "0.32.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "014cc767fefab6a3e798ca45112bccad9c6e0e218fbd49720042716c73cfef44" dependencies = [ - "ahash 0.8.12", + "ahash", "arc-swap", "backon", "bytes", @@ -4839,6 +4764,7 @@ dependencies = [ "ryu", "sha1_smol", "socket2 0.6.1", + "socket2 0.6.1", "tokio", "tokio-util", "url", @@ -4847,46 +4773,20 @@ dependencies = [ [[package]] name = "redox_syscall" version = "0.5.18" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] -[[package]] -name = "redox_syscall" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "ref-cast" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "regex" version = "1.12.2" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -4897,8 +4797,10 @@ dependencies = [ [[package]] name = "regex-automata" version = "0.4.13" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -4908,20 +4810,26 @@ dependencies = [ [[package]] name = "regex-lite" version = "0.1.8" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" +checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" [[package]] name = "regex-syntax" version = "0.8.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" version = "0.12.28" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -4929,7 +4837,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.12", + "h2 0.4.13", "http 1.4.0", "http-body", "http-body-util", @@ -4943,8 +4851,6 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "quinn", - "rustls", "rustls-pki-types", "serde", "serde_json", @@ -4952,15 +4858,13 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls", - "tower 0.5.2", + "tower 0.5.3", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", ] [[package]] @@ -4981,7 +4885,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -4989,9 +4893,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ "const-oid", "digest", @@ -5001,7 +4905,6 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core 0.6.4", - "sha2", "signature", "spki", "subtle", @@ -5010,34 +4913,31 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" +checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ "bitflags", - "fallible-iterator", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", - "hashlink 0.9.1", + "hashlink", "libsqlite3-sys", + "serde_json", "smallvec", ] [[package]] name = "rust-ini" version = "0.21.3" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" +checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" dependencies = [ "cfg-if", "ordered-multimap", ] -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "rustc_version" version = "0.4.1" @@ -5058,27 +4958,25 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ - "aws-lc-rs", - "log", "once_cell", - "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -5088,20 +4986,22 @@ dependencies = [ [[package]] name = "rustls-pki-types" version = "1.13.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ - "web-time", "zeroize", ] [[package]] name = "rustls-webpki" version = "0.103.8" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5110,14 +5010,16 @@ dependencies = [ [[package]] name = "rustversion" version = "1.0.22" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" [[package]] name = "salsa20" @@ -5137,11 +5039,19 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "saturating" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" + [[package]] name = "scc" version = "2.4.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" +checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" dependencies = [ "sdd", ] @@ -5149,58 +5059,27 @@ dependencies = [ [[package]] name = "schannel" version = "0.1.28" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - -[[package]] -name = "schemars" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "pbkdf2", - "salsa20", - "sha2", -] - [[package]] name = "sdd" version = "3.0.10" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" [[package]] name = "sec1" @@ -5232,8 +5111,10 @@ dependencies = [ [[package]] name = "security-framework-sys" version = "2.15.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -5242,8 +5123,10 @@ dependencies = [ [[package]] name = "semver" version = "1.0.27" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "send_wrapper" @@ -5254,23 +5137,16 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" version = "1.0.228" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_core", "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_core" version = "1.0.228" @@ -5283,8 +5159,10 @@ dependencies = [ [[package]] name = "serde_derive" version = "1.0.228" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -5294,37 +5172,34 @@ dependencies = [ [[package]] name = "serde_json" version = "1.0.149" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "itoa", "memchr", "serde", "serde_core", "zmij", + "serde_core", + "zmij", ] [[package]] name = "serde_path_to_error" version = "0.1.20" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" dependencies = [ "itoa", "serde", "serde_core", ] -[[package]] -name = "serde_plain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "0.6.9" @@ -5337,10 +5212,13 @@ dependencies = [ [[package]] name = "serde_spanned" version = "1.0.4" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", + "serde_core", ] [[package]] @@ -5355,44 +5233,14 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.12.1", - "schemars 0.9.0", - "schemars 1.2.0", - "serde_core", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "serial_test" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" dependencies = [ - "futures", + "futures-executor", + "futures-util", "log", "once_cell", "parking_lot", @@ -5402,9 +5250,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" dependencies = [ "proc-macro2", "quote", @@ -5461,8 +5309,10 @@ dependencies = [ [[package]] name = "shell-words" version = "1.1.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" +checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" [[package]] name = "shlex" @@ -5472,10 +5322,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] @@ -5495,6 +5346,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + [[package]] name = "simple_asn1" version = "0.6.3" @@ -5503,10 +5360,16 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", ] +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.11" @@ -5518,13 +5381,10 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -dependencies = [ - "serde", -] [[package]] name = "smartcardhsm_pkcs11_loader" -version = "5.14.1" +version = "5.15.0" dependencies = [ "cosmian_kms_base_hsm", ] @@ -5535,6 +5395,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" dependencies = [ + "async-channel", "async-channel", "async-executor", "async-fs", @@ -5546,16 +5407,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.10" @@ -5569,234 +5420,46 @@ dependencies = [ [[package]] name = "socket2" version = "0.6.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", "windows-sys 0.60.2", + "windows-sys 0.60.2", ] [[package]] -name = "softhsm2_pkcs11_loader" -version = "5.14.1" -dependencies = [ - "cosmian_kms_base_hsm", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "arbitrary", - "base64ct", - "der", -] - -[[package]] -name = "sqlx" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" -dependencies = [ - "base64 0.22.1", - "bytes", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.15.5", - "hashlink 0.10.0", - "indexmap 2.12.1", - "log", - "memchr", - "native-tls", - "once_cell", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "thiserror 2.0.18", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" -dependencies = [ - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags", - "byteorder", - "bytes", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.18", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" -dependencies = [ - "atoi", - "base64 0.22.1", - "bitflags", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 2.0.18", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.6" +name = "softhsm2_pkcs11_loader" +version = "5.15.0" +dependencies = [ + "cosmian_kms_base_hsm", +] + +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "thiserror 2.0.18", - "tracing", - "url", + "base64ct", + "der", ] [[package]] name = "stable_deref_trait" version = "1.2.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stringprep" @@ -5818,10 +5481,13 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" version = "0.27.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros 0.27.2", + "strum_macros 0.27.2", ] [[package]] @@ -5840,8 +5506,10 @@ dependencies = [ [[package]] name = "strum_macros" version = "0.27.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", @@ -5855,26 +5523,11 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "superboring" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d8c985e81c88f5694d5dfc232691b2aa34f3e1f66e860db9cd1ddf2bb6dc64" -dependencies = [ - "aes-gcm", - "aes-keywrap", - "getrandom 0.2.16", - "hmac-sha256", - "hmac-sha512", - "rand 0.8.5", - "rsa", -] - [[package]] name = "syn" -version = "2.0.111" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -5935,17 +5588,27 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "getrandom 0.3.4", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "termtree" version = "0.5.1" @@ -5966,12 +5629,13 @@ dependencies = [ [[package]] name = "test_kms_server" -version = "5.14.1" +version = "5.15.0" dependencies = [ "actix-server", "cosmian_kms_client", "cosmian_kms_server", "cosmian_logger 0.5.5", + "cosmian_logger 0.5.5", "serde_json", "time", "tokio", @@ -5988,11 +5652,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.18", + "thiserror-impl 2.0.17", ] [[package]] @@ -6008,9 +5672,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -6028,9 +5692,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.44" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" dependencies = [ "deranged", "itoa", @@ -6038,22 +5702,22 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" dependencies = [ "num-conv", "time-core", @@ -6071,8 +5735,10 @@ dependencies = [ [[package]] name = "tinystr" version = "0.8.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -6091,8 +5757,10 @@ dependencies = [ [[package]] name = "tinyvec" version = "1.10.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -6126,9 +5794,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", @@ -6137,15 +5805,19 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.6.1", + "socket2 0.6.1", "tokio-macros", "windows-sys 0.61.2", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" version = "2.6.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -6174,21 +5846,49 @@ dependencies = [ ] [[package]] -name = "tokio-retry" -version = "0.3.0" +name = "tokio-postgres" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +checksum = "dcea47c8f71744367793f16c2db1f11cb859d28f436bdb4ca9193eb1f787ee42" dependencies = [ - "pin-project", - "rand 0.8.5", + "async-trait", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "rand 0.9.2", + "socket2 0.6.1", + "tokio", + "tokio-util", + "whoami", +] + +[[package]] +name = "tokio-rusqlite" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302563ae4a2127f3d2c105f4f2f0bd7cae3609371755600ebc148e0ccd8510d6" +dependencies = [ + "crossbeam-channel", + "rusqlite", "tokio", ] [[package]] name = "tokio-rustls" version = "0.26.4" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -6196,9 +5896,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -6207,9 +5907,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -6227,16 +5927,16 @@ dependencies = [ "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", - "toml_edit", + "toml_edit 0.22.27", ] [[package]] name = "toml" -version = "0.9.10+spec-1.1.0" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "serde_core", "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", @@ -6257,10 +5957,13 @@ dependencies = [ [[package]] name = "toml_datetime" version = "0.7.5+spec-1.1.0" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", + "serde_core", ] [[package]] @@ -6269,7 +5972,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -6277,11 +5980,25 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.23.10+spec-1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +dependencies = [ + "indexmap 2.13.0", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "winnow", +] + [[package]] name = "toml_parser" version = "1.0.6+spec-1.1.0" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -6295,8 +6012,10 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" version = "1.0.6+spec-1.1.0" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tonic" @@ -6309,7 +6028,7 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.12", + "h2 0.4.13", "http 1.4.0", "http-body", "http-body-util", @@ -6350,9 +6069,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -6366,17 +6085,20 @@ dependencies = [ [[package]] name = "tower-http" version = "0.6.8" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", "futures-util", "http 1.4.0", + "http 1.4.0", "http-body", "iri-string", "pin-project-lite", - "tower 0.5.2", + "tower 0.5.3", "tower-layer", "tower-service", ] @@ -6396,8 +6118,10 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" version = "0.1.44" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -6408,11 +6132,13 @@ dependencies = [ [[package]] name = "tracing-appender" version = "0.2.4" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" +checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" dependencies = [ "crossbeam-channel", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", "tracing-subscriber", ] @@ -6420,8 +6146,10 @@ dependencies = [ [[package]] name = "tracing-attributes" version = "0.1.31" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -6431,8 +6159,10 @@ dependencies = [ [[package]] name = "tracing-core" version = "0.1.36" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -6480,8 +6210,10 @@ dependencies = [ [[package]] name = "tracing-subscriber" version = "0.3.22" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", @@ -6499,17 +6231,25 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "typenum" version = "1.19.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicase" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-bidi" @@ -6520,14 +6260,18 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" version = "1.0.22" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" version = "0.1.25" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] @@ -6535,8 +6279,10 @@ dependencies = [ [[package]] name = "unicode-properties" version = "0.1.4" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" @@ -6574,14 +6320,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -6592,7 +6339,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utimaco_pkcs11_loader" -version = "5.14.1" +version = "5.15.0" dependencies = [ "cosmian_kms_base_hsm", ] @@ -6603,7 +6350,7 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "serde", ] @@ -6636,12 +6383,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version-compare" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" - [[package]] name = "version_check" version = "0.9.5" @@ -6683,34 +6424,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasip2" -version = "1.0.1+wasi-0.2.4" +name = "wasi" +version = "0.14.7+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" dependencies = [ - "wit-bindgen", + "wasip2", ] [[package]] -name = "wasite" -version = "0.1.0" +name = "wasip2" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] [[package]] -name = "wasix" -version = "0.13.1" +name = "wasite" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1757e0d1f8456693c7e5c6c629bdb54884e032aa0bb53c155f6a39f94440d332" +checksum = "66fe902b4a6b8028a753d5424909b764ccf79b7a209eac9bf97e59cda9f71a42" dependencies = [ - "wasi", + "wasi 0.14.7+wasi-0.2.4", ] [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", @@ -6721,11 +6465,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.56" +version = "0.4.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -6734,9 +6479,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6744,10 +6489,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ + "bumpalo", "bumpalo", "proc-macro2", "quote", @@ -6757,18 +6503,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" dependencies = [ "js-sys", "wasm-bindgen", @@ -6784,61 +6530,37 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "whoami" -version = "1.6.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +checksum = "ace4d5c7b5ab3d99629156d4e0997edbe98a4beb6d5ba99e2cae830207a81983" dependencies = [ + "libredox", "libredox", "wasite", + "web-sys", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" version = "0.1.11" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys 0.61.2", + "windows-sys 0.61.2", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.62.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -6850,8 +6572,10 @@ dependencies = [ [[package]] name = "windows-implement" version = "0.60.2" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -6861,8 +6585,10 @@ dependencies = [ [[package]] name = "windows-interface" version = "0.59.3" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -6872,14 +6598,18 @@ dependencies = [ [[package]] name = "windows-link" version = "0.2.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" version = "0.6.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ "windows-link", "windows-result", @@ -6889,8 +6619,10 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] @@ -6898,8 +6630,10 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] @@ -6940,6 +6674,16 @@ dependencies = [ "windows-targets 0.53.5", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", + "windows-targets 0.53.5", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -6983,8 +6727,10 @@ dependencies = [ [[package]] name = "windows-targets" version = "0.53.5" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ "windows-link", "windows_aarch64_gnullvm 0.53.1", @@ -6995,6 +6741,14 @@ dependencies = [ "windows_x86_64_gnu 0.53.1", "windows_x86_64_gnullvm 0.53.1", "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -7012,8 +6766,10 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -7030,8 +6786,10 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -7048,8 +6806,10 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -7060,8 +6820,10 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -7078,8 +6840,10 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -7096,8 +6860,10 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -7114,8 +6880,10 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -7132,29 +6900,35 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" version = "0.53.1" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" version = "0.7.14" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "writeable" version = "0.6.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "x509-cert" @@ -7162,11 +6936,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" dependencies = [ - "arbitrary", "const-oid", "der", - "sha1", - "signature", "spki", "tls_codec", ] @@ -7185,7 +6956,7 @@ dependencies = [ "oid-registry", "ring", "rusticata-macros", - "thiserror 2.0.18", + "thiserror 2.0.17", "time", ] @@ -7202,8 +6973,10 @@ dependencies = [ [[package]] name = "yoke" version = "0.8.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -7213,8 +6986,10 @@ dependencies = [ [[package]] name = "yoke-derive" version = "0.8.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -7224,18 +6999,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", @@ -7266,8 +7041,10 @@ dependencies = [ [[package]] name = "zeroize" version = "1.8.2" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "serde", "zeroize_derive", @@ -7275,9 +7052,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", @@ -7287,8 +7064,10 @@ dependencies = [ [[package]] name = "zerotrie" version = "0.2.3" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -7298,8 +7077,10 @@ dependencies = [ [[package]] name = "zerovec" version = "0.11.5" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -7309,8 +7090,10 @@ dependencies = [ [[package]] name = "zerovec-derive" version = "0.11.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", @@ -7319,9 +7102,9 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.16" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" +checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" [[package]] name = "zstd" @@ -7344,8 +7127,10 @@ dependencies = [ [[package]] name = "zstd-sys" version = "2.0.16+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 6a187ca6..813b8470 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,4 +92,4 @@ libloading = "0.8" # Findex deps cosmian_findex = "8.0" cosmian_sse_memories = "8.0" -async-sqlite = { version = "=0.4" } +async-sqlite = { version = "0.5" } diff --git a/findex-server b/findex-server index 20d54f62..21556552 160000 --- a/findex-server +++ b/findex-server @@ -1 +1 @@ -Subproject commit 20d54f627fa9080a9f8f953c5bf15ca289e9e4ee +Subproject commit 21556552aafaf46454803c5ff56d887dee31e156 diff --git a/kms b/kms index 66263a34..c33791cc 160000 --- a/kms +++ b/kms @@ -1 +1 @@ -Subproject commit 66263a3470feab18a532a9376112c7e0151515dd +Subproject commit c33791cc26656aa659248088751299e12125fad5 From 7d0b5361e040a491b883dbe3977beeac20552f22 Mon Sep 17 00:00:00 2001 From: Manuthor Date: Sat, 17 Jan 2026 08:20:17 +0100 Subject: [PATCH 2/7] fix: remove RUSTSEC-2023-0071 and RUSTSEC-2024-0436 --- .github/scripts/cargo_test.sh | 2 +- Cargo.lock | 439 +----------------- Cargo.toml | 5 +- crate/cli/src/config.rs | 38 +- crate/cli/src/tests/kms/access.rs | 12 +- crate/cli/src/tests/kms/attributes/delete.rs | 8 +- crate/cli/src/tests/kms/attributes/get.rs | 8 +- crate/cli/src/tests/kms/attributes/set.rs | 8 +- crate/cli/src/tests/kms/auth_tests.rs | 6 +- .../cli/src/tests/kms/certificates/certify.rs | 4 +- .../cli/src/tests/kms/certificates/encrypt.rs | 6 +- .../cli/src/tests/kms/certificates/export.rs | 4 +- .../cli/src/tests/kms/certificates/import.rs | 4 +- .../src/tests/kms/certificates/validate.rs | 4 +- .../tests/kms/cover_crypt/access_structure.rs | 13 +- .../tests/kms/cover_crypt/encrypt_decrypt.rs | 6 +- .../tests/kms/cover_crypt/master_key_pair.rs | 4 +- crate/cli/src/tests/kms/cover_crypt/rekey.rs | 6 +- .../kms/cover_crypt/user_decryption_keys.rs | 4 +- .../tests/kms/derive_key/derive_key_tests.rs | 4 +- .../kms/elliptic_curve/create_key_pair.rs | 4 +- .../kms/elliptic_curve/encrypt_decrypt.rs | 6 +- .../tests/kms/elliptic_curve/sign_verify.rs | 6 +- .../src/tests/kms/google_cmd/identities.rs | 9 +- .../cli/src/tests/kms/google_cmd/key_pairs.rs | 4 +- .../kms/google_cmd/key_pairs_enabling.rs | 9 +- crate/cli/src/tests/kms/hash.rs | 5 +- crate/cli/src/tests/kms/mac.rs | 4 +- .../cli/src/tests/kms/rsa/create_key_pair.rs | 4 +- .../cli/src/tests/kms/rsa/encrypt_decrypt.rs | 8 +- crate/cli/src/tests/kms/rsa/sign_verify.rs | 6 +- .../tests/kms/secret_data/create_secret.rs | 4 +- .../tests/kms/secret_data/kmip_operations.rs | 6 +- .../src/tests/kms/secret_data/wrap_secret.rs | 8 +- crate/cli/src/tests/kms/shared/destroy.rs | 4 +- crate/cli/src/tests/kms/shared/export.rs | 4 +- crate/cli/src/tests/kms/shared/import.rs | 12 +- crate/cli/src/tests/kms/shared/locate.rs | 4 +- crate/cli/src/tests/kms/shared/revoke.rs | 4 +- crate/cli/src/tests/kms/shared/wrap_unwrap.rs | 6 +- .../cli/src/tests/kms/symmetric/create_key.rs | 4 +- .../tests/kms/symmetric/encrypt_decrypt.rs | 6 +- crate/cli/src/tests/kms/symmetric/rekey.rs | 4 +- crate/cli/src/tests/kms/utils/cmd_logs.rs | 26 ++ crate/cli/src/tests/kms/utils/mod.rs | 2 +- crate/cli/src/tests/kms/version.rs | 5 +- crate/cli/src/tests/mod.rs | 4 +- crate/pkcs11/module/Cargo.toml | 3 +- crate/pkcs11/module/src/core/object.rs | 55 ++- crate/pkcs11/module/src/error/mod.rs | 3 - deny.toml | 6 - documentation/docs/cli/main_commands.md | 32 +- 52 files changed, 207 insertions(+), 645 deletions(-) diff --git a/.github/scripts/cargo_test.sh b/.github/scripts/cargo_test.sh index 272d12af..17025188 100755 --- a/.github/scripts/cargo_test.sh +++ b/.github/scripts/cargo_test.sh @@ -30,7 +30,7 @@ fi export RUST_LOG="cosmian_cli=error,cosmian_findex_client=debug,cosmian_kms_client=debug" # shellcheck disable=SC2086 -cargo test --workspace --bins --target $TARGET $RELEASE $FEATURES +cargo test --workspace --target $TARGET $RELEASE $FEATURES # shellcheck disable=SC2086 # cargo bench --target $TARGET $FEATURES --no-run diff --git a/Cargo.lock b/Cargo.lock index 899e1bab..2cc6a2d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -362,35 +362,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "aes-keywrap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b6f24a1f796bc46415a1d0d18dc0a8203ccba088acf5def3291c4f61225522" -dependencies = [ - "aes 0.9.0-rc.2", - "byteorder", -] - -[[package]] -name = "agnostic-lite" -version = "0.6.0" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2460d4e5c7f8d33d33655d874c80ac888bf215794769bb7dcaa67d1a56fafb56" -checksum = "2460d4e5c7f8d33d33655d874c80ac888bf215794769bb7dcaa67d1a56fafb56" -dependencies = [ - "async-io", - "atomic-time", - "feature-extension-for-smol", - "feature-extension-for-wasm-bindgen-futures", - "futures-util", - "paste", - "pin-project", - "pin-project-lite", - "tokio", -] - [[package]] name = "ahash" version = "0.8.12" @@ -562,116 +533,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "async-channel" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.3" -version = "1.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" -checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "pin-project-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.2.0" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.6.0" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" -checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" -dependencies = [ - "autocfg", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "windows-sys 0.61.2", - "windows-sys 0.61.2", -] - -[[package]] -name = "async-lock" -version = "3.4.2" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" -checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" -dependencies = [ - "event-listener", - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-process" -version = "2.5.0" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -dependencies = [ - "async-channel", - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener", - "event-listener", - "futures-lite", - "rustix", -] - [[package]] name = "async-recursion" version = "1.1.1" @@ -683,39 +544,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async-signal" -version = "0.2.13" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.61.2", - "windows-sys 0.61.2", -] - -[[package]] -name = "async-sqlite" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556a4163d701c7d3e28c89917294cea8d2a05092c92a50307c0f2d1742058ced" -dependencies = [ - "crossbeam-channel", - "futures-channel", - "futures-util", - "rusqlite", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -738,12 +566,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - [[package]] name = "async-trait" version = "0.1.89" @@ -757,16 +579,6 @@ dependencies = [ "syn", ] -[[package]] -name = "atomic-time" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9622f5c6fb50377516c70f65159e70b25465409760c6bd6d4e581318bf704e83" -dependencies = [ - "once_cell", - "portable-atomic", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -876,15 +688,6 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "2.10.0" @@ -910,20 +713,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blocking" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" -dependencies = [ - "async-channel", - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - [[package]] name = "brotli" version = "8.0.2" @@ -1167,15 +956,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.15.11" @@ -1368,15 +1148,15 @@ dependencies = [ [[package]] name = "cosmian_findex" -version = "8.0.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b68f0bc9f2fdcdd01cbe32e2061c0a7c670a39b66d4178f394fa108ffbcfe5" +checksum = "d65dc3cc50a14e772350b8ed87da19830856ce7d90e6f6f37870ffb8c0f923c2" dependencies = [ - "aes 0.8.4", - "agnostic-lite", + "aes", "cosmian_crypto_core", "cosmian_sse_memories", "criterion", + "tokio", "xts-mode", ] @@ -1434,12 +1214,10 @@ dependencies = [ "actix-tls", "actix-web", "alcoholic_jwt", - "async-sqlite", "async-trait", "chrono", "clap", "cosmian_crypto_core", - "cosmian_findex", "cosmian_findex_structs", "cosmian_logger 0.6.0", "cosmian_sse_memories", @@ -1448,11 +1226,13 @@ dependencies = [ "openssl", "redis", "reqwest", + "rusqlite", "serde", "serde_json", "tempfile", "thiserror 2.0.17", "tokio", + "tokio-rusqlite", "toml 0.9.11+spec-1.1.0", "tracing", "url", @@ -1804,18 +1584,16 @@ dependencies = [ name = "cosmian_pkcs11_module" version = "1.7.1" dependencies = [ - "bincode", "const-oid", "cosmian_logger 0.6.0", "hex", "log", "once_cell", + "openssl", "p256", "pkcs1", "pkcs11-sys", "rand 0.9.2", - "rand 0.9.2", - "rsa", "serial_test", "strum_macros 0.26.4", "thiserror 2.0.17", @@ -1825,11 +1603,10 @@ dependencies = [ [[package]] name = "cosmian_sse_memories" -version = "8.0.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21de5515e966a676e8d85097960e9c69c134eafdb6044b381d7ffff60c6b8c1" +checksum = "48c34c748901cac5415742e6eef7a79024b924ab9ea28d030baf455784b9cc62" dependencies = [ - "agnostic-lite", "cosmian_crypto_core", "redis", "tokio", @@ -2392,8 +2169,7 @@ checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2407,30 +2183,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "event-listener" -version = "5.4.1" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" -dependencies = [ - "event-listener", - "event-listener", - "pin-project-lite", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2455,33 +2207,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "feature-extension-for-smol" -version = "0.2.3" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680af37225fbd411cf212f49aff82d8d00c5a882d68a9d35d725370387f163ce" -checksum = "680af37225fbd411cf212f49aff82d8d00c5a882d68a9d35d725370387f163ce" -dependencies = [ - "async-io", - "futures-channel", - "futures-util", - "smol", -] - -[[package]] -name = "feature-extension-for-wasm-bindgen-futures" -version = "0.2.3" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c72525d3b1e0d516efba1ea6bf303774580ebe57c4b55cab5fc4c1d9c86bb2" -checksum = "97c72525d3b1e0d516efba1ea6bf303774580ebe57c4b55cab5fc4c1d9c86bb2" -dependencies = [ - "futures-channel", - "futures-timer", - "wasm-bindgen-futures", -] - [[package]] name = "ff" version = "0.13.1" @@ -2622,19 +2347,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-lite" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" version = "0.3.31" @@ -2658,17 +2370,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers", - "gloo-timers", - "send_wrapper", -] - [[package]] name = "futures-util" version = "0.3.31" @@ -2762,19 +2463,6 @@ version = "0.3.3" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] [[package]] name = "group" @@ -3116,8 +2804,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.1", - "socket2 0.6.1", + "socket2 0.5.10", "system-configuration", "tokio", "tower-service", @@ -3814,8 +3501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3890,7 +3576,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -4195,12 +3880,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - [[package]] name = "parking_lot" version = "0.12.5" @@ -4240,12 +3919,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pem" version = "3.0.6" @@ -4326,17 +3999,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkcs1" version = "0.7.5" @@ -4344,7 +4006,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ "der", - "pkcs8", "spki", ] @@ -4398,23 +4059,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "polling" -version = "3.11.0" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" -checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix", - "windows-sys 0.61.2", - "windows-sys 0.61.2", -] - [[package]] name = "poly1305" version = "0.8.0" @@ -4438,12 +4082,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" - [[package]] name = "postgres-openssl" version = "0.5.2" @@ -4891,26 +4529,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rusqlite" version = "0.37.0" @@ -4966,8 +4584,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5126,13 +4743,6 @@ version = "1.0.27" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" - -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" @@ -5389,24 +4999,6 @@ dependencies = [ "cosmian_kms_base_hsm", ] -[[package]] -name = "smol" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" -dependencies = [ - "async-channel", - "async-channel", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-net", - "async-process", - "blocking", - "futures-lite", -] - [[package]] name = "socket2" version = "0.5.10" @@ -5597,7 +5189,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6550,8 +6142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 813b8470..4dcc38d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,8 +50,8 @@ cosmian_crypto_core = { version = "10.2", default-features = false, features = [ "ser", ] } cosmian_findex_cli = { path = "findex-server/crate/cli", version = "0.4.11" } -cosmian_kms_cli = { path = "kms/crate/cli", version = "5.14.1" } -test_kms_server = { path = "kms/crate/test_kms_server", version = "5.14.1" } +cosmian_kms_cli = { path = "kms/crate/cli", version = "5.15.0" } +test_kms_server = { path = "kms/crate/test_kms_server", version = "5.15.0" } cosmian_logger = "0.6" der = { version = "0.7", default-features = false } hex = { version = "0.4", default-features = false } @@ -92,4 +92,3 @@ libloading = "0.8" # Findex deps cosmian_findex = "8.0" cosmian_sse_memories = "8.0" -async-sqlite = { version = "0.5" } diff --git a/crate/cli/src/config.rs b/crate/cli/src/config.rs index f2e38ca2..8708fe4e 100644 --- a/crate/cli/src/config.rs +++ b/crate/cli/src/config.rs @@ -83,6 +83,7 @@ mod tests { use cosmian_config_utils::{ConfigUtils, get_default_conf_path}; use cosmian_logger::log_init; + use tempfile::tempdir; use super::ClientConfig; use crate::config::{COSMIAN_CLI_CONF_ENV, COSMIAN_CLI_CONF_PATH}; @@ -90,6 +91,9 @@ mod tests { #[test] pub(crate) fn test_load() { log_init(None); + let original_conf_env = env::var(COSMIAN_CLI_CONF_ENV).ok(); + let original_home = env::var("HOME").ok(); + // valid conf unsafe { env::set_var(COSMIAN_CLI_CONF_ENV, "../../test_data/configs/cosmian.toml"); @@ -109,15 +113,15 @@ mod tests { unsafe { env::remove_var(COSMIAN_CLI_CONF_ENV); } - drop(fs::remove_file( - get_default_conf_path(COSMIAN_CLI_CONF_PATH).unwrap(), - )); + let home_dir = tempdir().unwrap(); + unsafe { + env::set_var("HOME", home_dir.path()); + } + let default_conf_path = get_default_conf_path(COSMIAN_CLI_CONF_PATH).unwrap(); + fs::create_dir_all(default_conf_path.parent().unwrap()).unwrap(); + fs::copy("../../test_data/configs/cosmian.toml", &default_conf_path).unwrap(); assert!(ClientConfig::load(None).is_ok()); - assert!( - get_default_conf_path(COSMIAN_CLI_CONF_PATH) - .unwrap() - .exists() - ); + assert!(default_conf_path.exists()); // invalid conf unsafe { @@ -138,5 +142,23 @@ mod tests { .unwrap(); assert!(ClientConfig::from_toml(conf_path.to_str().unwrap()).is_ok()); + + // restore env + match original_conf_env { + Some(v) => unsafe { + env::set_var(COSMIAN_CLI_CONF_ENV, v); + }, + None => unsafe { + env::remove_var(COSMIAN_CLI_CONF_ENV); + }, + } + match original_home { + Some(v) => unsafe { + env::set_var("HOME", v); + }, + None => unsafe { + env::remove_var("HOME"); + }, + } } } diff --git a/crate/cli/src/tests/kms/access.rs b/crate/cli/src/tests/kms/access.rs index 64e0c319..0db90541 100644 --- a/crate/cli/src/tests/kms/access.rs +++ b/crate/cli/src/tests/kms/access.rs @@ -4,7 +4,6 @@ use std::{ time::{SystemTime, UNIX_EPOCH}, }; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::reexport::cosmian_kms_client_utils::symmetric_utils::DataEncryptionAlgorithm, @@ -23,7 +22,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ shared::{ExportKeyParams, destroy, export_key, revoke}, symmetric::encrypt_decrypt::run_encrypt_decrypt_test, @@ -78,7 +76,7 @@ pub(crate) fn grant_access( user: &str, operations: &[&str], ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -107,7 +105,7 @@ pub(crate) fn revoke_access( user: &str, operations: &[&str], ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -131,7 +129,7 @@ pub(crate) fn revoke_access( /// List accesses granted on an object fn list_access(cli_conf_path: &str, object_id: &str) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -150,7 +148,7 @@ fn list_access(cli_conf_path: &str, object_id: &str) -> CosmianResult { /// List objects owned by the user fn list_owned_objects(cli_conf_path: &str) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); @@ -167,7 +165,7 @@ fn list_owned_objects(cli_conf_path: &str) -> CosmianResult { /// List accesses granted fn list_accesses_rights_obtained(cli_conf_path: &str) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) diff --git a/crate/cli/src/tests/kms/attributes/delete.rs b/crate/cli/src/tests/kms/attributes/delete.rs index 40aa7269..61849ae1 100644 --- a/crate/cli/src/tests/kms/attributes/delete.rs +++ b/crate/cli/src/tests/kms/attributes/delete.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::{ actions::kms::attributes::SetOrDeleteAttributes, reexport::cosmian_kms_client::kmip_2_1::kmip_types::Tag, @@ -10,10 +9,7 @@ use super::set::prepare_attributes; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::{ - PROG_NAME, - kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, - }, + tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, }; pub(crate) fn delete_attributes( @@ -33,7 +29,7 @@ pub(crate) fn delete_attributes( args.push(reference.to_string()); } } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/attributes/get.rs b/crate/cli/src/tests/kms/attributes/get.rs index 224bd93a..5b32c08b 100644 --- a/crate/cli/src/tests/kms/attributes/get.rs +++ b/crate/cli/src/tests/kms/attributes/get.rs @@ -1,6 +1,5 @@ use std::{collections::HashMap, process::Command}; -use assert_cmd::cargo::CommandCargoExt; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ kmip_2_1::kmip_types::Tag, reexport::cosmian_kms_client_utils::attributes_utils::CLinkType, @@ -13,10 +12,7 @@ use crate::{ CosmianError, result::{CosmianResult, CosmianResultHelper}, }, - tests::{ - PROG_NAME, - kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, - }, + tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, }; pub(crate) fn get_attributes( @@ -55,7 +51,7 @@ pub(crate) fn get_attributes( args.push(name); } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/attributes/set.rs b/crate/cli/src/tests/kms/attributes/set.rs index bc96aa11..0229bc9e 100644 --- a/crate/cli/src/tests/kms/attributes/set.rs +++ b/crate/cli/src/tests/kms/attributes/set.rs @@ -1,15 +1,11 @@ use std::process::Command; -use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::actions::kms::attributes::SetOrDeleteAttributes; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::{ - PROG_NAME, - kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, - }, + tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, }; pub(crate) fn prepare_attributes( @@ -109,7 +105,7 @@ pub(crate) fn set_attributes( ) -> CosmianResult { let args = prepare_attributes("set", requested_attributes); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/auth_tests.rs b/crate/cli/src/tests/kms/auth_tests.rs index 0cf6f1a0..f08c5edf 100644 --- a/crate/cli/src/tests/kms/auth_tests.rs +++ b/crate/cli/src/tests/kms/auth_tests.rs @@ -22,7 +22,7 @@ use crate::{ config::{COSMIAN_CLI_CONF_ENV, ClientConfig}, error::result::CosmianResult, tests::{ - PROG_NAME, force_save_kms_cli_config, + force_save_kms_cli_config, kms::{ access::SUB_COMMAND, shared::{ExportKeyParams, export_key}, @@ -51,7 +51,7 @@ fn run_owned_cli_command(owner_client_conf_path: &str) { } ); } - let mut cmd = Command::cargo_bin(PROG_NAME).expect(" cargo bin failed"); + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); @@ -80,7 +80,7 @@ fn run_owned_cli_command_expect_failure(owner_client_conf_path: &str) { } ); } - let mut cmd = Command::cargo_bin(PROG_NAME).expect(" cargo bin failed"); + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); diff --git a/crate/cli/src/tests/kms/certificates/certify.rs b/crate/cli/src/tests/kms/certificates/certify.rs index 6ece1f0a..5a86150a 100644 --- a/crate/cli/src/tests/kms/certificates/certify.rs +++ b/crate/cli/src/tests/kms/certificates/certify.rs @@ -1,6 +1,5 @@ use std::{path::PathBuf, process::Command}; -use assert_cmd::cargo::CommandCargoExt; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ cosmian_kmip::{ @@ -28,7 +27,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -59,7 +57,7 @@ pub(crate) struct CertifyOp { } pub(crate) fn certify(cli_conf_path: &str, certify_op: CertifyOp) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["certify".to_owned()]; diff --git a/crate/cli/src/tests/kms/certificates/encrypt.rs b/crate/cli/src/tests/kms/certificates/encrypt.rs index 861d95e9..ef6f7453 100644 --- a/crate/cli/src/tests/kms/certificates/encrypt.rs +++ b/crate/cli/src/tests/kms/certificates/encrypt.rs @@ -1,6 +1,5 @@ use std::{fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::cosmian_kms_client::{ read_bytes_from_file, reexport::cosmian_kms_client_utils::{ @@ -19,7 +18,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::import::{ImportCertificateInput, import_certificate}, @@ -39,7 +37,7 @@ pub(crate) fn encrypt( authentication_data: Option<&str>, encryption_algorithm: Option, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt", "--certificate-id", certificate_id, input_file]; @@ -74,7 +72,7 @@ pub(crate) fn decrypt( authentication_data: Option<&str>, encryption_algorithm: Option, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", "--key-id", private_key_id, input_file]; diff --git a/crate/cli/src/tests/kms/certificates/export.rs b/crate/cli/src/tests/kms/certificates/export.rs index 70fa4472..987e5287 100644 --- a/crate/cli/src/tests/kms/certificates/export.rs +++ b/crate/cli/src/tests/kms/certificates/export.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::reexport::cosmian_kms_client::{ cosmian_kmip::ttlv::{TTLV, from_ttlv}, kmip_2_1::{ @@ -32,7 +31,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -418,7 +416,7 @@ pub(crate) fn export_certificate( if allow_revoked { args.push("--allow-revoked".to_owned()); } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("certificates").args(args); diff --git a/crate/cli/src/tests/kms/certificates/import.rs b/crate/cli/src/tests/kms/certificates/import.rs index 6e545056..c4b6ff35 100644 --- a/crate/cli/src/tests/kms/certificates/import.rs +++ b/crate/cli/src/tests/kms/certificates/import.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::{ cosmian_kms_client::reexport::cosmian_kms_client_utils::import_utils::{ CertificateInputFormat, KeyUsage, @@ -11,7 +10,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, @@ -73,7 +71,7 @@ pub(crate) fn import_certificate( unwrap, replace_existing, } = import_certificate_input; - let mut cmd = Command::cargo_bin(PROG_NAME).unwrap(); + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["import".to_owned(), key_file.to_owned()]; diff --git a/crate/cli/src/tests/kms/certificates/validate.rs b/crate/cli/src/tests/kms/certificates/validate.rs index a9f80db2..5d314477 100644 --- a/crate/cli/src/tests/kms/certificates/validate.rs +++ b/crate/cli/src/tests/kms/certificates/validate.rs @@ -1,6 +1,5 @@ use std::{path::PathBuf, process::Command}; -use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::reexport::{ cosmian_kms_client::reexport::cosmian_kms_client_utils::import_utils::CertificateInputFormat, }; @@ -12,7 +11,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -94,7 +92,7 @@ pub(crate) fn validate_certificate( uids: Vec, date: Option, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["validate".to_owned()]; for uid in uids { diff --git a/crate/cli/src/tests/kms/cover_crypt/access_structure.rs b/crate/cli/src/tests/kms/cover_crypt/access_structure.rs index 4ff218db..bd964590 100644 --- a/crate/cli/src/tests/kms/cover_crypt/access_structure.rs +++ b/crate/cli/src/tests/kms/cover_crypt/access_structure.rs @@ -9,7 +9,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -55,7 +54,7 @@ async fn test_view_access_structure() -> CosmianResult<()> { // read the bytes from the exported file // let object = read_object_from_json_ttlv_file(&tmp_path.join("output.export"))?; - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec![ @@ -71,7 +70,7 @@ async fn test_view_access_structure() -> CosmianResult<()> { .stdout(predicate::str::contains("Top Secret")) .stdout(predicate::str::contains("RnD")); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec![ @@ -100,7 +99,7 @@ pub(crate) async fn rename( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -128,7 +127,7 @@ pub(crate) async fn add( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -155,7 +154,7 @@ pub(crate) async fn disable( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -182,7 +181,7 @@ pub(crate) async fn remove( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ diff --git a/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs b/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs index 8f6a53aa..8b76aaa2 100644 --- a/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs @@ -1,6 +1,5 @@ use std::{fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::cosmian_kms_client::read_bytes_from_file; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -9,7 +8,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -31,7 +29,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt", "--key-id", public_key_id]; @@ -64,7 +62,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs b/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs index a2f32949..226a31ab 100644 --- a/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs +++ b/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -8,7 +7,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -27,7 +25,7 @@ pub(crate) fn create_cc_master_key_pair( tags: &[&str], sensitive: bool, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create-master-key-pair", policy_option, file]; diff --git a/crate/cli/src/tests/kms/cover_crypt/rekey.rs b/crate/cli/src/tests/kms/cover_crypt/rekey.rs index de9e0560..2b12dddd 100644 --- a/crate/cli/src/tests/kms/cover_crypt/rekey.rs +++ b/crate/cli/src/tests/kms/cover_crypt/rekey.rs @@ -1,6 +1,5 @@ use std::{path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::{ @@ -25,7 +24,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -47,7 +45,7 @@ pub(crate) fn rekey( master_secret_key_id: &str, access_policy: &str, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -72,7 +70,7 @@ pub(crate) fn prune( master_secret_key_id: &str, access_policy: &str, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ diff --git a/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs b/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs index 1d4cab17..bc6dec9f 100644 --- a/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs +++ b/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -8,7 +7,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::master_key_pair::create_cc_master_key_pair, @@ -25,7 +23,7 @@ pub(crate) fn create_user_decryption_key( tags: &[&str], sensitive: bool, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs b/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs index d484ff05..f60e99c5 100644 --- a/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs +++ b/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use clap::ValueEnum; use cosmian_kms_cli::{ actions::kms::{ @@ -27,7 +26,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{secret_data::create_secret::create_secret_data, utils::recover_cmd_logs}, save_kms_cli_config, }, @@ -37,7 +35,7 @@ const SUB_COMMAND: &str = "derive-key"; /// Run `cosmian kms derive-key` via the CLI and return the derived key unique identifier pub(crate) fn derive_key(cli_conf_path: &str, action: DeriveKeyAction) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // Build CLI args from the action diff --git a/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs b/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs index ab6e96e1..ed489516 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -8,7 +7,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -26,7 +24,7 @@ pub(crate) fn create_ec_key_pair( tags: &[&str], sensitive: bool, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create", "--curve", curve]; diff --git a/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs b/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs index 2bdf4622..90d4c1aa 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs @@ -11,7 +11,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, elliptic_curve::create_key_pair::create_ec_key_pair, utils::recover_cmd_logs, @@ -21,13 +20,14 @@ use crate::{ }; /// Encrypts a file using the given public key and access policy. +#[allow(clippy::unnecessary_wraps)] pub(crate) fn encrypt( cli_conf_path: &str, input_files: &[&str], public_key_id: &str, output_file: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt"]; @@ -54,7 +54,7 @@ pub(crate) fn decrypt( private_key_id: &str, output_file: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", input_file, "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs b/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs index 7af83f86..92707f91 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs @@ -1,6 +1,5 @@ use std::{fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -9,7 +8,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, elliptic_curve::create_key_pair::create_ec_key_pair, utils::recover_cmd_logs, @@ -26,7 +24,7 @@ fn ec_sign( output_file: Option<&str>, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign", input_file, "--key-id", key_id]; @@ -59,7 +57,7 @@ fn ec_sign_verify( key_id: &str, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign-verify", data_file, signature_file, "--key-id", key_id]; diff --git a/crate/cli/src/tests/kms/google_cmd/identities.rs b/crate/cli/src/tests/kms/google_cmd/identities.rs index fbd7b295..156f5b6c 100644 --- a/crate/cli/src/tests/kms/google_cmd/identities.rs +++ b/crate/cli/src/tests/kms/google_cmd/identities.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::{ cosmian_kms_client::{GmailApiConf, write_json_object_to_file}, test_kms_server::{TestsContext, start_default_test_kms_server}, @@ -37,7 +36,7 @@ fn list_identities( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") @@ -65,7 +64,7 @@ fn get_identities(cli_conf_path: &str, user_id: &str) -> Result Result<(), CosmianEr .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") @@ -113,7 +112,7 @@ fn insert_identities( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") diff --git a/crate/cli/src/tests/kms/google_cmd/key_pairs.rs b/crate/cli/src/tests/kms/google_cmd/key_pairs.rs index b09d1477..09592006 100644 --- a/crate/cli/src/tests/kms/google_cmd/key_pairs.rs +++ b/crate/cli/src/tests/kms/google_cmd/key_pairs.rs @@ -1,6 +1,5 @@ use std::{path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::{ google::key_pairs::create::CreateKeyPairsAction, symmetric::keys::create_key::CreateKeyAction, }; @@ -11,7 +10,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::certify::import_root_and_intermediate, @@ -75,7 +73,7 @@ fn create_keypairs( // Finish with user id args.push(action.user_id); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") diff --git a/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs b/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs index fdcc9eae..009bf42f 100644 --- a/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs +++ b/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use serde::Deserialize; @@ -53,7 +52,7 @@ fn list_keypairs(cli_conf_path: &str, user_id: &str) -> Result CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/mac.rs b/crate/cli/src/tests/kms/mac.rs index 034e31a8..e1775617 100644 --- a/crate/cli/src/tests/kms/mac.rs +++ b/crate/cli/src/tests/kms/mac.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::{ mac::{CHashingAlgorithm, MacAction}, @@ -16,7 +15,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs}, save_kms_cli_config, }, @@ -26,7 +24,7 @@ const SUB_COMMAND: &str = "mac"; /// Create a symmetric key via the CLI pub(crate) fn create_mac(cli_conf_path: &str, action: MacAction) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["--mac-key-id".to_owned(), action.mac_key_id]; diff --git a/crate/cli/src/tests/kms/rsa/create_key_pair.rs b/crate/cli/src/tests/kms/rsa/create_key_pair.rs index a957ed66..08b211b6 100644 --- a/crate/cli/src/tests/kms/rsa/create_key_pair.rs +++ b/crate/cli/src/tests/kms/rsa/create_key_pair.rs @@ -1,6 +1,5 @@ use std::{collections::HashSet, process::Command}; -use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -8,7 +7,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -32,7 +30,7 @@ pub(crate) fn create_rsa_key_pair( cli_conf_path: &str, options: &RsaKeyPairOptions, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create"]; diff --git a/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs b/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs index f16a6eb6..87a4649d 100644 --- a/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs @@ -1,6 +1,6 @@ use std::{collections::HashSet, fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; +use assert_cmd::assert::OutputAssertExt; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ read_bytes_from_file, @@ -16,7 +16,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, rsa::create_key_pair::{RsaKeyPairOptions, create_rsa_key_pair}, @@ -27,6 +26,7 @@ use crate::{ }; /// Encrypts a file using the given public key +#[allow(clippy::unnecessary_wraps)] pub(crate) fn encrypt( cli_conf_path: &str, input_files: &[&str], @@ -36,7 +36,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt"]; @@ -88,7 +88,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", input_file, "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/rsa/sign_verify.rs b/crate/cli/src/tests/kms/rsa/sign_verify.rs index 4c9edc84..c1e33861 100644 --- a/crate/cli/src/tests/kms/rsa/sign_verify.rs +++ b/crate/cli/src/tests/kms/rsa/sign_verify.rs @@ -1,6 +1,5 @@ use std::{fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -9,7 +8,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, rsa::create_key_pair::{RsaKeyPairOptions, create_rsa_key_pair}, @@ -27,7 +25,7 @@ fn rsa_sign( output_file: Option<&str>, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign", input_file, "--key-id", key_id]; @@ -60,7 +58,7 @@ fn rsa_sign_verify( key_id: &str, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign-verify", data_file, signature_file, "--key-id", key_id]; diff --git a/crate/cli/src/tests/kms/secret_data/create_secret.rs b/crate/cli/src/tests/kms/secret_data/create_secret.rs index 6725c29d..1e5b8076 100644 --- a/crate/cli/src/tests/kms/secret_data/create_secret.rs +++ b/crate/cli/src/tests/kms/secret_data/create_secret.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::{ secret_data::create_secret::CreateSecretDataAction, @@ -15,7 +14,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, @@ -29,7 +27,7 @@ pub(crate) fn create_secret_data( cli_conf_path: &str, action: &CreateSecretDataAction, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["secret-data", "create"]; diff --git a/crate/cli/src/tests/kms/secret_data/kmip_operations.rs b/crate/cli/src/tests/kms/secret_data/kmip_operations.rs index 1aced317..dc3f8484 100644 --- a/crate/cli/src/tests/kms/secret_data/kmip_operations.rs +++ b/crate/cli/src/tests/kms/secret_data/kmip_operations.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::secret_data::create_secret::CreateSecretDataAction; use cosmian_logger::{info, log_init}; use tempfile::TempDir; @@ -11,7 +10,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, secret_data::create_secret::create_secret_data, @@ -34,7 +32,7 @@ fn run_cosmian_cmd( expect_success: bool, cli_conf: Option<&str>, ) -> Result { - let mut cmd = Command::cargo_bin(PROG_NAME).unwrap(); + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); if let Some(conf) = cli_conf { cmd.env(COSMIAN_CLI_CONF_ENV, conf); } @@ -496,7 +494,7 @@ async fn test_secret_data_export_with_wrapping() -> CosmianResult<()> { let export_file_path = temp_dir.path().join("keyfile.bin"); let export_file_str = export_file_path.to_str().unwrap(); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.args([ KMS_SUBCOMMAND, diff --git a/crate/cli/src/tests/kms/secret_data/wrap_secret.rs b/crate/cli/src/tests/kms/secret_data/wrap_secret.rs index f5e1c413..0cc43e22 100644 --- a/crate/cli/src/tests/kms/secret_data/wrap_secret.rs +++ b/crate/cli/src/tests/kms/secret_data/wrap_secret.rs @@ -3,7 +3,6 @@ use std::{ process::Command, }; -use assert_cmd::prelude::CommandCargoExt; use base64::{Engine as _, engine::general_purpose}; use cosmian_kms_cli::{ actions::kms::{ @@ -29,7 +28,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, secret_data::create_secret::create_secret_data, @@ -47,7 +45,7 @@ pub(crate) fn export_object( object_id: &str, object_file: &str, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args: Vec = if sub_command == "sym" { @@ -99,7 +97,7 @@ pub(crate) fn wrap_secret_data( wrap_key_id: Option, wrap_key_file: Option, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ @@ -150,7 +148,7 @@ pub(crate) fn unwrap_secret_data( unwrap_key_id: Option, unwrap_key_file: Option, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/shared/destroy.rs b/crate/cli/src/tests/kms/shared/destroy.rs index 0367100a..555cec60 100644 --- a/crate/cli/src/tests/kms/shared/destroy.rs +++ b/crate/cli/src/tests/kms/shared/destroy.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::{ @@ -24,7 +23,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export::export_key, revoke::revoke}, @@ -48,7 +46,7 @@ pub(crate) fn destroy( if remove { args.push("--remove".to_owned()); } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(sub_command).args(args); diff --git a/crate/cli/src/tests/kms/shared/export.rs b/crate/cli/src/tests/kms/shared/export.rs index d55beed4..e5ff9638 100644 --- a/crate/cli/src/tests/kms/shared/export.rs +++ b/crate/cli/src/tests/kms/shared/export.rs @@ -2,7 +2,6 @@ use std::path::Path; use std::process::Command; -use assert_cmd::prelude::*; use clap::ValueEnum; #[cfg(feature = "non-fips")] use cosmian_kms_cli::reexport::cosmian_kms_client::{ @@ -36,7 +35,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs, }, @@ -111,7 +109,7 @@ pub(crate) fn export_key(params: ExportKeyParams) -> CosmianResult<()> { args.push(name); } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, params.cli_conf_path); // Ensure sufficient stack for the child process on Windows cmd.env("RUST_MIN_STACK", "16777216"); diff --git a/crate/cli/src/tests/kms/shared/import.rs b/crate/cli/src/tests/kms/shared/import.rs index 4782c49c..5cfd0fe7 100644 --- a/crate/cli/src/tests/kms/shared/import.rs +++ b/crate/cli/src/tests/kms/shared/import.rs @@ -2,7 +2,6 @@ use std::path::PathBuf; use std::process::Command; -use assert_cmd::prelude::*; #[cfg(feature = "non-fips")] use cosmian_kms_cli::reexport::cosmian_kms_client::{ kmip_2_1::kmip_types::CryptographicAlgorithm, read_object_from_json_ttlv_file, @@ -25,12 +24,9 @@ use crate::tests::kms::{ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::{ - PROG_NAME, - kms::{ - KMS_SUBCOMMAND, - utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, - }, + tests::kms::{ + KMS_SUBCOMMAND, + utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, }, }; @@ -50,7 +46,7 @@ pub(crate) struct ImportKeyParams { } pub(crate) fn import_key(params: ImportKeyParams) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, params.cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/shared/locate.rs b/crate/cli/src/tests/kms/shared/locate.rs index 8d767d27..fb8e6f0d 100644 --- a/crate/cli/src/tests/kms/shared/locate.rs +++ b/crate/cli/src/tests/kms/shared/locate.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::symmetric::keys::create_key::CreateKeyAction; #[cfg(feature = "non-fips")] use cosmian_logger::log_init; @@ -20,7 +19,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, @@ -57,7 +55,7 @@ pub(crate) fn locate( args.push(key_format_type.to_string()); } - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("locate").args(args); diff --git a/crate/cli/src/tests/kms/shared/revoke.rs b/crate/cli/src/tests/kms/shared/revoke.rs index 8a112958..51b5a862 100644 --- a/crate/cli/src/tests/kms/shared/revoke.rs +++ b/crate/cli/src/tests/kms/shared/revoke.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::actions::kms::symmetric::keys::create_key::CreateKeyAction; use tempfile::TempDir; use test_kms_server::{ @@ -18,7 +17,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export::export_key}, @@ -39,7 +37,7 @@ pub(crate) fn revoke( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(sub_command).args(args); diff --git a/crate/cli/src/tests/kms/shared/wrap_unwrap.rs b/crate/cli/src/tests/kms/shared/wrap_unwrap.rs index 079cfca7..74477632 100644 --- a/crate/cli/src/tests/kms/shared/wrap_unwrap.rs +++ b/crate/cli/src/tests/kms/shared/wrap_unwrap.rs @@ -3,7 +3,6 @@ use std::{ process::Command, }; -use assert_cmd::prelude::CommandCargoExt; use base64::{Engine as _, engine::general_purpose}; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, @@ -27,7 +26,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::master_key_pair::create_cc_master_key_pair, @@ -51,7 +49,7 @@ pub(crate) fn wrap( wrap_key_id: Option, wrap_key_file: Option, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ @@ -103,7 +101,7 @@ pub(crate) fn unwrap( unwrap_key_id: Option, unwrap_key_file: Option, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/symmetric/create_key.rs b/crate/cli/src/tests/kms/symmetric/create_key.rs index 843ae25f..73e7de83 100644 --- a/crate/cli/src/tests/kms/symmetric/create_key.rs +++ b/crate/cli/src/tests/kms/symmetric/create_key.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use base64::{Engine as _, engine::general_purpose}; use clap::ValueEnum; use cosmian_kms_cli::{ @@ -20,7 +19,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{extract_uids::extract_uid, recover_cmd_logs}, @@ -34,7 +32,7 @@ pub(crate) fn create_symmetric_key( cli_conf_path: &str, action: CreateKeyAction, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys".to_owned(), "create".to_owned()]; diff --git a/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs b/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs index 84a6020e..b00d9c37 100644 --- a/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs @@ -1,6 +1,5 @@ use std::{fs, path::PathBuf, process::Command}; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::{ DecryptAction, EncryptAction, KeyEncryptionAlgorithm, keys::create_key::CreateKeyAction, @@ -22,7 +21,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs, }, @@ -40,7 +38,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ @@ -83,7 +81,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/symmetric/rekey.rs b/crate/cli/src/tests/kms/symmetric/rekey.rs index 0daf2ea2..a7d6c5b1 100644 --- a/crate/cli/src/tests/kms/symmetric/rekey.rs +++ b/crate/cli/src/tests/kms/symmetric/rekey.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::read_object_from_json_ttlv_file, @@ -13,7 +12,6 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ - PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export_key}, @@ -29,7 +27,7 @@ pub(crate) fn rekey_symmetric_key( cli_conf_path: &str, unique_identifier: &str, ) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // Ensure sufficient stack for the child process on Windows cmd.env("RUST_MIN_STACK", "16777216"); diff --git a/crate/cli/src/tests/kms/utils/cmd_logs.rs b/crate/cli/src/tests/kms/utils/cmd_logs.rs index 6dff72ed..2bc4cd81 100644 --- a/crate/cli/src/tests/kms/utils/cmd_logs.rs +++ b/crate/cli/src/tests/kms/utils/cmd_logs.rs @@ -1,8 +1,34 @@ use std::{ io::Write, + path::{Path, PathBuf}, process::{Command, Output, Stdio}, + sync::OnceLock, }; +use assert_cmd::prelude::*; + +use crate::tests::PROG_NAME; + +static COSMIAN_EXE: OnceLock = OnceLock::new(); + +#[allow(deprecated)] +fn resolve_cosmian_exe() -> PathBuf { + let cmd = Command::cargo_bin(PROG_NAME).unwrap_or_else(|e| { + panic!("failed to locate `{PROG_NAME}` binary via `Command::cargo_bin`: {e}") + }); + + let path = PathBuf::from(cmd.get_program()); + assert!( + path.exists(), + "`cargo_bin({PROG_NAME:?})` resolved to {path:?}, but it does not exist" + ); + path +} + +pub(crate) fn cosmian_exe() -> &'static Path { + COSMIAN_EXE.get_or_init(resolve_cosmian_exe).as_path() +} + /// Recover output logs from a command call `cmd` and re-inject it into stdio pub(crate) fn recover_cmd_logs(cmd: &mut Command) -> Output { let output = cmd diff --git a/crate/cli/src/tests/kms/utils/mod.rs b/crate/cli/src/tests/kms/utils/mod.rs index 256c03f2..926386c4 100644 --- a/crate/cli/src/tests/kms/utils/mod.rs +++ b/crate/cli/src/tests/kms/utils/mod.rs @@ -1,4 +1,4 @@ -pub(crate) use cmd_logs::recover_cmd_logs; +pub(crate) use cmd_logs::{cosmian_exe, recover_cmd_logs}; mod cmd_logs; #[expect(dead_code)] diff --git a/crate/cli/src/tests/kms/version.rs b/crate/cli/src/tests/kms/version.rs index 3cce4169..d78a7cd9 100644 --- a/crate/cli/src/tests/kms/version.rs +++ b/crate/cli/src/tests/kms/version.rs @@ -1,6 +1,5 @@ use std::process::Command; -use assert_cmd::prelude::*; use cosmian_logger::{error, info, log_init}; use test_kms_server::start_default_test_kms_server; @@ -8,14 +7,14 @@ use super::KMS_SUBCOMMAND; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::{PROG_NAME, kms::utils::recover_cmd_logs, save_kms_cli_config}, + tests::{kms::utils::recover_cmd_logs, save_kms_cli_config}, }; const SUB_COMMAND: &str = "server-version"; /// Request server-version pub(crate) fn server_version(cli_conf_path: &str, kms_url: &str) -> CosmianResult { - let mut cmd = Command::cargo_bin(PROG_NAME)?; + let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // for local test use: export KMS_URL=http://host.docker.internal:9998 diff --git a/crate/cli/src/tests/mod.rs b/crate/cli/src/tests/mod.rs index db504d61..294d2d26 100644 --- a/crate/cli/src/tests/mod.rs +++ b/crate/cli/src/tests/mod.rs @@ -7,10 +7,10 @@ use test_kms_server::TestsContext; use crate::config::ClientConfig; -pub(crate) mod kms; - pub(crate) const PROG_NAME: &str = "cosmian"; +pub(crate) mod kms; + pub(crate) fn save_kms_cli_config(kms_ctx: &TestsContext) -> (String, String) { let owner_file_path = env::temp_dir() .join(format!("owner_{}.toml", kms_ctx.server_port)) diff --git a/crate/pkcs11/module/Cargo.toml b/crate/pkcs11/module/Cargo.toml index eec5745b..e25a535a 100644 --- a/crate/pkcs11/module/Cargo.toml +++ b/crate/pkcs11/module/Cargo.toml @@ -15,11 +15,11 @@ doctest = false non-fips = [] [dependencies] -bincode = "1.3.3" const-oid = "0.9.6" hex = { workspace = true, features = ["std"] } log = { workspace = true, default-features = false } once_cell = "1.21.3" +openssl = { workspace = true } p256 = { version = "0.13.2", default-features = false, features = [ "arithmetic", "pkcs8", @@ -28,7 +28,6 @@ p256 = { version = "0.13.2", default-features = false, features = [ pkcs1 = "0.7.5" pkcs11-sys = { workspace = true } rand = { workspace = true } -rsa = "0.9" strum_macros = "0.26.4" thiserror = { workspace = true } cosmian_logger = { workspace = true } diff --git a/crate/pkcs11/module/src/core/object.rs b/crate/pkcs11/module/src/core/object.rs index fd210b22..c54723a3 100644 --- a/crate/pkcs11/module/src/core/object.rs +++ b/crate/pkcs11/module/src/core/object.rs @@ -21,13 +21,12 @@ use std::sync::Arc; use cosmian_logger::debug; use log::error; +use openssl::pkey::PKey; use p256::{elliptic_curve::sec1::ToEncodedPoint, pkcs8::der::Encode}; -use pkcs1::EncodeRsaPrivateKey; use pkcs11_sys::{ CK_CERTIFICATE_CATEGORY_UNSPECIFIED, CK_PROFILE_ID, CKC_X_509, CKO_CERTIFICATE, CKO_DATA, CKO_PRIVATE_KEY, CKO_PROFILE, CKO_PUBLIC_KEY, }; -use rsa::{RsaPrivateKey, pkcs8::DecodePrivateKey, traits::PublicKeyParts}; use crate::{ ModuleError, ModuleResult, @@ -164,21 +163,33 @@ impl Object { AttributeType::Label => Some(Attribute::Label("Private Key".to_owned())), AttributeType::Modulus => { let der_bytes = private_key.pkcs8_der_bytes()?; - let sk = RsaPrivateKey::from_pkcs8_der(der_bytes.as_ref()).map_err(|e| { - error!("Failed to fetch the PKCS1 DER bytes: {e:?}"); - ModuleError::Cryptography("Failed to fetch the PKCS1 DER bytes".to_owned()) + let pkey = PKey::private_key_from_der(der_bytes.as_ref()).map_err(|e| { + error!("Failed to parse RSA private key from PKCS#8 DER: {e:?}"); + ModuleError::Cryptography( + "Failed to parse RSA private key from PKCS#8 DER".to_owned(), + ) })?; - Some(Attribute::Modulus(sk.n().to_bytes_be())) + let rsa = pkey.rsa().map_err(|e| { + error!("Failed to extract RSA key parameters: {e:?}"); + ModuleError::Cryptography("Failed to extract RSA key parameters".to_owned()) + })?; + Some(Attribute::Modulus(rsa.n().to_vec())) } AttributeType::NeverExtractable => Some(Attribute::NeverExtractable(true)), AttributeType::Private => Some(Attribute::Private(true)), AttributeType::PublicExponent => { let der_bytes = private_key.pkcs8_der_bytes()?; - let sk = RsaPrivateKey::from_pkcs8_der(der_bytes.as_ref()).map_err(|e| { - error!("Failed to fetch the PKCS1 DER bytes: {e:?}"); - ModuleError::Cryptography("Failed to fetch the PKCS1 DER bytes".to_owned()) + let pkey = PKey::private_key_from_der(der_bytes.as_ref()).map_err(|e| { + error!("Failed to parse RSA private key from PKCS#8 DER: {e:?}"); + ModuleError::Cryptography( + "Failed to parse RSA private key from PKCS#8 DER".to_owned(), + ) + })?; + let rsa = pkey.rsa().map_err(|e| { + error!("Failed to extract RSA key parameters: {e:?}"); + ModuleError::Cryptography("Failed to extract RSA key parameters".to_owned()) })?; - Some(Attribute::PublicExponent(sk.e().to_bytes_be())) + Some(Attribute::PublicExponent(rsa.e().to_vec())) } AttributeType::Sensitive => Some(Attribute::Sensitive(true)), AttributeType::Sign => Some(Attribute::Sign(true)), @@ -188,16 +199,20 @@ impl Object { AttributeType::Value => match private_key.algorithm() { KeyAlgorithm::Rsa => { let der_bytes = private_key.pkcs8_der_bytes()?; - RsaPrivateKey::from_pkcs8_der(der_bytes.as_ref()) - .map(|sk| sk.to_pkcs1_der()) - .map_err(|e| { - error!("Failed to fetch the PKCS1 DER bytes: {e:?}"); - ModuleError::Cryptography( - "Failed to fetch the PKCS1 DER bytes".to_owned(), - ) - })? - .map(|sd| Attribute::Value(sd.to_bytes().to_vec())) - .ok() + let pkey = PKey::private_key_from_der(der_bytes.as_ref()).map_err(|e| { + error!("Failed to parse RSA private key from PKCS#8 DER: {e:?}"); + ModuleError::Cryptography( + "Failed to parse RSA private key from PKCS#8 DER".to_owned(), + ) + })?; + let rsa = pkey.rsa().map_err(|e| { + error!("Failed to extract RSA key parameters: {e:?}"); + ModuleError::Cryptography( + "Failed to extract RSA key parameters".to_owned(), + ) + })?; + + rsa.private_key_to_der().map(Attribute::Value).ok() } KeyAlgorithm::EccP256 | KeyAlgorithm::Secp224k1 diff --git a/crate/pkcs11/module/src/error/mod.rs b/crate/pkcs11/module/src/error/mod.rs index c00975c7..d14b66c7 100644 --- a/crate/pkcs11/module/src/error/mod.rs +++ b/crate/pkcs11/module/src/error/mod.rs @@ -93,8 +93,6 @@ pub enum ModuleError { #[error(transparent)] Backend(#[from] Box), #[error(transparent)] - Bincode(#[from] Box), - #[error(transparent)] Pkcs1DerError(#[from] pkcs1::der::Error), #[error(transparent)] ReadGuardError(#[from] PoisonError>), @@ -139,7 +137,6 @@ impl From for CK_RV { ModuleError::Backend(_) | ModuleError::AlgorithmNotSupported(_) | ModuleError::Default(_) - | ModuleError::Bincode(_) | ModuleError::FromUtf8(_) | ModuleError::FromVecWithNul(_) | ModuleError::NullPtr(_) diff --git a/deny.toml b/deny.toml index 87682b77..03404387 100644 --- a/deny.toml +++ b/deny.toml @@ -70,9 +70,6 @@ feature-depth = 1 # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ - { id = "RUSTSEC-2023-0071", reason = "rsa: Marvin Attack: potential key recovery through timing side channels" }, - { id = "RUSTSEC-2024-0436", reason = "A transitive dependency (`paste`) is not maintained anymore; tracked upstream (agnostic-lite) for replacement." }, - { id = "RUSTSEC-2025-0141", reason = "bincode is used transitively (via cosmian_pkcs11_module); advisory is informational (unmaintained) and there is no safe upgrade available." }, #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" }, #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" }, @@ -103,9 +100,6 @@ allow = [ "BSL-1.0", "BUSL-1.1", "Unicode-3.0", - "OpenSSL", - "CDLA-Permissive-2.0", - "AGPL-3.0-or-later" ] # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the diff --git a/documentation/docs/cli/main_commands.md b/documentation/docs/cli/main_commands.md index 54a9c634..2e5bb87e 100644 --- a/documentation/docs/cli/main_commands.md +++ b/documentation/docs/cli/main_commands.md @@ -609,6 +609,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -1386,6 +1388,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -1587,10 +1591,6 @@ Possible values: `"nist-p192", "nist-p224", "nist-p256", "nist-p384", "nist-p52 `--tag [-t] ` Tag to use to retrieve the key when no key id is specified. To specify multiple tags, use the option multiple times -`--signature-algorithm [-s] ` The signature algorithm - -Possible values: `"ecdsa-with-sha256", "ecdsa-with-sha384", "ecdsa-with-sha512"` [default: `"ecdsa-with-sha256"`] - `--output-file [-o] ` The signature output file path `--digested ` Treat input as already-digested data (pre-hash) @@ -1618,10 +1618,6 @@ Verify an ECDSA signature for a given data file `--tag [-t] ` Tag to use to retrieve the key when no key id is specified. To specify multiple tags, use the option multiple times -`--signature-algorithm [-s] ` The signature algorithm - -Possible values: `"ecdsa-with-sha256", "ecdsa-with-sha384", "ecdsa-with-sha512"` [default: `"ecdsa-with-sha256"`] - `--output-file [-o] ` Optional output file path `--digested ` Treat data input as already-digested (pre-hash) @@ -2275,6 +2271,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -2496,10 +2494,6 @@ Digital signature supported is RSASSA-PSS `--tag [-t] ` Tag to use to retrieve the key when no key id is specified. To specify multiple tags, use the option multiple times -`--signature-algorithm [-s] ` The signature algorithm - -Possible values: `"rsassapss"` [default: `"rsassapss"`] - `--output-file [-o] ` The signature output file path `--digested ` Treat input as already-digested data (pre-hash) @@ -2527,10 +2521,6 @@ Verify an RSASSA-PSS signature for a given data file `--tag [-t] ` Tag to use to retrieve the key when no key id is specified. To specify multiple tags, use the option multiple times -`--signature-algorithm [-s] ` The signature algorithm - -Possible values: `"rsassapss"` [default: `"rsassapss"`] - `--output-file [-o] ` Optional output file path `--digested ` Treat data input as already-digested (pre-hash) @@ -2635,6 +2625,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -2837,6 +2829,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -3133,6 +3127,8 @@ The possible wrapping algorithms are - `rsa-aes-key-wrap` (CKM-RSA-AES-KEY-WRP) - `rsa-pkcs-v15` (CKM-RSA v1.5) +Possible values: `"aes-key-wrap-padding", "nist-key-wrap", "aes-gcm", "rsa-pkcs-v15-sha1", "rsa-pkcs-v15", "rsa-oaep-sha1", "rsa-oaep", "rsa-aes-key-wrap-sha1", "rsa-aes-key-wrap"` + `--authenticated-additional-data [-d] ` Authenticated encryption additional data Only available for AES GCM wrapping @@ -3294,7 +3290,7 @@ Possible values: `"chacha20-poly1305", "aes-gcm", "aes-cbc", "aes-xts", "aes-gc `--key-encryption-algorithm [-e] ` The optional key encryption algorithm used to encrypt the data encryption key. -Possible values: `"chacha20-poly1305", "aes-gcm", "aes-xts", "aes-gcm-siv", "rfc5649"` +Possible values: `"chacha20-poly1305", "aes-gcm", "aes-xts", "aes-gcm-siv", "rfc3394", "rfc5649"` `--tag [-t] ` Tag to use to retrieve the key when no key id is specified. To specify multiple tags, use the option multiple times @@ -3329,7 +3325,7 @@ Possible values: `"chacha20-poly1305", "aes-gcm", "aes-cbc", "aes-xts", "aes-gc `--key-encryption-algorithm [-e] ` The optional key encryption algorithm used to decrypt the data encryption key. -Possible values: `"chacha20-poly1305", "aes-gcm", "aes-xts", "aes-gcm-siv", "rfc5649"` +Possible values: `"chacha20-poly1305", "aes-gcm", "aes-xts", "aes-gcm-siv", "rfc3394", "rfc5649"` `--output-file [-o] ` The encrypted output file path From 90d6b71f4c96d3c0b62aba5ec4c9a41684b5fdef Mon Sep 17 00:00:00 2001 From: Manuthor Date: Tue, 20 Jan 2026 21:15:10 +0100 Subject: [PATCH 3/7] fix: update kms and fs submodules From ffb79e56d44fc2935dac04514591e574d133d259 Mon Sep 17 00:00:00 2001 From: Manuthor Date: Wed, 21 Jan 2026 15:57:48 +0100 Subject: [PATCH 4/7] chore: bump KMS submodule --- kms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kms b/kms index c33791cc..b44a4a79 160000 --- a/kms +++ b/kms @@ -1 +1 @@ -Subproject commit c33791cc26656aa659248088751299e12125fad5 +Subproject commit b44a4a7931a6b660243e3fff8500e60e46d1cdb1 From 36ac5ece0ada601430a6d1fe579933ba5ac14304 Mon Sep 17 00:00:00 2001 From: Manuthor Date: Wed, 21 Jan 2026 16:05:47 +0100 Subject: [PATCH 5/7] fix: build after rebase --- Cargo.lock | 786 ++++++++++++-------------------------------------- findex-server | 2 +- 2 files changed, 192 insertions(+), 596 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cc6a2d8..743d920c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,10 +37,8 @@ dependencies = [ [[package]] name = "actix-files" version = "0.6.9" -version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" -checksum = "4009a8beb4dc78a58286ac9d58969ee0a8acecb7912d5ce898b4da4335579341" dependencies = [ "actix-http", "actix-service", @@ -49,7 +47,6 @@ dependencies = [ "bitflags", "bytes", "derive_more 2.1.1", - "derive_more 2.1.1", "futures-core", "http-range", "log", @@ -63,10 +60,8 @@ dependencies = [ [[package]] name = "actix-http" version = "3.11.2" -version = "3.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49" -checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49" dependencies = [ "actix-codec", "actix-rt", @@ -79,13 +74,11 @@ dependencies = [ "bytes", "bytestring", "derive_more 2.1.1", - "derive_more 2.1.1", "encoding_rs", "flate2", "foldhash 0.1.5", "futures-core", "h2 0.3.27", - "h2 0.3.27", "http 0.2.12", "httparse", "httpdate", @@ -96,7 +89,6 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rand 0.9.2", - "rand 0.9.2", "sha1", "smallvec", "tokio", @@ -149,10 +141,8 @@ dependencies = [ [[package]] name = "actix-rt" version = "2.11.0" -version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" -checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63" dependencies = [ "actix-macros", "futures-core", @@ -206,10 +196,8 @@ dependencies = [ [[package]] name = "actix-tls" version = "3.5.0" -version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6176099de3f58fbddac916a7f8c6db297e021d706e7a6b99947785fee14abe9f" -checksum = "6176099de3f58fbddac916a7f8c6db297e021d706e7a6b99947785fee14abe9f" dependencies = [ "actix-rt", "actix-service", @@ -237,10 +225,8 @@ dependencies = [ [[package]] name = "actix-web" version = "4.12.1" -version = "4.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6" -checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6" dependencies = [ "actix-codec", "actix-http", @@ -257,7 +243,6 @@ dependencies = [ "cfg-if", "cookie", "derive_more 2.1.1", - "derive_more 2.1.1", "encoding_rs", "foldhash 0.1.5", "futures-core", @@ -276,7 +261,6 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2 0.6.1", - "socket2 0.6.1", "time", "tracing", "url", @@ -306,7 +290,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common 0.1.7", + "crypto-common", "generic-array", ] @@ -317,18 +301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher 0.4.4", - "cpufeatures", -] - -[[package]] -name = "aes" -version = "0.9.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9e1c818b25efb32214df89b0ec22f01aa397aaeb718d1022bf0635a3bfd1a8" -dependencies = [ - "cfg-if", - "cipher 0.5.0-rc.5", + "cipher", "cpufeatures", ] @@ -339,8 +312,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", - "aes 0.8.4", - "cipher 0.4.4", + "aes", + "cipher", "ctr", "ghash", "subtle", @@ -354,8 +327,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", - "aes 0.8.4", - "cipher 0.4.4", + "aes", + "cipher", "ctr", "polyval", "subtle", @@ -370,7 +343,6 @@ checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom 0.3.4", - "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -379,10 +351,8 @@ dependencies = [ [[package]] name = "aho-corasick" version = "1.1.4" -version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -439,27 +409,20 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" version = "1.0.13" -version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anyhow" version = "1.0.100" -version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" -checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "arc-swap" -version = "1.8.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" -dependencies = [ - "rustversion", -] +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" @@ -491,7 +454,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] @@ -520,9 +483,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.1.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5bcfa8749ac45dd12cb11055aeeb6b27a3895560d60d71e3c23bf979e60514" +checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85" dependencies = [ "anstyle", "bstr", @@ -569,10 +532,8 @@ dependencies = [ [[package]] name = "async-trait" version = "0.1.89" -version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", @@ -588,7 +549,6 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" version = "1.5.0" -version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" @@ -603,7 +563,6 @@ dependencies = [ "bytes", "futures-util", "http 1.4.0", - "http 1.4.0", "http-body", "http-body-util", "itoa", @@ -615,7 +574,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower 0.5.3", + "tower 0.5.2", "tower-layer", "tower-service", ] @@ -630,7 +589,6 @@ dependencies = [ "bytes", "futures-util", "http 1.4.0", - "http 1.4.0", "http-body", "http-body-util", "mime", @@ -644,10 +602,8 @@ dependencies = [ [[package]] name = "backon" version = "1.6.0" -version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" -checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ "fastrand", ] @@ -684,14 +640,13 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" +checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" [[package]] name = "bitflags" version = "2.10.0" -version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" @@ -716,10 +671,8 @@ dependencies = [ [[package]] name = "brotli" version = "8.0.2" -version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -739,10 +692,8 @@ dependencies = [ [[package]] name = "bstr" version = "1.12.1" -version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", @@ -761,10 +712,8 @@ dependencies = [ [[package]] name = "bumpalo" version = "3.19.1" -version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" -checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "byteorder" @@ -775,18 +724,14 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" version = "1.11.0" -version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "bytestring" version = "1.5.0" -version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289" -checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289" dependencies = [ "bytes", ] @@ -799,9 +744,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.52" +version = "1.2.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" +checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" dependencies = [ "find-msvc-tools", "jobserver", @@ -812,7 +757,6 @@ dependencies = [ [[package]] name = "cfg-if" version = "1.0.4" -version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" @@ -823,7 +767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -835,16 +779,16 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher 0.4.4", + "cipher", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ "iana-time-zone", "js-sys", @@ -887,26 +831,16 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common 0.1.7", - "inout 0.1.4", + "crypto-common", + "inout", "zeroize", ] -[[package]] -name = "cipher" -version = "0.5.0-rc.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557bad79bc426785757001b5d732f323ae965363983d758295c1a1935496880" -dependencies = [ - "crypto-common 0.2.0-rc.11", - "inout 0.2.2", -] - [[package]] name = "clap" -version = "4.5.54" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", "clap_derive", @@ -914,9 +848,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.54" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstyle", "clap_lex", @@ -925,10 +859,8 @@ dependencies = [ [[package]] name = "clap_derive" version = "4.5.49" -version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck", "proc-macro2", @@ -938,9 +870,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "combine" @@ -990,7 +922,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.2.16", "once_cell", "tiny-keccak", ] @@ -1070,7 +1002,7 @@ dependencies = [ "strum", "tempfile", "test_kms_server", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "url", "uuid", @@ -1086,7 +1018,7 @@ dependencies = [ "base64 0.21.7", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "toml 0.8.23", "tracing", "url", @@ -1101,7 +1033,7 @@ dependencies = [ "base64 0.21.7", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "toml 0.8.23", "tracing", "url", @@ -1136,7 +1068,7 @@ dependencies = [ "curve25519-dalek", "ed25519-dalek", "gensym", - "getrandom 0.2.17", + "getrandom 0.2.16", "leb128", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -1178,7 +1110,7 @@ dependencies = [ "hex", "test_findex_server", "test_kms_server", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "uuid", @@ -1198,7 +1130,7 @@ dependencies = [ "reqwest", "serde", "test_kms_server", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "uuid", @@ -1230,10 +1162,10 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tokio-rusqlite", - "toml 0.9.11+spec-1.1.0", + "toml 0.9.10+spec-1.1.0", "tracing", "url", "uuid", @@ -1248,7 +1180,7 @@ dependencies = [ "cosmian_crypto_core", "cosmian_findex", "cosmian_sse_memories", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", "uuid", ] @@ -1261,12 +1193,11 @@ checksum = "44b2705be438091a343f880385c80d46ecafda93f47c95801f7cf42a54a98588" dependencies = [ "actix-web", "derive_more 2.1.1", - "derive_more 2.1.1", "oauth2", "reqwest", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "url", @@ -1280,7 +1211,6 @@ dependencies = [ "base64 0.22.1", "bitflags", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "hex", "js-sys", "kmip-derive", @@ -1293,7 +1223,7 @@ dependencies = [ "serde_json", "strum", "strum_macros 0.27.2", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", "tracing", "uuid", @@ -1315,13 +1245,12 @@ dependencies = [ "async-trait", "cosmian_kms_interfaces", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "futures", "libloading", "lru 0.16.3", "pkcs11-sys", "rand 0.9.2", - "thiserror 2.0.17", + "thiserror 2.0.18", "uuid", "zeroize", ] @@ -1337,7 +1266,6 @@ dependencies = [ "cosmian_kms_client", "cosmian_kms_crypto", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "der", "hex", "jsonwebtoken", @@ -1349,7 +1277,7 @@ dependencies = [ "serde_json", "sha2", "strum", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", "tokio", "url", @@ -1366,12 +1294,11 @@ dependencies = [ "cosmian_http_client", "cosmian_kms_client_utils", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "der", "pem", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "url", ] @@ -1385,12 +1312,11 @@ dependencies = [ "cosmian_kmip", "cosmian_kms_access", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "pem", "serde", "serde_json", "strum", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", "zeroize", ] @@ -1406,7 +1332,6 @@ dependencies = [ "cosmian_crypto_core", "cosmian_kmip", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "hex", "k256", "num-bigint-dig", @@ -1416,7 +1341,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.17", + "thiserror 2.0.18", "uuid", "x509-parser", "zeroize", @@ -1429,10 +1354,9 @@ dependencies = [ "async-trait", "cosmian_kmip", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "num-bigint-dig", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "zeroize", ] @@ -1457,7 +1381,6 @@ dependencies = [ "cosmian_kms_base_hsm", "cosmian_kms_server_database", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "crypt2pay_pkcs11_loader", "dotenvy", "futures", @@ -1477,7 +1400,7 @@ dependencies = [ "smartcardhsm_pkcs11_loader", "softhsm2_pkcs11_loader", "strum", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", "tokio", "toml 0.8.23", @@ -1499,7 +1422,6 @@ dependencies = [ "cosmian_kms_crypto", "cosmian_kms_interfaces", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "cosmian_sse_memories", "deadpool-postgres", "lru 0.16.3", @@ -1513,7 +1435,7 @@ dependencies = [ "serde", "serde_json", "strum", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tokio-postgres", "tokio-rusqlite", @@ -1524,10 +1446,8 @@ dependencies = [ [[package]] name = "cosmian_logger" version = "0.5.5" -version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff3434d2a64271c79bb0f0b6c05d4995dd88396165b8aba92291b91ee1deb7ca" -checksum = "ff3434d2a64271c79bb0f0b6c05d4995dd88396165b8aba92291b91ee1deb7ca" dependencies = [ "opentelemetry 0.29.1", "opentelemetry-otlp 0.29.0", @@ -1535,7 +1455,7 @@ dependencies = [ "opentelemetry-stdout", "opentelemetry_sdk 0.29.0", "syslog-tracing", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", "tracing-appender", "tracing-opentelemetry", @@ -1549,7 +1469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a2cffbf2bcf7470978d356c9d15f8a342c3d39224b227144cdc9378242974c6" dependencies = [ "opentelemetry 0.29.1", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", "tracing-appender", "tracing-subscriber", @@ -1572,7 +1492,7 @@ dependencies = [ "serial_test", "sha3", "test_kms_server", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing-error", "tracing-subscriber", @@ -1596,7 +1516,7 @@ dependencies = [ "rand 0.9.2", "serial_test", "strum_macros 0.26.4", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", "zeroize", ] @@ -1624,10 +1544,8 @@ dependencies = [ [[package]] name = "crc32fast" version = "1.5.0" -version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -1711,10 +1629,8 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" version = "0.2.4" -version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypt2pay_pkcs11_loader" @@ -1738,25 +1654,14 @@ dependencies = [ [[package]] name = "crypto-common" version = "0.1.7" -version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", "typenum", ] -[[package]] -name = "crypto-common" -version = "0.2.0-rc.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2bcc93d5cde6659e8649fc412894417ebc14dee54cfc6ee439c683a4a58342" -dependencies = [ - "hybrid-array 0.4.5", -] - [[package]] name = "crypto_box" version = "0.9.1" @@ -1779,7 +1684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1" dependencies = [ "aead", - "cipher 0.4.4", + "cipher", "generic-array", "poly1305", "salsa20", @@ -1790,25 +1695,20 @@ dependencies = [ [[package]] name = "csv" version = "1.4.0" -version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" -checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", "serde_core", - "serde_core", ] [[package]] name = "csv-core" version = "0.1.13" -version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" -checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] @@ -1819,7 +1719,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -1851,9 +1751,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.21.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -1861,9 +1761,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.21.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -1875,9 +1775,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.21.3" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", @@ -1886,9 +1786,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.10.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "deadpool" @@ -1910,7 +1810,7 @@ checksum = "3d697d376cbfa018c23eb4caab1fd1883dd9c906a8c034e8d9a3cb06a7e0bef9" dependencies = [ "async-trait", "deadpool", - "getrandom 0.2.17", + "getrandom 0.2.16", "tokio", "tokio-postgres", "tracing", @@ -1966,10 +1866,8 @@ dependencies = [ [[package]] name = "deranged" version = "0.5.5" -version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", "serde_core", @@ -1991,10 +1889,8 @@ dependencies = [ [[package]] name = "derive_more" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" -checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] @@ -2002,10 +1898,8 @@ dependencies = [ [[package]] name = "derive_more-impl" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" -checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "convert_case 0.10.0", "proc-macro2", @@ -2043,7 +1937,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "const-oid", - "crypto-common 0.1.7", + "crypto-common", "subtle", ] @@ -2100,10 +1994,8 @@ dependencies = [ [[package]] name = "ed25519-dalek" version = "2.2.0" -version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" -checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -2163,13 +2055,11 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" version = "0.3.14" -version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2225,9 +2115,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "find-msvc-tools" -version = "0.1.7" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "flagset" @@ -2237,9 +2127,9 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" [[package]] name = "flate2" -version = "1.1.8" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "libz-sys", @@ -2291,10 +2181,8 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" version = "1.2.2" -version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -2422,24 +2310,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.1+wasi-snapshot-preview1", "wasm-bindgen", ] [[package]] name = "getrandom" version = "0.3.4" -version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", @@ -2460,7 +2346,6 @@ dependencies = [ [[package]] name = "glob" version = "0.3.3" -version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" @@ -2478,10 +2363,8 @@ dependencies = [ [[package]] name = "h2" version = "0.3.27" -version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" -checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" dependencies = [ "bytes", "fnv", @@ -2489,7 +2372,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.13.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -2498,9 +2381,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" dependencies = [ "atomic-waker", "bytes", @@ -2508,7 +2391,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.4.0", - "indexmap 2.13.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -2518,15 +2401,12 @@ dependencies = [ [[package]] name = "half" version = "2.7.1" -version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" -checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", "zerocopy", - "zerocopy", ] [[package]] @@ -2544,10 +2424,8 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" version = "0.15.5" -version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", @@ -2572,7 +2450,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ "hashbrown 0.15.5", - "hashbrown 0.15.5", ] [[package]] @@ -2617,13 +2494,10 @@ dependencies = [ [[package]] name = "home" version = "0.5.12" -version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ "windows-sys 0.61.2", - "windows-sys 0.61.2", ] [[package]] @@ -2640,10 +2514,8 @@ dependencies = [ [[package]] name = "http" version = "1.4.0" -version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", "itoa", @@ -2657,7 +2529,6 @@ checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.4.0", - "http 1.4.0", ] [[package]] @@ -2669,7 +2540,6 @@ dependencies = [ "bytes", "futures-core", "http 1.4.0", - "http 1.4.0", "http-body", "pin-project-lite", ] @@ -2701,29 +2571,17 @@ dependencies = [ "typenum", ] -[[package]] -name = "hybrid-array" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f471e0a81b2f90ffc0cb2f951ae04da57de8baa46fa99112b062a5173a5088d0" -dependencies = [ - "typenum", -] - [[package]] name = "hyper" version = "1.8.1" -version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ - "atomic-waker", "atomic-waker", "bytes", "futures-channel", "futures-core", - "h2 0.4.13", + "h2 0.4.12", "http 1.4.0", "http-body", "httparse", @@ -2731,7 +2589,6 @@ dependencies = [ "itoa", "pin-project-lite", "pin-utils", - "pin-utils", "smallvec", "tokio", "want", @@ -2743,7 +2600,6 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.4.0", "http 1.4.0", "hyper", "hyper-util", @@ -2786,10 +2642,8 @@ dependencies = [ [[package]] name = "hyper-util" version = "0.1.19" -version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" -checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64 0.22.1", "bytes", @@ -2797,7 +2651,6 @@ dependencies = [ "futures-core", "futures-util", "http 1.4.0", - "http 1.4.0", "http-body", "hyper", "ipnet", @@ -2815,10 +2668,8 @@ dependencies = [ [[package]] name = "iana-time-zone" version = "0.1.64" -version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2841,10 +2692,8 @@ dependencies = [ [[package]] name = "icu_collections" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -2856,10 +2705,8 @@ dependencies = [ [[package]] name = "icu_locale_core" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -2871,10 +2718,8 @@ dependencies = [ [[package]] name = "icu_normalizer" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -2887,18 +2732,14 @@ dependencies = [ [[package]] name = "icu_normalizer_data" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" version = "2.1.2" -version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -2911,18 +2752,14 @@ dependencies = [ [[package]] name = "icu_properties_data" version = "2.1.2" -version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" version = "2.1.1" -version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", @@ -2942,10 +2779,8 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" version = "1.1.0" -version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -2980,9 +2815,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -3005,9 +2840,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.10" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -3040,39 +2875,27 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.17" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" [[package]] name = "jobserver" version = "0.1.34" -version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.4", "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.85" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -3132,7 +2955,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.12.1", ] [[package]] @@ -3166,21 +2989,18 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.180" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libloading" version = "0.8.9" -version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", "windows-link", - "windows-link", ] [[package]] @@ -3224,18 +3044,14 @@ dependencies = [ [[package]] name = "linux-raw-sys" version = "0.11.0" -version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" version = "0.8.1" -version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "local-channel" @@ -3257,10 +3073,8 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" version = "0.4.14" -version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ "scopeguard", ] @@ -3268,10 +3082,8 @@ dependencies = [ [[package]] name = "log" version = "0.4.29" -version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" @@ -3280,7 +3092,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" dependencies = [ "hashbrown 0.15.5", - "hashbrown 0.15.5", ] [[package]] @@ -3320,10 +3131,8 @@ dependencies = [ [[package]] name = "memchr" version = "2.7.6" -version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "mime" @@ -3355,16 +3164,13 @@ checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", "simd-adler32", - "simd-adler32", ] [[package]] name = "mio" version = "1.1.1" -version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "log", @@ -3378,7 +3184,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97befee0c869cb56f3118f49d0f9bb68c9e3f380dec23c1100aedc4ec3ba239a" dependencies = [ - "hybrid-array 0.2.3", + "hybrid-array", "kem", "rand_core 0.6.4", "sha3", @@ -3400,7 +3206,7 @@ dependencies = [ "quote", "syn", "termcolor", - "thiserror 2.0.17", + "thiserror 2.0.18", ] [[package]] @@ -3425,7 +3231,7 @@ dependencies = [ "serde", "serde_json", "socket2 0.5.10", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tokio-native-tls", "tokio-util", @@ -3456,7 +3262,7 @@ dependencies = [ "serde_json", "sha1", "sha2", - "thiserror 2.0.17", + "thiserror 2.0.18", "uuid", ] @@ -3496,10 +3302,8 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nu-ansi-term" version = "0.50.3" -version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ "windows-sys 0.59.0", ] @@ -3517,10 +3321,8 @@ dependencies = [ [[package]] name = "num-bigint-dig" version = "0.8.6" -version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" dependencies = [ "lazy_static", "libm", @@ -3605,7 +3407,7 @@ checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ "base64 0.22.1", "chrono", - "getrandom 0.2.17", + "getrandom 0.2.16", "http 1.4.0", "rand 0.8.5", "reqwest", @@ -3647,10 +3449,8 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" version = "0.10.75" -version = "0.10.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" dependencies = [ "bitflags", "cfg-if", @@ -3681,10 +3481,8 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" version = "0.9.111" -version = "0.9.111" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" dependencies = [ "cc", "libc", @@ -3716,7 +3514,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", ] @@ -3729,7 +3527,6 @@ dependencies = [ "async-trait", "bytes", "http 1.4.0", - "http 1.4.0", "opentelemetry 0.29.1", "reqwest", "tracing", @@ -3744,7 +3541,6 @@ dependencies = [ "async-trait", "futures-core", "http 1.4.0", - "http 1.4.0", "opentelemetry 0.27.1", "opentelemetry-proto 0.27.0", "opentelemetry_sdk 0.27.1", @@ -3763,14 +3559,13 @@ checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656" dependencies = [ "futures-core", "http 1.4.0", - "http 1.4.0", "opentelemetry 0.29.1", "opentelemetry-http", "opentelemetry-proto 0.29.0", "opentelemetry_sdk 0.29.0", "prost", "reqwest", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tonic", "tracing", @@ -3852,9 +3647,8 @@ dependencies = [ "opentelemetry 0.29.1", "percent-encoding", "rand 0.9.2", - "rand 0.9.2", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "tracing", ] @@ -3883,10 +3677,8 @@ dependencies = [ [[package]] name = "parking_lot" version = "0.12.5" -version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -3895,17 +3687,14 @@ dependencies = [ [[package]] name = "parking_lot_core" version = "0.9.12" -version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", - "windows-link", ] [[package]] @@ -3922,14 +3711,11 @@ dependencies = [ [[package]] name = "pem" version = "3.0.6" -version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" dependencies = [ "base64 0.22.1", "serde_core", - "serde_core", ] [[package]] @@ -3944,7 +3730,6 @@ dependencies = [ [[package]] name = "percent-encoding" version = "2.3.2" -version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" @@ -4129,10 +3914,8 @@ dependencies = [ [[package]] name = "potential_utf" version = "0.1.4" -version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -4224,9 +4007,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.105" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -4249,7 +4032,6 @@ checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", "itertools 0.14.0", - "itertools 0.14.0", "proc-macro2", "quote", "syn", @@ -4274,9 +4056,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.43" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -4284,10 +4066,8 @@ dependencies = [ [[package]] name = "r-efi" version = "5.3.0" -version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -4303,13 +4083,11 @@ dependencies = [ [[package]] name = "rand" version = "0.9.2" -version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.5", + "rand_core 0.9.3", ] [[package]] @@ -4329,7 +4107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.5", + "rand_core 0.9.3", ] [[package]] @@ -4338,17 +4116,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.2.16", ] [[package]] name = "rand_core" -version = "0.9.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom 0.3.4", - "getrandom 0.3.4", ] [[package]] @@ -4360,10 +4137,8 @@ checksum = "f70b36c8415361d34d90adf494f45bc18e568f909b5946d27c79559ddd812fa8" [[package]] name = "rayon" version = "1.11.0" -version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -4372,10 +4147,8 @@ dependencies = [ [[package]] name = "rayon-core" version = "1.13.0" -version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" -checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4402,7 +4175,6 @@ dependencies = [ "ryu", "sha1_smol", "socket2 0.6.1", - "socket2 0.6.1", "tokio", "tokio-util", "url", @@ -4411,7 +4183,6 @@ dependencies = [ [[package]] name = "redox_syscall" version = "0.5.18" -version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ @@ -4421,10 +4192,8 @@ dependencies = [ [[package]] name = "regex" version = "1.12.2" -version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -4435,10 +4204,8 @@ dependencies = [ [[package]] name = "regex-automata" version = "0.4.13" -version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -4448,26 +4215,20 @@ dependencies = [ [[package]] name = "regex-lite" version = "0.1.8" -version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" -checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" [[package]] name = "regex-syntax" version = "0.8.8" -version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" version = "0.12.28" -version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -4475,7 +4236,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.13", + "h2 0.4.12", "http 1.4.0", "http-body", "http-body-util", @@ -4496,7 +4257,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tower 0.5.3", + "tower 0.5.2", "tower-http", "tower-service", "url", @@ -4523,7 +4284,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.17", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -4547,10 +4308,8 @@ dependencies = [ [[package]] name = "rust-ini" version = "0.21.3" -version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" -checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" dependencies = [ "cfg-if", "ordered-multimap", @@ -4576,22 +4335,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.36" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "once_cell", "rustls-pki-types", @@ -4603,10 +4362,8 @@ dependencies = [ [[package]] name = "rustls-pki-types" version = "1.13.2" -version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" -checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "zeroize", ] @@ -4614,10 +4371,8 @@ dependencies = [ [[package]] name = "rustls-webpki" version = "0.103.8" -version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -4627,16 +4382,14 @@ dependencies = [ [[package]] name = "rustversion" version = "1.0.22" -version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.22" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" +checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" [[package]] name = "salsa20" @@ -4644,7 +4397,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -4665,10 +4418,8 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" [[package]] name = "scc" version = "2.4.0" -version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" -checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" dependencies = [ "sdd", ] @@ -4676,10 +4427,8 @@ dependencies = [ [[package]] name = "schannel" version = "0.1.28" -version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ "windows-sys 0.61.2", ] @@ -4693,10 +4442,8 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdd" version = "3.0.10" -version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" -checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" [[package]] name = "sec1" @@ -4728,10 +4475,8 @@ dependencies = [ [[package]] name = "security-framework-sys" version = "2.15.0" -version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -4740,19 +4485,15 @@ dependencies = [ [[package]] name = "semver" version = "1.0.27" -version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" version = "1.0.228" -version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ - "serde_core", "serde_core", "serde_derive", ] @@ -4769,10 +4510,8 @@ dependencies = [ [[package]] name = "serde_derive" version = "1.0.228" -version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -4782,28 +4521,22 @@ dependencies = [ [[package]] name = "serde_json" version = "1.0.149" -version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.12.1", "itoa", "memchr", "serde", "serde_core", "zmij", - "serde_core", - "zmij", ] [[package]] name = "serde_path_to_error" version = "0.1.20" -version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" dependencies = [ "itoa", "serde", @@ -4822,13 +4555,10 @@ dependencies = [ [[package]] name = "serde_spanned" version = "1.0.4" -version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", - "serde_core", ] [[package]] @@ -4845,12 +4575,11 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ - "futures-executor", - "futures-util", + "futures", "log", "once_cell", "parking_lot", @@ -4860,9 +4589,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", @@ -4919,10 +4648,8 @@ dependencies = [ [[package]] name = "shell-words" version = "1.1.1" -version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" -checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" [[package]] name = "shlex" @@ -4932,11 +4659,10 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.8" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ - "errno", "libc", ] @@ -4956,12 +4682,6 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" -[[package]] -name = "simd-adler32" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" - [[package]] name = "simple_asn1" version = "0.6.3" @@ -4970,7 +4690,7 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] @@ -5012,14 +4732,11 @@ dependencies = [ [[package]] name = "socket2" version = "0.6.1" -version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", "windows-sys 0.60.2", - "windows-sys 0.60.2", ] [[package]] @@ -5048,10 +4765,8 @@ dependencies = [ [[package]] name = "stable_deref_trait" version = "1.2.1" -version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stringprep" @@ -5073,13 +4788,10 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" version = "0.27.2" -version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros 0.27.2", - "strum_macros 0.27.2", ] [[package]] @@ -5098,10 +4810,8 @@ dependencies = [ [[package]] name = "strum_macros" version = "0.27.2" -version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", @@ -5117,9 +4827,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.114" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -5180,16 +4890,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.24.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "getrandom 0.3.4", - "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5227,7 +4936,6 @@ dependencies = [ "cosmian_kms_client", "cosmian_kms_server", "cosmian_logger 0.5.5", - "cosmian_logger 0.5.5", "serde_json", "time", "tokio", @@ -5244,11 +4952,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -5264,9 +4972,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -5284,9 +4992,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.45" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", @@ -5294,22 +5002,22 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde_core", + "serde", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "time-macros" -version = "0.2.25" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" dependencies = [ "num-conv", "time-core", @@ -5327,10 +5035,8 @@ dependencies = [ [[package]] name = "tinystr" version = "0.8.2" -version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -5349,10 +5055,8 @@ dependencies = [ [[package]] name = "tinyvec" version = "1.10.0" -version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -5386,9 +5090,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ "bytes", "libc", @@ -5397,19 +5101,15 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.6.1", - "socket2 0.6.1", "tokio-macros", "windows-sys 0.61.2", - "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" version = "2.6.0" -version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -5477,10 +5177,8 @@ dependencies = [ [[package]] name = "tokio-rustls" version = "0.26.4" -version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -5488,9 +5186,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -5499,9 +5197,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -5524,11 +5222,11 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.11+spec-1.1.0" +version = "0.9.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.12.1", "serde_core", "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", @@ -5549,13 +5247,10 @@ dependencies = [ [[package]] name = "toml_datetime" version = "0.7.5+spec-1.1.0" -version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", - "serde_core", ] [[package]] @@ -5564,7 +5259,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.12.1", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -5578,7 +5273,7 @@ version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.12.1", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow", @@ -5587,10 +5282,8 @@ dependencies = [ [[package]] name = "toml_parser" version = "1.0.6+spec-1.1.0" -version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -5604,10 +5297,8 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" version = "1.0.6+spec-1.1.0" -version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" -checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tonic" @@ -5620,7 +5311,7 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", - "h2 0.4.13", + "h2 0.4.12", "http 1.4.0", "http-body", "http-body-util", @@ -5661,9 +5352,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", @@ -5677,20 +5368,17 @@ dependencies = [ [[package]] name = "tower-http" version = "0.6.8" -version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", "futures-util", "http 1.4.0", - "http 1.4.0", "http-body", "iri-string", "pin-project-lite", - "tower 0.5.3", + "tower 0.5.2", "tower-layer", "tower-service", ] @@ -5710,10 +5398,8 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" version = "0.1.44" -version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -5724,13 +5410,11 @@ dependencies = [ [[package]] name = "tracing-appender" version = "0.2.4" -version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" -checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" dependencies = [ "crossbeam-channel", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", "tracing-subscriber", ] @@ -5738,10 +5422,8 @@ dependencies = [ [[package]] name = "tracing-attributes" version = "0.1.31" -version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -5751,10 +5433,8 @@ dependencies = [ [[package]] name = "tracing-core" version = "0.1.36" -version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -5802,10 +5482,8 @@ dependencies = [ [[package]] name = "tracing-subscriber" version = "0.3.22" -version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", @@ -5832,16 +5510,14 @@ checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" version = "1.19.0" -version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicase" -version = "2.9.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-bidi" @@ -5852,18 +5528,14 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" version = "1.0.22" -version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-normalization" version = "0.1.25" -version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" -checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] @@ -5871,10 +5543,8 @@ dependencies = [ [[package]] name = "unicode-properties" version = "0.1.4" -version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" @@ -5900,7 +5570,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common 0.1.7", + "crypto-common", "subtle", ] @@ -5912,15 +5582,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.8" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", - "serde_derive", ] [[package]] @@ -5942,7 +5611,7 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.2.16", "serde", ] @@ -6026,9 +5695,9 @@ dependencies = [ [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] @@ -6044,9 +5713,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.108" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -6057,12 +5726,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.58" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", - "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -6071,9 +5739,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.108" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6081,11 +5749,10 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.108" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ - "bumpalo", "bumpalo", "proc-macro2", "quote", @@ -6095,18 +5762,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.108" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.85" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -6128,7 +5795,6 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace4d5c7b5ab3d99629156d4e0997edbe98a4beb6d5ba99e2cae830207a81983" dependencies = [ - "libredox", "libredox", "wasite", "web-sys", @@ -6137,10 +5803,8 @@ dependencies = [ [[package]] name = "winapi-util" version = "0.1.11" -version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" -checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ "windows-sys 0.48.0", ] @@ -6148,10 +5812,8 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -6163,10 +5825,8 @@ dependencies = [ [[package]] name = "windows-implement" version = "0.60.2" -version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -6176,10 +5836,8 @@ dependencies = [ [[package]] name = "windows-interface" version = "0.59.3" -version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -6189,18 +5847,14 @@ dependencies = [ [[package]] name = "windows-link" version = "0.2.1" -version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" version = "0.6.1" -version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ "windows-link", "windows-result", @@ -6210,10 +5864,8 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" -version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] @@ -6221,10 +5873,8 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" -version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] @@ -6265,16 +5915,6 @@ dependencies = [ "windows-targets 0.53.5", ] -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -6318,10 +5958,8 @@ dependencies = [ [[package]] name = "windows-targets" version = "0.53.5" -version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ "windows-link", "windows_aarch64_gnullvm 0.53.1", @@ -6332,14 +5970,6 @@ dependencies = [ "windows_x86_64_gnu 0.53.1", "windows_x86_64_gnullvm 0.53.1", "windows_x86_64_msvc 0.53.1", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -6357,10 +5987,8 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -6377,10 +6005,8 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -6397,10 +6023,8 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -6411,10 +6035,8 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -6431,10 +6053,8 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -6451,10 +6071,8 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -6471,10 +6089,8 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -6491,35 +6107,29 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" version = "0.53.1" -version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" version = "0.7.14" -version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen" -version = "0.51.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" version = "0.6.2" -version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "x509-cert" @@ -6547,7 +6157,7 @@ dependencies = [ "oid-registry", "ring", "rusticata-macros", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] @@ -6558,16 +6168,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cbddb7545ca0b9ffa7bdc653e8743303e1712687a6918ced25f2cdbed42520" dependencies = [ "byteorder", - "cipher 0.4.4", + "cipher", ] [[package]] name = "yoke" version = "0.8.1" -version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -6577,10 +6185,8 @@ dependencies = [ [[package]] name = "yoke-derive" version = "0.8.1" -version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -6590,18 +6196,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.33" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.33" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", @@ -6632,10 +6238,8 @@ dependencies = [ [[package]] name = "zeroize" version = "1.8.2" -version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "serde", "zeroize_derive", @@ -6643,9 +6247,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.4.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", @@ -6655,10 +6259,8 @@ dependencies = [ [[package]] name = "zerotrie" version = "0.2.3" -version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -6668,10 +6270,8 @@ dependencies = [ [[package]] name = "zerovec" version = "0.11.5" -version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -6681,10 +6281,8 @@ dependencies = [ [[package]] name = "zerovec-derive" version = "0.11.2" -version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", @@ -6693,9 +6291,9 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" +checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" [[package]] name = "zstd" @@ -6718,10 +6316,8 @@ dependencies = [ [[package]] name = "zstd-sys" version = "2.0.16+zstd.1.5.7" -version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/findex-server b/findex-server index 21556552..bba47d6d 160000 --- a/findex-server +++ b/findex-server @@ -1 +1 @@ -Subproject commit 21556552aafaf46454803c5ff56d887dee31e156 +Subproject commit bba47d6d85f8083c682da573a198da176b55a5ac From c35d883b73011b159aff338fdfa11325fd50fe2d Mon Sep 17 00:00:00 2001 From: Manuthor Date: Wed, 21 Jan 2026 16:34:04 +0100 Subject: [PATCH 6/7] chore: revert change around Command::cargo_bin --- .github/scripts/cargo_test.sh | 2 +- crate/cli/src/config.rs | 38 ++++--------------- crate/cli/src/tests/kms/access.rs | 12 +++--- crate/cli/src/tests/kms/attributes/delete.rs | 8 +++- crate/cli/src/tests/kms/attributes/get.rs | 8 +++- crate/cli/src/tests/kms/attributes/set.rs | 8 +++- crate/cli/src/tests/kms/auth_tests.rs | 6 +-- .../cli/src/tests/kms/certificates/certify.rs | 4 +- .../cli/src/tests/kms/certificates/encrypt.rs | 6 ++- .../cli/src/tests/kms/certificates/export.rs | 4 +- .../cli/src/tests/kms/certificates/import.rs | 4 +- .../src/tests/kms/certificates/validate.rs | 4 +- .../tests/kms/cover_crypt/access_structure.rs | 13 ++++--- .../tests/kms/cover_crypt/encrypt_decrypt.rs | 6 ++- .../tests/kms/cover_crypt/master_key_pair.rs | 4 +- crate/cli/src/tests/kms/cover_crypt/rekey.rs | 6 ++- .../kms/cover_crypt/user_decryption_keys.rs | 4 +- .../tests/kms/derive_key/derive_key_tests.rs | 4 +- .../kms/elliptic_curve/create_key_pair.rs | 4 +- .../kms/elliptic_curve/encrypt_decrypt.rs | 6 +-- .../tests/kms/elliptic_curve/sign_verify.rs | 6 ++- .../src/tests/kms/google_cmd/identities.rs | 9 +++-- .../cli/src/tests/kms/google_cmd/key_pairs.rs | 4 +- .../kms/google_cmd/key_pairs_enabling.rs | 9 +++-- crate/cli/src/tests/kms/hash.rs | 5 ++- crate/cli/src/tests/kms/mac.rs | 4 +- .../cli/src/tests/kms/rsa/create_key_pair.rs | 4 +- .../cli/src/tests/kms/rsa/encrypt_decrypt.rs | 8 ++-- crate/cli/src/tests/kms/rsa/sign_verify.rs | 6 ++- .../tests/kms/secret_data/create_secret.rs | 4 +- .../tests/kms/secret_data/kmip_operations.rs | 6 ++- .../src/tests/kms/secret_data/wrap_secret.rs | 8 ++-- crate/cli/src/tests/kms/shared/destroy.rs | 4 +- crate/cli/src/tests/kms/shared/export.rs | 4 +- crate/cli/src/tests/kms/shared/import.rs | 12 ++++-- crate/cli/src/tests/kms/shared/locate.rs | 4 +- crate/cli/src/tests/kms/shared/revoke.rs | 4 +- crate/cli/src/tests/kms/shared/wrap_unwrap.rs | 6 ++- .../cli/src/tests/kms/symmetric/create_key.rs | 4 +- .../tests/kms/symmetric/encrypt_decrypt.rs | 6 ++- crate/cli/src/tests/kms/symmetric/rekey.rs | 4 +- crate/cli/src/tests/kms/utils/cmd_logs.rs | 26 ------------- crate/cli/src/tests/kms/utils/mod.rs | 2 +- crate/cli/src/tests/kms/version.rs | 5 ++- crate/cli/src/tests/mod.rs | 4 +- 45 files changed, 169 insertions(+), 140 deletions(-) diff --git a/.github/scripts/cargo_test.sh b/.github/scripts/cargo_test.sh index 17025188..272d12af 100755 --- a/.github/scripts/cargo_test.sh +++ b/.github/scripts/cargo_test.sh @@ -30,7 +30,7 @@ fi export RUST_LOG="cosmian_cli=error,cosmian_findex_client=debug,cosmian_kms_client=debug" # shellcheck disable=SC2086 -cargo test --workspace --target $TARGET $RELEASE $FEATURES +cargo test --workspace --bins --target $TARGET $RELEASE $FEATURES # shellcheck disable=SC2086 # cargo bench --target $TARGET $FEATURES --no-run diff --git a/crate/cli/src/config.rs b/crate/cli/src/config.rs index 8708fe4e..f2e38ca2 100644 --- a/crate/cli/src/config.rs +++ b/crate/cli/src/config.rs @@ -83,7 +83,6 @@ mod tests { use cosmian_config_utils::{ConfigUtils, get_default_conf_path}; use cosmian_logger::log_init; - use tempfile::tempdir; use super::ClientConfig; use crate::config::{COSMIAN_CLI_CONF_ENV, COSMIAN_CLI_CONF_PATH}; @@ -91,9 +90,6 @@ mod tests { #[test] pub(crate) fn test_load() { log_init(None); - let original_conf_env = env::var(COSMIAN_CLI_CONF_ENV).ok(); - let original_home = env::var("HOME").ok(); - // valid conf unsafe { env::set_var(COSMIAN_CLI_CONF_ENV, "../../test_data/configs/cosmian.toml"); @@ -113,15 +109,15 @@ mod tests { unsafe { env::remove_var(COSMIAN_CLI_CONF_ENV); } - let home_dir = tempdir().unwrap(); - unsafe { - env::set_var("HOME", home_dir.path()); - } - let default_conf_path = get_default_conf_path(COSMIAN_CLI_CONF_PATH).unwrap(); - fs::create_dir_all(default_conf_path.parent().unwrap()).unwrap(); - fs::copy("../../test_data/configs/cosmian.toml", &default_conf_path).unwrap(); + drop(fs::remove_file( + get_default_conf_path(COSMIAN_CLI_CONF_PATH).unwrap(), + )); assert!(ClientConfig::load(None).is_ok()); - assert!(default_conf_path.exists()); + assert!( + get_default_conf_path(COSMIAN_CLI_CONF_PATH) + .unwrap() + .exists() + ); // invalid conf unsafe { @@ -142,23 +138,5 @@ mod tests { .unwrap(); assert!(ClientConfig::from_toml(conf_path.to_str().unwrap()).is_ok()); - - // restore env - match original_conf_env { - Some(v) => unsafe { - env::set_var(COSMIAN_CLI_CONF_ENV, v); - }, - None => unsafe { - env::remove_var(COSMIAN_CLI_CONF_ENV); - }, - } - match original_home { - Some(v) => unsafe { - env::set_var("HOME", v); - }, - None => unsafe { - env::remove_var("HOME"); - }, - } } } diff --git a/crate/cli/src/tests/kms/access.rs b/crate/cli/src/tests/kms/access.rs index 0db90541..64e0c319 100644 --- a/crate/cli/src/tests/kms/access.rs +++ b/crate/cli/src/tests/kms/access.rs @@ -4,6 +4,7 @@ use std::{ time::{SystemTime, UNIX_EPOCH}, }; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::reexport::cosmian_kms_client_utils::symmetric_utils::DataEncryptionAlgorithm, @@ -22,6 +23,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ shared::{ExportKeyParams, destroy, export_key, revoke}, symmetric::encrypt_decrypt::run_encrypt_decrypt_test, @@ -76,7 +78,7 @@ pub(crate) fn grant_access( user: &str, operations: &[&str], ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -105,7 +107,7 @@ pub(crate) fn revoke_access( user: &str, operations: &[&str], ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -129,7 +131,7 @@ pub(crate) fn revoke_access( /// List accesses granted on an object fn list_access(cli_conf_path: &str, object_id: &str) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) @@ -148,7 +150,7 @@ fn list_access(cli_conf_path: &str, object_id: &str) -> CosmianResult { /// List objects owned by the user fn list_owned_objects(cli_conf_path: &str) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); @@ -165,7 +167,7 @@ fn list_owned_objects(cli_conf_path: &str) -> CosmianResult { /// List accesses granted fn list_accesses_rights_obtained(cli_conf_path: &str) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) diff --git a/crate/cli/src/tests/kms/attributes/delete.rs b/crate/cli/src/tests/kms/attributes/delete.rs index 61849ae1..40aa7269 100644 --- a/crate/cli/src/tests/kms/attributes/delete.rs +++ b/crate/cli/src/tests/kms/attributes/delete.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::{ actions::kms::attributes::SetOrDeleteAttributes, reexport::cosmian_kms_client::kmip_2_1::kmip_types::Tag, @@ -9,7 +10,10 @@ use super::set::prepare_attributes; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + tests::{ + PROG_NAME, + kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + }, }; pub(crate) fn delete_attributes( @@ -29,7 +33,7 @@ pub(crate) fn delete_attributes( args.push(reference.to_string()); } } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/attributes/get.rs b/crate/cli/src/tests/kms/attributes/get.rs index 5b32c08b..224bd93a 100644 --- a/crate/cli/src/tests/kms/attributes/get.rs +++ b/crate/cli/src/tests/kms/attributes/get.rs @@ -1,5 +1,6 @@ use std::{collections::HashMap, process::Command}; +use assert_cmd::cargo::CommandCargoExt; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ kmip_2_1::kmip_types::Tag, reexport::cosmian_kms_client_utils::attributes_utils::CLinkType, @@ -12,7 +13,10 @@ use crate::{ CosmianError, result::{CosmianResult, CosmianResultHelper}, }, - tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + tests::{ + PROG_NAME, + kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + }, }; pub(crate) fn get_attributes( @@ -51,7 +55,7 @@ pub(crate) fn get_attributes( args.push(name); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/attributes/set.rs b/crate/cli/src/tests/kms/attributes/set.rs index 0229bc9e..bc96aa11 100644 --- a/crate/cli/src/tests/kms/attributes/set.rs +++ b/crate/cli/src/tests/kms/attributes/set.rs @@ -1,11 +1,15 @@ use std::process::Command; +use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::actions::kms::attributes::SetOrDeleteAttributes; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + tests::{ + PROG_NAME, + kms::{KMS_SUBCOMMAND, utils::recover_cmd_logs}, + }, }; pub(crate) fn prepare_attributes( @@ -105,7 +109,7 @@ pub(crate) fn set_attributes( ) -> CosmianResult { let args = prepare_attributes("set", requested_attributes); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("attributes").args(args); diff --git a/crate/cli/src/tests/kms/auth_tests.rs b/crate/cli/src/tests/kms/auth_tests.rs index f08c5edf..0cf6f1a0 100644 --- a/crate/cli/src/tests/kms/auth_tests.rs +++ b/crate/cli/src/tests/kms/auth_tests.rs @@ -22,7 +22,7 @@ use crate::{ config::{COSMIAN_CLI_CONF_ENV, ClientConfig}, error::result::CosmianResult, tests::{ - force_save_kms_cli_config, + PROG_NAME, force_save_kms_cli_config, kms::{ access::SUB_COMMAND, shared::{ExportKeyParams, export_key}, @@ -51,7 +51,7 @@ fn run_owned_cli_command(owner_client_conf_path: &str) { } ); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME).expect(" cargo bin failed"); cmd.env(COSMIAN_CLI_CONF_ENV, owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); @@ -80,7 +80,7 @@ fn run_owned_cli_command_expect_failure(owner_client_conf_path: &str) { } ); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME).expect(" cargo bin failed"); cmd.env(COSMIAN_CLI_CONF_ENV, owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec!["owned"]); diff --git a/crate/cli/src/tests/kms/certificates/certify.rs b/crate/cli/src/tests/kms/certificates/certify.rs index 5a86150a..6ece1f0a 100644 --- a/crate/cli/src/tests/kms/certificates/certify.rs +++ b/crate/cli/src/tests/kms/certificates/certify.rs @@ -1,5 +1,6 @@ use std::{path::PathBuf, process::Command}; +use assert_cmd::cargo::CommandCargoExt; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ cosmian_kmip::{ @@ -27,6 +28,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -57,7 +59,7 @@ pub(crate) struct CertifyOp { } pub(crate) fn certify(cli_conf_path: &str, certify_op: CertifyOp) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["certify".to_owned()]; diff --git a/crate/cli/src/tests/kms/certificates/encrypt.rs b/crate/cli/src/tests/kms/certificates/encrypt.rs index ef6f7453..861d95e9 100644 --- a/crate/cli/src/tests/kms/certificates/encrypt.rs +++ b/crate/cli/src/tests/kms/certificates/encrypt.rs @@ -1,5 +1,6 @@ use std::{fs, path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::cosmian_kms_client::{ read_bytes_from_file, reexport::cosmian_kms_client_utils::{ @@ -18,6 +19,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::import::{ImportCertificateInput, import_certificate}, @@ -37,7 +39,7 @@ pub(crate) fn encrypt( authentication_data: Option<&str>, encryption_algorithm: Option, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt", "--certificate-id", certificate_id, input_file]; @@ -72,7 +74,7 @@ pub(crate) fn decrypt( authentication_data: Option<&str>, encryption_algorithm: Option, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", "--key-id", private_key_id, input_file]; diff --git a/crate/cli/src/tests/kms/certificates/export.rs b/crate/cli/src/tests/kms/certificates/export.rs index 987e5287..70fa4472 100644 --- a/crate/cli/src/tests/kms/certificates/export.rs +++ b/crate/cli/src/tests/kms/certificates/export.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::reexport::cosmian_kms_client::{ cosmian_kmip::ttlv::{TTLV, from_ttlv}, kmip_2_1::{ @@ -31,6 +32,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -416,7 +418,7 @@ pub(crate) fn export_certificate( if allow_revoked { args.push("--allow-revoked".to_owned()); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("certificates").args(args); diff --git a/crate/cli/src/tests/kms/certificates/import.rs b/crate/cli/src/tests/kms/certificates/import.rs index c4b6ff35..6e545056 100644 --- a/crate/cli/src/tests/kms/certificates/import.rs +++ b/crate/cli/src/tests/kms/certificates/import.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::{ cosmian_kms_client::reexport::cosmian_kms_client_utils::import_utils::{ CertificateInputFormat, KeyUsage, @@ -10,6 +11,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, @@ -71,7 +73,7 @@ pub(crate) fn import_certificate( unwrap, replace_existing, } = import_certificate_input; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME).unwrap(); cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["import".to_owned(), key_file.to_owned()]; diff --git a/crate/cli/src/tests/kms/certificates/validate.rs b/crate/cli/src/tests/kms/certificates/validate.rs index 5d314477..a9f80db2 100644 --- a/crate/cli/src/tests/kms/certificates/validate.rs +++ b/crate/cli/src/tests/kms/certificates/validate.rs @@ -1,5 +1,6 @@ use std::{path::PathBuf, process::Command}; +use assert_cmd::cargo::CommandCargoExt; use cosmian_kms_cli::reexport::{ cosmian_kms_client::reexport::cosmian_kms_client_utils::import_utils::CertificateInputFormat, }; @@ -11,6 +12,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::{ @@ -92,7 +94,7 @@ pub(crate) fn validate_certificate( uids: Vec, date: Option, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec!["validate".to_owned()]; for uid in uids { diff --git a/crate/cli/src/tests/kms/cover_crypt/access_structure.rs b/crate/cli/src/tests/kms/cover_crypt/access_structure.rs index bd964590..4ff218db 100644 --- a/crate/cli/src/tests/kms/cover_crypt/access_structure.rs +++ b/crate/cli/src/tests/kms/cover_crypt/access_structure.rs @@ -9,6 +9,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -54,7 +55,7 @@ async fn test_view_access_structure() -> CosmianResult<()> { // read the bytes from the exported file // let object = read_object_from_json_ttlv_file(&tmp_path.join("output.export"))?; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec![ @@ -70,7 +71,7 @@ async fn test_view_access_structure() -> CosmianResult<()> { .stdout(predicate::str::contains("Top Secret")) .stdout(predicate::str::contains("RnD")); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(SUB_COMMAND).args(vec![ @@ -99,7 +100,7 @@ pub(crate) async fn rename( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -127,7 +128,7 @@ pub(crate) async fn add( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -154,7 +155,7 @@ pub(crate) async fn disable( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -181,7 +182,7 @@ pub(crate) async fn remove( ) -> CosmianResult<()> { start_default_test_kms_server().await; - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ diff --git a/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs b/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs index 8b76aaa2..8f6a53aa 100644 --- a/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/cover_crypt/encrypt_decrypt.rs @@ -1,5 +1,6 @@ use std::{fs, path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::cosmian_kms_client::read_bytes_from_file; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -8,6 +9,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -29,7 +31,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt", "--key-id", public_key_id]; @@ -62,7 +64,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs b/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs index 226a31ab..a2f32949 100644 --- a/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs +++ b/crate/cli/src/tests/kms/cover_crypt/master_key_pair.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -7,6 +8,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -25,7 +27,7 @@ pub(crate) fn create_cc_master_key_pair( tags: &[&str], sensitive: bool, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create-master-key-pair", policy_option, file]; diff --git a/crate/cli/src/tests/kms/cover_crypt/rekey.rs b/crate/cli/src/tests/kms/cover_crypt/rekey.rs index 2b12dddd..de9e0560 100644 --- a/crate/cli/src/tests/kms/cover_crypt/rekey.rs +++ b/crate/cli/src/tests/kms/cover_crypt/rekey.rs @@ -1,5 +1,6 @@ use std::{path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::{ @@ -24,6 +25,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::{ @@ -45,7 +47,7 @@ pub(crate) fn rekey( master_secret_key_id: &str, access_policy: &str, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ @@ -70,7 +72,7 @@ pub(crate) fn prune( master_secret_key_id: &str, access_policy: &str, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args = vec![ diff --git a/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs b/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs index bc6dec9f..1d4cab17 100644 --- a/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs +++ b/crate/cli/src/tests/kms/cover_crypt/user_decryption_keys.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -7,6 +8,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::master_key_pair::create_cc_master_key_pair, @@ -23,7 +25,7 @@ pub(crate) fn create_user_decryption_key( tags: &[&str], sensitive: bool, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs b/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs index f60e99c5..d484ff05 100644 --- a/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs +++ b/crate/cli/src/tests/kms/derive_key/derive_key_tests.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use clap::ValueEnum; use cosmian_kms_cli::{ actions::kms::{ @@ -26,6 +27,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{secret_data::create_secret::create_secret_data, utils::recover_cmd_logs}, save_kms_cli_config, }, @@ -35,7 +37,7 @@ const SUB_COMMAND: &str = "derive-key"; /// Run `cosmian kms derive-key` via the CLI and return the derived key unique identifier pub(crate) fn derive_key(cli_conf_path: &str, action: DeriveKeyAction) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // Build CLI args from the action diff --git a/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs b/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs index ed489516..ab6e96e1 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/create_key_pair.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -7,6 +8,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -24,7 +26,7 @@ pub(crate) fn create_ec_key_pair( tags: &[&str], sensitive: bool, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create", "--curve", curve]; diff --git a/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs b/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs index 90d4c1aa..2bdf4622 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/encrypt_decrypt.rs @@ -11,6 +11,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, elliptic_curve::create_key_pair::create_ec_key_pair, utils::recover_cmd_logs, @@ -20,14 +21,13 @@ use crate::{ }; /// Encrypts a file using the given public key and access policy. -#[allow(clippy::unnecessary_wraps)] pub(crate) fn encrypt( cli_conf_path: &str, input_files: &[&str], public_key_id: &str, output_file: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt"]; @@ -54,7 +54,7 @@ pub(crate) fn decrypt( private_key_id: &str, output_file: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", input_file, "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs b/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs index 92707f91..7af83f86 100644 --- a/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs +++ b/crate/cli/src/tests/kms/elliptic_curve/sign_verify.rs @@ -1,5 +1,6 @@ use std::{fs, path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -8,6 +9,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, elliptic_curve::create_key_pair::create_ec_key_pair, utils::recover_cmd_logs, @@ -24,7 +26,7 @@ fn ec_sign( output_file: Option<&str>, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign", input_file, "--key-id", key_id]; @@ -57,7 +59,7 @@ fn ec_sign_verify( key_id: &str, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign-verify", data_file, signature_file, "--key-id", key_id]; diff --git a/crate/cli/src/tests/kms/google_cmd/identities.rs b/crate/cli/src/tests/kms/google_cmd/identities.rs index 156f5b6c..fbd7b295 100644 --- a/crate/cli/src/tests/kms/google_cmd/identities.rs +++ b/crate/cli/src/tests/kms/google_cmd/identities.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::reexport::{ cosmian_kms_client::{GmailApiConf, write_json_object_to_file}, test_kms_server::{TestsContext, start_default_test_kms_server}, @@ -36,7 +37,7 @@ fn list_identities( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") @@ -64,7 +65,7 @@ fn get_identities(cli_conf_path: &str, user_id: &str) -> Result Result<(), CosmianEr .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") @@ -112,7 +113,7 @@ fn insert_identities( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") diff --git a/crate/cli/src/tests/kms/google_cmd/key_pairs.rs b/crate/cli/src/tests/kms/google_cmd/key_pairs.rs index 09592006..b09d1477 100644 --- a/crate/cli/src/tests/kms/google_cmd/key_pairs.rs +++ b/crate/cli/src/tests/kms/google_cmd/key_pairs.rs @@ -1,5 +1,6 @@ use std::{path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::{ google::key_pairs::create::CreateKeyPairsAction, symmetric::keys::create_key::CreateKeyAction, }; @@ -10,6 +11,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, certificates::certify::import_root_and_intermediate, @@ -73,7 +75,7 @@ fn create_keypairs( // Finish with user id args.push(action.user_id); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND) .arg("google") diff --git a/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs b/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs index 009bf42f..fdcc9eae 100644 --- a/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs +++ b/crate/cli/src/tests/kms/google_cmd/key_pairs_enabling.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use serde::Deserialize; @@ -52,7 +53,7 @@ fn list_keypairs(cli_conf_path: &str, user_id: &str) -> Result CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/mac.rs b/crate/cli/src/tests/kms/mac.rs index e1775617..034e31a8 100644 --- a/crate/cli/src/tests/kms/mac.rs +++ b/crate/cli/src/tests/kms/mac.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::{ mac::{CHashingAlgorithm, MacAction}, @@ -15,6 +16,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs}, save_kms_cli_config, }, @@ -24,7 +26,7 @@ const SUB_COMMAND: &str = "mac"; /// Create a symmetric key via the CLI pub(crate) fn create_mac(cli_conf_path: &str, action: MacAction) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["--mac-key-id".to_owned(), action.mac_key_id]; diff --git a/crate/cli/src/tests/kms/rsa/create_key_pair.rs b/crate/cli/src/tests/kms/rsa/create_key_pair.rs index 08b211b6..a957ed66 100644 --- a/crate/cli/src/tests/kms/rsa/create_key_pair.rs +++ b/crate/cli/src/tests/kms/rsa/create_key_pair.rs @@ -1,5 +1,6 @@ use std::{collections::HashSet, process::Command}; +use assert_cmd::prelude::*; use test_kms_server::start_default_test_kms_server; use super::SUB_COMMAND; @@ -7,6 +8,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{ @@ -30,7 +32,7 @@ pub(crate) fn create_rsa_key_pair( cli_conf_path: &str, options: &RsaKeyPairOptions, ) -> CosmianResult<(String, String)> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys", "create"]; diff --git a/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs b/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs index 87a4649d..f16a6eb6 100644 --- a/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/rsa/encrypt_decrypt.rs @@ -1,6 +1,6 @@ use std::{collections::HashSet, fs, path::PathBuf, process::Command}; -use assert_cmd::assert::OutputAssertExt; +use assert_cmd::prelude::*; use clap::ValueEnum; use cosmian_kms_cli::reexport::cosmian_kms_client::{ read_bytes_from_file, @@ -16,6 +16,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, rsa::create_key_pair::{RsaKeyPairOptions, create_rsa_key_pair}, @@ -26,7 +27,6 @@ use crate::{ }; /// Encrypts a file using the given public key -#[allow(clippy::unnecessary_wraps)] pub(crate) fn encrypt( cli_conf_path: &str, input_files: &[&str], @@ -36,7 +36,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["encrypt"]; @@ -88,7 +88,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["decrypt", input_file, "--key-id", private_key_id]; diff --git a/crate/cli/src/tests/kms/rsa/sign_verify.rs b/crate/cli/src/tests/kms/rsa/sign_verify.rs index c1e33861..4c9edc84 100644 --- a/crate/cli/src/tests/kms/rsa/sign_verify.rs +++ b/crate/cli/src/tests/kms/rsa/sign_verify.rs @@ -1,5 +1,6 @@ use std::{fs, path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use tempfile::TempDir; use test_kms_server::start_default_test_kms_server; @@ -8,6 +9,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, rsa::create_key_pair::{RsaKeyPairOptions, create_rsa_key_pair}, @@ -25,7 +27,7 @@ fn rsa_sign( output_file: Option<&str>, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign", input_file, "--key-id", key_id]; @@ -58,7 +60,7 @@ fn rsa_sign_verify( key_id: &str, digested: bool, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["sign-verify", data_file, signature_file, "--key-id", key_id]; diff --git a/crate/cli/src/tests/kms/secret_data/create_secret.rs b/crate/cli/src/tests/kms/secret_data/create_secret.rs index 1e5b8076..6725c29d 100644 --- a/crate/cli/src/tests/kms/secret_data/create_secret.rs +++ b/crate/cli/src/tests/kms/secret_data/create_secret.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::{ secret_data::create_secret::CreateSecretDataAction, @@ -14,6 +15,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, @@ -27,7 +29,7 @@ pub(crate) fn create_secret_data( cli_conf_path: &str, action: &CreateSecretDataAction, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["secret-data", "create"]; diff --git a/crate/cli/src/tests/kms/secret_data/kmip_operations.rs b/crate/cli/src/tests/kms/secret_data/kmip_operations.rs index dc3f8484..1aced317 100644 --- a/crate/cli/src/tests/kms/secret_data/kmip_operations.rs +++ b/crate/cli/src/tests/kms/secret_data/kmip_operations.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::secret_data::create_secret::CreateSecretDataAction; use cosmian_logger::{info, log_init}; use tempfile::TempDir; @@ -10,6 +11,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, secret_data::create_secret::create_secret_data, @@ -32,7 +34,7 @@ fn run_cosmian_cmd( expect_success: bool, cli_conf: Option<&str>, ) -> Result { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME).unwrap(); if let Some(conf) = cli_conf { cmd.env(COSMIAN_CLI_CONF_ENV, conf); } @@ -494,7 +496,7 @@ async fn test_secret_data_export_with_wrapping() -> CosmianResult<()> { let export_file_path = temp_dir.path().join("keyfile.bin"); let export_file_str = export_file_path.to_str().unwrap(); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, &owner_client_conf_path); cmd.args([ KMS_SUBCOMMAND, diff --git a/crate/cli/src/tests/kms/secret_data/wrap_secret.rs b/crate/cli/src/tests/kms/secret_data/wrap_secret.rs index 0cc43e22..f5e1c413 100644 --- a/crate/cli/src/tests/kms/secret_data/wrap_secret.rs +++ b/crate/cli/src/tests/kms/secret_data/wrap_secret.rs @@ -3,6 +3,7 @@ use std::{ process::Command, }; +use assert_cmd::prelude::CommandCargoExt; use base64::{Engine as _, engine::general_purpose}; use cosmian_kms_cli::{ actions::kms::{ @@ -28,6 +29,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, secret_data::create_secret::create_secret_data, @@ -45,7 +47,7 @@ pub(crate) fn export_object( object_id: &str, object_file: &str, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let args: Vec = if sub_command == "sym" { @@ -97,7 +99,7 @@ pub(crate) fn wrap_secret_data( wrap_key_id: Option, wrap_key_file: Option, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ @@ -148,7 +150,7 @@ pub(crate) fn unwrap_secret_data( unwrap_key_id: Option, unwrap_key_file: Option, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/shared/destroy.rs b/crate/cli/src/tests/kms/shared/destroy.rs index 555cec60..0367100a 100644 --- a/crate/cli/src/tests/kms/shared/destroy.rs +++ b/crate/cli/src/tests/kms/shared/destroy.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::{ @@ -23,6 +24,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export::export_key, revoke::revoke}, @@ -46,7 +48,7 @@ pub(crate) fn destroy( if remove { args.push("--remove".to_owned()); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(sub_command).args(args); diff --git a/crate/cli/src/tests/kms/shared/export.rs b/crate/cli/src/tests/kms/shared/export.rs index e5ff9638..d55beed4 100644 --- a/crate/cli/src/tests/kms/shared/export.rs +++ b/crate/cli/src/tests/kms/shared/export.rs @@ -2,6 +2,7 @@ use std::path::Path; use std::process::Command; +use assert_cmd::prelude::*; use clap::ValueEnum; #[cfg(feature = "non-fips")] use cosmian_kms_cli::reexport::cosmian_kms_client::{ @@ -35,6 +36,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs, }, @@ -109,7 +111,7 @@ pub(crate) fn export_key(params: ExportKeyParams) -> CosmianResult<()> { args.push(name); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, params.cli_conf_path); // Ensure sufficient stack for the child process on Windows cmd.env("RUST_MIN_STACK", "16777216"); diff --git a/crate/cli/src/tests/kms/shared/import.rs b/crate/cli/src/tests/kms/shared/import.rs index 5cfd0fe7..4782c49c 100644 --- a/crate/cli/src/tests/kms/shared/import.rs +++ b/crate/cli/src/tests/kms/shared/import.rs @@ -2,6 +2,7 @@ use std::path::PathBuf; use std::process::Command; +use assert_cmd::prelude::*; #[cfg(feature = "non-fips")] use cosmian_kms_cli::reexport::cosmian_kms_client::{ kmip_2_1::kmip_types::CryptographicAlgorithm, read_object_from_json_ttlv_file, @@ -24,9 +25,12 @@ use crate::tests::kms::{ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::kms::{ - KMS_SUBCOMMAND, - utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, + tests::{ + PROG_NAME, + kms::{ + KMS_SUBCOMMAND, + utils::{extract_uids::extract_unique_identifier, recover_cmd_logs}, + }, }, }; @@ -46,7 +50,7 @@ pub(crate) struct ImportKeyParams { } pub(crate) fn import_key(params: ImportKeyParams) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, params.cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/shared/locate.rs b/crate/cli/src/tests/kms/shared/locate.rs index fb8e6f0d..8d767d27 100644 --- a/crate/cli/src/tests/kms/shared/locate.rs +++ b/crate/cli/src/tests/kms/shared/locate.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::actions::kms::symmetric::keys::create_key::CreateKeyAction; #[cfg(feature = "non-fips")] use cosmian_logger::log_init; @@ -19,6 +20,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, @@ -55,7 +57,7 @@ pub(crate) fn locate( args.push(key_format_type.to_string()); } - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg("locate").args(args); diff --git a/crate/cli/src/tests/kms/shared/revoke.rs b/crate/cli/src/tests/kms/shared/revoke.rs index 51b5a862..8a112958 100644 --- a/crate/cli/src/tests/kms/shared/revoke.rs +++ b/crate/cli/src/tests/kms/shared/revoke.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::CommandCargoExt; use cosmian_kms_cli::actions::kms::symmetric::keys::create_key::CreateKeyAction; use tempfile::TempDir; use test_kms_server::{ @@ -17,6 +18,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export::export_key}, @@ -37,7 +39,7 @@ pub(crate) fn revoke( .iter() .map(std::string::ToString::to_string) .collect(); - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); cmd.arg(KMS_SUBCOMMAND).arg(sub_command).args(args); diff --git a/crate/cli/src/tests/kms/shared/wrap_unwrap.rs b/crate/cli/src/tests/kms/shared/wrap_unwrap.rs index 74477632..079cfca7 100644 --- a/crate/cli/src/tests/kms/shared/wrap_unwrap.rs +++ b/crate/cli/src/tests/kms/shared/wrap_unwrap.rs @@ -3,6 +3,7 @@ use std::{ process::Command, }; +use assert_cmd::prelude::CommandCargoExt; use base64::{Engine as _, engine::general_purpose}; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, @@ -26,6 +27,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, cover_crypt::master_key_pair::create_cc_master_key_pair, @@ -49,7 +51,7 @@ pub(crate) fn wrap( wrap_key_id: Option, wrap_key_file: Option, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ @@ -101,7 +103,7 @@ pub(crate) fn unwrap( unwrap_key_id: Option, unwrap_key_file: Option, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args: Vec = vec![ diff --git a/crate/cli/src/tests/kms/symmetric/create_key.rs b/crate/cli/src/tests/kms/symmetric/create_key.rs index 73e7de83..843ae25f 100644 --- a/crate/cli/src/tests/kms/symmetric/create_key.rs +++ b/crate/cli/src/tests/kms/symmetric/create_key.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use base64::{Engine as _, engine::general_purpose}; use clap::ValueEnum; use cosmian_kms_cli::{ @@ -19,6 +20,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, utils::{extract_uids::extract_uid, recover_cmd_logs}, @@ -32,7 +34,7 @@ pub(crate) fn create_symmetric_key( cli_conf_path: &str, action: CreateKeyAction, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec!["keys".to_owned(), "create".to_owned()]; diff --git a/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs b/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs index b00d9c37..84a6020e 100644 --- a/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs +++ b/crate/cli/src/tests/kms/symmetric/encrypt_decrypt.rs @@ -1,5 +1,6 @@ use std::{fs, path::PathBuf, process::Command}; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::{ DecryptAction, EncryptAction, KeyEncryptionAlgorithm, keys::create_key::CreateKeyAction, @@ -21,6 +22,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, symmetric::create_key::create_symmetric_key, utils::recover_cmd_logs, }, @@ -38,7 +40,7 @@ pub(crate) fn encrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ @@ -81,7 +83,7 @@ pub(crate) fn decrypt( output_file: Option<&str>, authentication_data: Option<&str>, ) -> CosmianResult<()> { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); let mut args = vec![ diff --git a/crate/cli/src/tests/kms/symmetric/rekey.rs b/crate/cli/src/tests/kms/symmetric/rekey.rs index a7d6c5b1..0daf2ea2 100644 --- a/crate/cli/src/tests/kms/symmetric/rekey.rs +++ b/crate/cli/src/tests/kms/symmetric/rekey.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_kms_cli::{ actions::kms::symmetric::keys::create_key::CreateKeyAction, reexport::cosmian_kms_client::read_object_from_json_ttlv_file, @@ -12,6 +13,7 @@ use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, tests::{ + PROG_NAME, kms::{ KMS_SUBCOMMAND, shared::{ExportKeyParams, export_key}, @@ -27,7 +29,7 @@ pub(crate) fn rekey_symmetric_key( cli_conf_path: &str, unique_identifier: &str, ) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // Ensure sufficient stack for the child process on Windows cmd.env("RUST_MIN_STACK", "16777216"); diff --git a/crate/cli/src/tests/kms/utils/cmd_logs.rs b/crate/cli/src/tests/kms/utils/cmd_logs.rs index 2bc4cd81..6dff72ed 100644 --- a/crate/cli/src/tests/kms/utils/cmd_logs.rs +++ b/crate/cli/src/tests/kms/utils/cmd_logs.rs @@ -1,34 +1,8 @@ use std::{ io::Write, - path::{Path, PathBuf}, process::{Command, Output, Stdio}, - sync::OnceLock, }; -use assert_cmd::prelude::*; - -use crate::tests::PROG_NAME; - -static COSMIAN_EXE: OnceLock = OnceLock::new(); - -#[allow(deprecated)] -fn resolve_cosmian_exe() -> PathBuf { - let cmd = Command::cargo_bin(PROG_NAME).unwrap_or_else(|e| { - panic!("failed to locate `{PROG_NAME}` binary via `Command::cargo_bin`: {e}") - }); - - let path = PathBuf::from(cmd.get_program()); - assert!( - path.exists(), - "`cargo_bin({PROG_NAME:?})` resolved to {path:?}, but it does not exist" - ); - path -} - -pub(crate) fn cosmian_exe() -> &'static Path { - COSMIAN_EXE.get_or_init(resolve_cosmian_exe).as_path() -} - /// Recover output logs from a command call `cmd` and re-inject it into stdio pub(crate) fn recover_cmd_logs(cmd: &mut Command) -> Output { let output = cmd diff --git a/crate/cli/src/tests/kms/utils/mod.rs b/crate/cli/src/tests/kms/utils/mod.rs index 926386c4..256c03f2 100644 --- a/crate/cli/src/tests/kms/utils/mod.rs +++ b/crate/cli/src/tests/kms/utils/mod.rs @@ -1,4 +1,4 @@ -pub(crate) use cmd_logs::{cosmian_exe, recover_cmd_logs}; +pub(crate) use cmd_logs::recover_cmd_logs; mod cmd_logs; #[expect(dead_code)] diff --git a/crate/cli/src/tests/kms/version.rs b/crate/cli/src/tests/kms/version.rs index d78a7cd9..3cce4169 100644 --- a/crate/cli/src/tests/kms/version.rs +++ b/crate/cli/src/tests/kms/version.rs @@ -1,5 +1,6 @@ use std::process::Command; +use assert_cmd::prelude::*; use cosmian_logger::{error, info, log_init}; use test_kms_server::start_default_test_kms_server; @@ -7,14 +8,14 @@ use super::KMS_SUBCOMMAND; use crate::{ config::COSMIAN_CLI_CONF_ENV, error::{CosmianError, result::CosmianResult}, - tests::{kms::utils::recover_cmd_logs, save_kms_cli_config}, + tests::{PROG_NAME, kms::utils::recover_cmd_logs, save_kms_cli_config}, }; const SUB_COMMAND: &str = "server-version"; /// Request server-version pub(crate) fn server_version(cli_conf_path: &str, kms_url: &str) -> CosmianResult { - let mut cmd = Command::new(crate::tests::kms::utils::cosmian_exe()); + let mut cmd = Command::cargo_bin(PROG_NAME)?; cmd.env(COSMIAN_CLI_CONF_ENV, cli_conf_path); // for local test use: export KMS_URL=http://host.docker.internal:9998 diff --git a/crate/cli/src/tests/mod.rs b/crate/cli/src/tests/mod.rs index 294d2d26..db504d61 100644 --- a/crate/cli/src/tests/mod.rs +++ b/crate/cli/src/tests/mod.rs @@ -7,10 +7,10 @@ use test_kms_server::TestsContext; use crate::config::ClientConfig; -pub(crate) const PROG_NAME: &str = "cosmian"; - pub(crate) mod kms; +pub(crate) const PROG_NAME: &str = "cosmian"; + pub(crate) fn save_kms_cli_config(kms_ctx: &TestsContext) -> (String, String) { let owner_file_path = env::temp_dir() .join(format!("owner_{}.toml", kms_ctx.server_port)) From 523913b52643e666215e29f30f017ada7a44e78d Mon Sep 17 00:00:00 2001 From: Manuthor Date: Thu, 22 Jan 2026 12:42:13 +0100 Subject: [PATCH 7/7] chore: bump Findex-server to 0.4.12 --- Cargo.lock | 29 ++++++++++------------------- Cargo.toml | 2 +- documentation/docs/index.md | 1 + findex-server | 2 +- kms | 2 +- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 743d920c..de5f34d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1094,7 +1094,7 @@ dependencies = [ [[package]] name = "cosmian_findex_cli" -version = "0.4.11" +version = "0.4.12" dependencies = [ "assert_cmd", "base64 0.22.1", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "cosmian_findex_client" -version = "0.4.11" +version = "0.4.12" dependencies = [ "base64 0.22.1", "cosmian_findex", @@ -1138,7 +1138,7 @@ dependencies = [ [[package]] name = "cosmian_findex_server" -version = "0.4.11" +version = "0.4.12" dependencies = [ "actix-cors", "actix-identity", @@ -1174,7 +1174,7 @@ dependencies = [ [[package]] name = "cosmian_findex_structs" -version = "0.4.11" +version = "0.4.12" dependencies = [ "base64 0.22.1", "cosmian_crypto_core", @@ -2059,7 +2059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2657,7 +2657,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.1", "system-configuration", "tokio", "tower-service", @@ -2866,15 +2866,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.16" @@ -3305,7 +3296,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4031,7 +4022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn", @@ -4343,7 +4334,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4898,7 +4889,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4dcc38d9..335e18b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ cosmian_config_utils = "0.2" cosmian_crypto_core = { version = "10.2", default-features = false, features = [ "ser", ] } -cosmian_findex_cli = { path = "findex-server/crate/cli", version = "0.4.11" } +cosmian_findex_cli = { path = "findex-server/crate/cli", version = "0.4.12" } cosmian_kms_cli = { path = "kms/crate/cli", version = "5.15.0" } test_kms_server = { path = "kms/crate/test_kms_server", version = "5.15.0" } cosmian_logger = "0.6" diff --git a/documentation/docs/index.md b/documentation/docs/index.md index dd1da0b8..5e21a51c 100644 --- a/documentation/docs/index.md +++ b/documentation/docs/index.md @@ -38,6 +38,7 @@ By leveraging Cosmian CLI, users can seamlessly integrate advanced cryptographic | CLI version | KMS version | Findex server version | | ----------- | ---------------- | --------------------- | +| 1.8.0 | 5.15.0 | 0.4.12 | | 1.7.1 | 5.14.1 | 0.4.11 | | 1.7.0 | 5.14.0 | 0.4.10 | | 1.6.0 | 5.13.* | 0.4.* | diff --git a/findex-server b/findex-server index bba47d6d..a837d2ab 160000 --- a/findex-server +++ b/findex-server @@ -1 +1 @@ -Subproject commit bba47d6d85f8083c682da573a198da176b55a5ac +Subproject commit a837d2ab85c4cf787592f18e8617086fe594b14c diff --git a/kms b/kms index b44a4a79..3ea3fc84 160000 --- a/kms +++ b/kms @@ -1 +1 @@ -Subproject commit b44a4a7931a6b660243e3fff8500e60e46d1cdb1 +Subproject commit 3ea3fc849de6f21231118602440657ed90917c38