diff --git a/Cargo.lock b/Cargo.lock index b40c049..136f1b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-lc-rs" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203863f9d2e174fb02f4536e83a30aae55070e2102a35f1a40656c55836cbc38" +checksum = "4663dd05b12583c106367d6c92aaa3571ca1e3cd5474e39e36a8aaf74053ccfb" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -125,10 +125,11 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.6.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7eabba29df3eb5adb5122ffc1b39d3bff8cf89db7b579b4f5456b02013afb02" +checksum = "1204ffc70f0ef919e9810f2f3e34fa41e217234bb1a31f082095ffde646584c8" dependencies = [ + "bindgen", "cmake", "dunce", "libc", @@ -156,6 +157,29 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "bindgen" +version = "0.66.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +dependencies = [ + "bitflags 2.4.0", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.25", + "which", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -195,6 +219,15 @@ dependencies = [ "jobserver", ] +[[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" @@ -213,6 +246,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "4.4.6" @@ -354,6 +398,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + [[package]] name = "errno" version = "0.2.8" @@ -603,6 +653,15 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "iana-time-zone" version = "0.1.53" @@ -664,7 +723,7 @@ checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.36.8", "windows-sys 0.45.0", ] @@ -692,12 +751,28 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[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.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "libm" version = "0.2.6" @@ -712,7 +787,7 @@ dependencies = [ "futures", "log", "openssl", - "ring 0.16.20", + "ring", "rustls-pemfile", "s2n-quic", "thiserror", @@ -735,6 +810,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + [[package]] name = "log" version = "0.4.20" @@ -756,6 +837,12 @@ dependencies = [ "autocfg", ] +[[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.6.2" @@ -783,6 +870,16 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nu-ansi-term" version = "0.49.0" @@ -902,6 +999,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "percent-encoding" version = "2.3.0" @@ -932,6 +1035,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2", + "syn 2.0.25", +] + [[package]] name = "proc-macro2" version = "1.0.64" @@ -1047,26 +1160,12 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", + "spin", + "untrusted", "web-sys", "winapi", ] -[[package]] -name = "ring" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" -dependencies = [ - "cc", - "getrandom 0.2.8", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - [[package]] name = "rscp" version = "0.1.0" @@ -1085,6 +1184,12 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +[[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.36.8" @@ -1095,20 +1200,33 @@ dependencies = [ "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.45.0", ] +[[package]] +name = "rustix" +version = "0.38.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +dependencies = [ + "bitflags 2.4.0", + "errno 0.3.1", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring 0.16.20", + "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -1120,23 +1238,33 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-webpki" +version = "0.101.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "s2n-codec" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b371b77ad7717c2cd57324e3daad0e20b96d06e5ca015c5df910b900dfce4d" +checksum = "f4613226bc72bc8b004d1010d0b571bd367305376505a755c612eec432b03930" dependencies = [ "byteorder", "bytes", "zerocopy", - "zerocopy-derive", + "zerocopy-derive 0.6.4", ] [[package]] name = "s2n-quic" -version = "1.25.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e400c5a2efb1c1d9fb16d974b3d8ef85497869762625185a2205edc26a5e3a5" +checksum = "01e0fbd92f31194ca130ee73f3da6ef6d19022b16f5ad0622aec615b9eb76b8e" dependencies = [ "bytes", "cfg-if", @@ -1154,15 +1282,15 @@ dependencies = [ "s2n-quic-transport", "tokio", "zerocopy", - "zerocopy-derive", + "zerocopy-derive 0.6.4", "zeroize", ] [[package]] name = "s2n-quic-core" -version = "0.25.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b3426a1b470de895af9f424f91afd0e30995552fe7a2496dcb8a5e64a49151" +checksum = "fc69441bd158b14f7d1edae23076dfc2440f398399327fc43c3106c0fecb6dcf" dependencies = [ "atomic-waker", "byteorder", @@ -1177,19 +1305,19 @@ dependencies = [ "s2n-codec", "subtle", "zerocopy", - "zerocopy-derive", + "zerocopy-derive 0.6.4", ] [[package]] name = "s2n-quic-crypto" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89077a94e36b87bd6f37f36e8c4e82fdfefb3c6c6ab97ce4677e4ffcba63bf24" +checksum = "8cefa0f0f22fa0440257b48a79cff92cd294b6e08d5f5ea462679429c0beabe8" dependencies = [ "aws-lc-rs", "cfg-if", "lazy_static", - "ring 0.16.20", + "ring", "s2n-codec", "s2n-quic-core", "zeroize", @@ -1197,9 +1325,9 @@ dependencies = [ [[package]] name = "s2n-quic-platform" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9928aa29b12c17da5b030f35baa1dbbafb370263dffcd50372eebd82df0eb3db" +checksum = "df25bf039887f58f687279246c610454765c3af5df0040465951313e9fae7a76" dependencies = [ "cfg-if", "futures", @@ -1212,9 +1340,9 @@ dependencies = [ [[package]] name = "s2n-quic-rustls" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85aec5aad5ecc4ba4e93d6fa667296602abeaf2d010b98dd5f32b55f556de5d0" +checksum = "428d860efec4c9358a2c6744c75b2f1083d4a63eac8523f29c21383a9b69e29a" dependencies = [ "bytes", "rustls", @@ -1226,9 +1354,9 @@ dependencies = [ [[package]] name = "s2n-quic-tls" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb765f6a895862628233188afe70a6644391f6ddaa79433344a92d9ca7274db" +checksum = "69f70a6dbb34be8946f94c4d18637b1c0d6992a633f1fcc802b184abc41909fb" dependencies = [ "bytes", "errno 0.3.1", @@ -1241,9 +1369,9 @@ dependencies = [ [[package]] name = "s2n-quic-tls-default" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eb5b65b4a6400c4317eb26086aadf76a2b4570d47001b5039ac0ad93e32762" +checksum = "b9ca06d4c9b1e601a24a21488e7875d6fba3aa866a43f8ac36ea13671c57d8f6" dependencies = [ "s2n-quic-rustls", "s2n-quic-tls", @@ -1251,9 +1379,9 @@ dependencies = [ [[package]] name = "s2n-quic-transport" -version = "0.25.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fa2793b77cf140bb3cd2af629758312c26c417f295032847b2938599ab675f" +checksum = "557f9d0a0f4c601730c1ee46e01e9898f63d2950605f971f5d6361d9a1800f18" dependencies = [ "bytes", "futures-channel", @@ -1269,9 +1397,9 @@ dependencies = [ [[package]] name = "s2n-tls" -version = "0.0.34" +version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b97e562fab37efa1c2d4c81796f0cb53e2ddc25d7318a463d26ba60e398fbd" +checksum = "272ff47d0ac396d51bf9adfd64923b03e81b4f17adcb55b5198edc37ba75dcb1" dependencies = [ "errno 0.3.1", "hex", @@ -1282,12 +1410,11 @@ dependencies = [ [[package]] name = "s2n-tls-sys" -version = "0.0.34" +version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890d0a656b99f1bbc396b1a616a1555e924425ef94c68b4910b10b3791cecc45" +checksum = "06f9cd4c666e66849a888cd91e4e65b44fa3899f2bab656ff1dcfdd692bbf967" dependencies = [ "cc", - "cmake", "libc", "openssl-sys", ] @@ -1304,15 +1431,21 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + [[package]] name = "siphasher" -version = "0.3.10" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "slab" @@ -1355,12 +1488,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "strsim" version = "0.10.0" @@ -1519,12 +1646,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "url" version = "2.4.0" @@ -1631,13 +1752,15 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.4" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ - "ring 0.17.3", - "untrusted 0.9.0", + "either", + "home", + "once_cell", + "rustix 0.38.13", ] [[package]] @@ -1810,7 +1933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0f717764196a220d8c58500e3a3595e2c9054f95d66267f9fd5f6e74ad0fec" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.3.0", ] [[package]] @@ -1824,6 +1947,17 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy-derive" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56097d5b91d711293a42be9289403896b68654625021732067eac7a4ca388a1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", +] + [[package]] name = "zeroize" version = "1.5.7" diff --git a/librscp/Cargo.toml b/librscp/Cargo.toml index 8105f5e..a6e1577 100644 --- a/librscp/Cargo.toml +++ b/librscp/Cargo.toml @@ -10,7 +10,7 @@ log.workspace = true ring = "0.16.20" rustls-pemfile = "1.0.3" openssl.workspace = true -s2n-quic = { version = "1.25.0", features = ["provider-address-token-default", "provider-tls-rustls"] } +s2n-quic = { version = "1.29.0", features = ["provider-address-token-default", "provider-tls-rustls"] } tokio = { workspace = true, features = ["rt", "fs", "io-util"] } url = "2.4.0" thiserror = "1.0.49"