From 2f68ab53c00746599700fbc8ca6a9ab5311cfc34 Mon Sep 17 00:00:00 2001 From: Giovanni Barillari Date: Sun, 1 Dec 2024 18:28:35 +0100 Subject: [PATCH] Bump dependencies --- Cargo.lock | 436 +++++++++++++++++++++++++++++------- Makefile | 1 + tests/fixtures/tls/cert.pem | 37 +-- tests/fixtures/tls/key.pem | 52 ++--- 4 files changed, 399 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 331d7ff8..ce9d6b98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -28,11 +28,20 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arc-swap" @@ -52,6 +61,32 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "aws-lc-rs" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" +dependencies = [ + "aws-lc-sys", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -79,6 +114,29 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bindgen" +version = "0.69.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + [[package]] name = "bitflags" version = "2.6.0" @@ -111,9 +169,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cbc" @@ -126,13 +184,24 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.31" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ + "jobserver", + "libc", "shlex", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -149,6 +218,26 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "cmake" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +dependencies = [ + "cc", +] + [[package]] name = "const-oid" version = "0.9.6" @@ -157,9 +246,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -216,6 +305,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "either" version = "1.13.0" @@ -228,12 +323,28 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[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" @@ -350,6 +461,12 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "granian" version = "1.7.0" @@ -360,7 +477,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "itertools", + "itertools 0.13.0", "log", "mimalloc", "pem", @@ -381,9 +498,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -400,9 +517,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -410,12 +527,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hmac" version = "0.12.1" @@ -425,6 +536,15 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "http" version = "1.1.0" @@ -473,9 +593,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -493,9 +613,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-util", @@ -508,9 +628,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", @@ -532,6 +652,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -543,15 +672,46 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "jobserver" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" + +[[package]] +name = "libloading" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +dependencies = [ + "cfg-if", + "windows-targets", +] [[package]] name = "libmimalloc-sys" @@ -563,6 +723,12 @@ dependencies = [ "libc", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + [[package]] name = "lock_api" version = "0.4.12" @@ -603,6 +769,12 @@ dependencies = [ "libmimalloc-sys", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.0" @@ -614,14 +786,23 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", ] [[package]] @@ -662,6 +843,12 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pbkdf2" version = "0.12.2" @@ -749,9 +936,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "ppv-lite86" @@ -762,20 +949,30 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51" +checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" dependencies = [ "anyhow", "cfg-if", @@ -792,9 +989,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179" +checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" dependencies = [ "once_cell", "python3-dll-a", @@ -803,9 +1000,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d" +checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" dependencies = [ "libc", "pyo3-build-config", @@ -824,9 +1021,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e" +checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -836,9 +1033,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce" +checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" dependencies = [ "heck", "proc-macro2", @@ -849,9 +1046,9 @@ dependencies = [ [[package]] name = "python3-dll-a" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +checksum = "9b9e268ee1be609e93a13eb06839f68f67e5fe0fb4049834d261c2d5091c1b6d" dependencies = [ "cc", ] @@ -904,6 +1101,35 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + [[package]] name = "ring" version = "0.17.8" @@ -916,7 +1142,7 @@ dependencies = [ "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -925,14 +1151,34 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ + "aws-lc-rs", "log", - "ring", + "once_cell", "rustls-pki-types", "rustls-webpki", "subtle", @@ -950,16 +1196,17 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -993,18 +1240,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -1065,12 +1312,12 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1097,9 +1344,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.85" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1114,18 +1361,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -1154,9 +1401,9 @@ dependencies = [ [[package]] name = "tls-listener" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a296135fdab7b3a1f708c338c50bab570bcd77d44080cde9341df45c0c6d73" +checksum = "0f1d8809f604e448c7bc53a5a0e4c2a0a20ba44cb1fb407314c8eeccb92127f9" dependencies = [ "futures-util", "pin-project-lite", @@ -1167,9 +1414,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -1180,7 +1427,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1196,9 +1443,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -1243,9 +1490,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-core", @@ -1253,9 +1500,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -1286,9 +1533,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unindent" @@ -1320,6 +1567,18 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -1329,6 +1588,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/Makefile b/Makefile index a4f91313..304c0eeb 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ lint-rust: -A clippy::too-many-lines \ -A clippy::type-complexity \ -A clippy::unused-self \ + -A clippy::used_underscore_items \ -A clippy::wrong-self-convention .PHONY: lint diff --git a/tests/fixtures/tls/cert.pem b/tests/fixtures/tls/cert.pem index d40ae5cc..936907ee 100644 --- a/tests/fixtures/tls/cert.pem +++ b/tests/fixtures/tls/cert.pem @@ -1,19 +1,22 @@ -----BEGIN CERTIFICATE----- -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 +8jcytfWrXA== -----END CERTIFICATE----- diff --git a/tests/fixtures/tls/key.pem b/tests/fixtures/tls/key.pem index 3de228aa..1137d8be 100644 --- a/tests/fixtures/tls/key.pem +++ b/tests/fixtures/tls/key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2FQo8nqgADyuX -UUvQZlmZfrEC5+5rWgJ9NWqLmyudnYfkvMsAXISIbCKs8Iic66J70fQijt6E3Zqh -T6mRtwqs4uhT38ZFwtp9oqR2fActKFd5Nh3omNgM71GSWt37VKR7eMmZNcGLIxm2 -4Fr5wC2TctiSksY4iEgZIuMkdfRbkvYG5xhzFsdOAWiwht7HhGczoommN8jV2QQh -gvBTTLYI7src+LTWpqpPgugCT2dLe30CLHJhc0GOoZfQFzShHIpg/88T3ND2Tbo8 -c30YgV0qieXK8yX+wnysZjcOkdDEZtiDz67P0OMnO5dGQdkVzckuZbbc3MDrNOq1 -hpL6o/wzAgMBAAECggEAMDFNblIH4Uwim4BW8qfEW04fB8ffYOaH9h/nPWAqoSMK -zs3xZP0Xzwvf+aoIXpA3h1JArczmtH/652swVHMADlZYa6q0zc4PCmW75ehZ9efR -jzF1pRSfSn0lN/l4+4ahqlSD91s1COCXc8HaEnR9G6OwEstqT5gyjQSg3guiS4Id -8sT/Tm9xaC0IWPgT4v3CCv0t9oUrCahGIwLwhAF+rv8AJ9CC7SVU7Fl5t0XsV+zR -xcWsDplaUyRybdqBkYEnCI/BAAtO0QVPXtsupFWSmjXPW815+lIagQ7Jxx/2UbK/ -GUExUgcKX2fQnNTEyU7z1KtaHvxEV8p2fW+6JPhEoQKBgQDbP/PH6uIl+Y07GB8y -ZQm8Htfna387+gopcWXkJ9EHDx0uNmjVaPLtbql+9MQudPAzJvCx5Oq6cGQlzydM -G6z8nkjRAcoUBpbChLRxJnCps1cdgQEIo9ZJJ2Po1m5Y7PwLzkbY5DnizZ6bYQZu -8BNPLQZ1vqLDwYiiJM0L0m0PGwKBgQDUmjfpJIul+DyPgLnlEiOyPif7SUkZ2UAN -+CX392K7RvN69bdqGpu1xPq75VFQx0vU5td8TGZkhFtpSq+hB/pzyjrhYhbE5q5B -H7JVEOg/wzpQx9o9Hks0NfkkmgzHIPywm+jYeGFN4mRIIMbbqw9hPwuA1w45q+tM -QaVQqJtgyQKBgDZTl2VPFzBPsKYW6QwEqy/Y+KiYI1PKNiBkv9mT4CB+pz1fMATJ -V4BrrkYOAlp8kVQrbvK1hVAjLz2LIfKi3O9PjT100wy5QTv7w/ZRjxMNpCVkZMwu -RJel0gTMtVUFi8KlHzr4+jrvtkBL/1sX08EHqBUe4pfc6a07ry8hufJHAoGBAL3v -wX+izLhMXB6AjJOgbw+xBBs1z/8t3lIcnh84fpZ9vszddS1v9CiigLcZGlqmkpL0 -YROFVfz7Wodo2Btve0uzIoN1FI544LkBzlq9LiC5FAJTaiAsTleo2JrgngXQ7LAD -ujSa56OjXKAr2D0sSCNDJc3HU8gmVaLdCwpSd+4xAoGAZbn5LES8E4IK+lNsGtB1 -bcZMKx2bh2zwyzfOJqGeet6gOxH0Su8SN4ZkoCoKhWkFgUfaDUzbFAsmFT5JTtdP -am4ZujVA8cuRjFpkmI4699+xUf1p5REm16pGqtakZX2b4Y+m83QdxJBgIjDCE7+h -rdBYEFx4QMT39EFTVfrMGi4= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDYGMLMz0kovTIF +mX+OCeNDopGos0BXcsoJi905Cfgx+UuaS3lpK9PP1+K6DbVN7qImrFSfzjWxzz5E +duBny7ZvPp+26ud4HG4PYtg1Cw0qX9eRjYEG4nfcZZOozZnKWnAGo99Zw63Y2LK0 +Wt9kQgsS2/JZ0kCag5f0oHMvm6mVSU0mKmjnVZOnsya0H1Z+Y4r5Mk4HO2HgiuOA +xbKmyNDUCJ+Jpmekmu9ItSt+5ewLPnZCvjIkOMBLYapVjCk/t25S8Q7q0U/E+uMp +5A3REXPNmwPPnPgX/F21fD4UDyjF7CpK0/xVJYmojB5faUctH8GL1mrfUNaAMEup +3XoYm+zdAgMBAAECggEAIN5rStxrQ/oQZg+kpNsrfo8iA/yigxVKVndirRlaGhJ8 +MGTd0Q8XMZxPDSj79HWhTlaUrJX1+YIMoOdKrMmsicaHDpCI/UOobfNamtQqgCaB +0yQohak5aAQ/QxllagT62IJhJ6B+4eaGuq4TyoZ3yWTmZkkiWx48T7t+qbV4mY8m +zw+dkfhC+YQ+W505zlIYsHk5fb24erxgbBjNAWvQPp2KRCoEbpa6yAMcAIY+sDjC +HUyKZlkkRy7rhHR9lQWJISrc76KGgEVOtfgBaMjFU85E8Lk2HCB+/+8erKp7yqpb +dSW8ONshuzFqgg8djjHy1yiu+/BsmuXUEeoWAio09QKBgQDwCF0Bxm3X4kSK0TMs +58pNH2dy4ehPa8YhJeHfYl+Jt4uKEZ94CQ0FSs3OEvCTP6mxJSULcl4ea1exwZSQ +nB1y0F3rUuijOOsMM4a7+3rjbf7EdGvLGidKNorcOGpEtYeNHs4VxvzaLm/d7LJS +7N8W2DDq7ZRwMa8UDR9uAbHh9wKBgQDmeMfHkGIzWWKX4j+U7BO9w2rpWTQyjfuX +5EMeEjwNkMd39K1NKF6VGJKFo7b6hANPln01hAZPCTWncOl2RdpjKLC4pME7iZNh +Qfx3NvEAjUPVTRShhlJSGr1nnbjtfDmeyRXHf/2pp/cBH3T4uFnpHyklqsA2US59 +beVIHhCyywKBgQCE36xUyjqOMmRNECerKRj0/nhuwR2vsXJ5cRYLadKHUwK8yKql +cSUzE8i/1f41FR3jwTMzlfkCD9v4u7d5IeKvZydGmJvNlzmOhIuGTl0lvwM0T1pI +kU7Ep1LRO62gIXlLJo1gwsnAIcqtaFUC0LtiUwUpV6E/RlGr4OPQKsIE2wKBgQDe +TI9+KQDfQI89qsfjL9ZWyh/cFeOoA5UyS8SFQ9dSylvrk0B5VL/uFbZ2WpQKjLzY +znHU5ZRkNaDf8aPuJbBgxoW2g4uyjp9uRwRqRL8u5hMQsXl91x6d/RbF07bkslat +lo2AUS7troosNhhQMxjeJ+U7ZLhja+hoqVBnQEChAwKBgFUHNRcG3WRHBdEp5FVr +TSw6Dat4J3tjprzkWBTGmI/YSrqmOkz2pRQExFYi8IW05hJOaSE4EbHUJFdidjwK +uF6m1c5d02rFUAdJXVpWmOanNRyJWN17FEqwqA1sPLtS26GfwcgdgfoTk+OeltEy +MSdRCaLuqwec62UiH11lq0dp -----END PRIVATE KEY-----