diff --git a/Cargo.lock b/Cargo.lock index 18ed09bd..4475eacf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,9 +123,9 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "argon2" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73" +checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" dependencies = [ "base64ct", "blake2", @@ -315,12 +315,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", - "futures-lite", ] [[package]] @@ -398,9 +397,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", @@ -758,13 +757,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6137c6234afb339e75e764c866e3594900f0211e1315d33779f269bbe2ec6967" +checksum = "13d8068b6ccb8b34db9de397c7043f91db8b4c66414952c6db944f238c4d3db3" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes 1.4.0", "futures-util", "headers", @@ -785,16 +784,15 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" dependencies = [ "async-trait", "bytes 1.4.0", @@ -809,9 +807,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f6236b9edabc109ec6d5836ce90e359854a4e267d4241d29202f73261ad622" +checksum = "2094b0e3a4f9c2589cbfdaa7eaab9ba9f9f4ab12c601eff22ae4f964340d0e5d" dependencies = [ "axum", "bytes 1.4.0", @@ -829,9 +827,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbf955307ff8addb48d2399393c9e2740dd491537ec562b66ab364fc4a38841" +checksum = "39bcef27b56d5cad8912d735d5ed1286f073f7bcb88cc31b38a15b514fcf8600" dependencies = [ "heck", "proc-macro2", @@ -856,9 +854,9 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -916,6 +914,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f6e5df9abedba5099a01a6567c6086a6fbcff57af07c360d356737f9e0c644" + [[package]] name = "blake2" version = "0.10.6" @@ -927,9 +931,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -1041,9 +1045,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -1098,9 +1102,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -1114,9 +1118,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.6.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" +checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", "chrono-tz-build", @@ -1125,9 +1129,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.0.3" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" +checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" dependencies = [ "parse-zoneinfo", "phf", @@ -1145,9 +1149,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -1156,11 +1160,11 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.6" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", "is-terminal", @@ -1171,9 +1175,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" dependencies = [ "heck", "proc-macro-error", @@ -1290,18 +1294,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b18cf92869a6ae85cde3af4bc4beb6154efa8adef03b18db2ad413d5bce3a2" +checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567d9f6e919bac076f39b902a072686eaf9e6d015baa34d10a61b85105b7af59" +checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b" dependencies = [ "arrayvec", "bumpalo", @@ -1320,33 +1324,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e72b2d5ec8917b2971fe83850187373d0a186db4748a7c23a5f48691b8d92bb" +checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3461c0e0c2ebbeb92533aacb27e219289f60dc84134ef34fbf2d77c9eddf07ef" +checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d" [[package]] name = "cranelift-entity" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af684f7f7b01427b1942c7102673322a51b9d6f261e9663dc5e5595786775531" +checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d361ed0373cf5f086b49c499aa72227b646a64f899f32e34312f97c0fadff75" +checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1" dependencies = [ "cranelift-codegen", "log", @@ -1356,15 +1360,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef4f8f3984d772c199a48896d2fb766f96301bf71b371e03a2b99f4f3b7b931" +checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358" [[package]] name = "cranelift-native" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98e4e99a353703475d5acb402b9c13482d41d8a4008b352559bd560afb90363" +checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41" dependencies = [ "cranelift-codegen", "libc", @@ -1373,9 +1377,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e3f4f0779a1b0f286a6ef19835d8665f88326e656a6d7d84fa9a39fa38ca32" +checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1413,9 +1417,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1433,18 +1437,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "071c0f5945634bc9ba7a452f492377dd6b1993665ddb58f28704119b32f07a9a" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -1465,9 +1469,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ "csv-core", "itoa", @@ -1505,9 +1509,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" +checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" dependencies = [ "cc", "cxxbridge-flags", @@ -1517,9 +1521,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" +checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" dependencies = [ "cc", "codespan-reporting", @@ -1532,15 +1536,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" +checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" [[package]] name = "cxxbridge-macro" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" dependencies = [ "proc-macro2", "quote", @@ -1549,9 +1553,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1559,9 +1563,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", @@ -1573,9 +1577,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", @@ -1632,12 +1636,12 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" dependencies = [ "const-oid", - "pem-rfc7468 0.6.0", + "pem-rfc7468", "zeroize", ] @@ -1734,15 +1738,15 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" -version = "0.15.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12844141594ad74185a926d030f3b605f6a903b4e3fec351f3ea338ac5b7637e" +checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" dependencies = [ "der", "elliptic-curve", @@ -1761,19 +1765,18 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest", "ff", "generic-array", "group", "hkdf", - "pem-rfc7468 0.6.0", + "pem-rfc7468", "pkcs8", "rand_core 0.6.4", "sec1", @@ -1878,9 +1881,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", "subtle", @@ -1951,9 +1954,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -1966,9 +1969,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -1976,15 +1979,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -2004,9 +2007,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-lite" @@ -2025,9 +2028,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", @@ -2051,15 +2054,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-timer" @@ -2069,9 +2072,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2103,6 +2106,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2173,7 +2177,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -2192,9 +2196,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", @@ -2203,9 +2207,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes 1.4.0", "fnv", @@ -2269,7 +2273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes 1.4.0", "headers-core", "http", @@ -2418,9 +2422,12 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humansize" -version = "1.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] [[package]] name = "humantime" @@ -2430,9 +2437,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes 1.4.0", "futures-channel", @@ -2554,9 +2561,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2b9d82064e8a0226fddb3547f37f28eaa46d0fc210e275d835f08cf3b76a7" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" [[package]] name = "infer" @@ -2611,9 +2618,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" dependencies = [ "libc", "windows-sys 0.45.0", @@ -2667,15 +2674,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -2703,9 +2710,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a55e0ff3b72c262bcf041d9e97f1b84492b68f1c1a384de2323d3dc9403397" +checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" dependencies = [ "cfg-if", "ecdsa", @@ -2774,9 +2781,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libm" @@ -2807,9 +2814,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "listenfd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4fcc00ff6731d94b70e16e71f43bda62883461f31230742e3bc6dddf12988" +checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" dependencies = [ "libc", "uuid", @@ -2955,7 +2962,7 @@ dependencies = [ "mas-iana", "mas-jose", "mas-keystore", - "pem-rfc7468 0.7.0", + "pem-rfc7468", "rand 0.8.5", "rand_chacha 0.3.1", "rustls-pemfile", @@ -3172,7 +3179,6 @@ name = "mas-keystore" version = "0.1.0" dependencies = [ "aead", - "anyhow", "base64ct", "chacha20poly1305", "const-oid", @@ -3187,7 +3193,7 @@ dependencies = [ "mas-jose", "p256", "p384", - "pem-rfc7468 0.6.0", + "pem-rfc7468", "pkcs1", "pkcs8", "rand 0.8.5", @@ -3226,11 +3232,11 @@ version = "0.1.0" dependencies = [ "assert_matches", "base64ct", - "bitflags", + "bitflags 2.0.0", "bytes 1.4.0", "chrono", "form_urlencoded", - "futures 0.3.26", + "futures 0.3.27", "futures-signals", "futures-util", "headers", @@ -3492,7 +3498,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.5", + "spin 0.9.6", "version_check", ] @@ -3705,7 +3711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.27", "futures-executor", "http", "once_cell", @@ -3724,7 +3730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.27", "futures-util", "http", "opentelemetry", @@ -3753,7 +3759,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" dependencies = [ - "futures 0.3.26", + "futures 0.3.27", "futures-util", "opentelemetry", "prost", @@ -3867,9 +3873,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55" +checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47" dependencies = [ "ecdsa", "elliptic-curve", @@ -3879,9 +3885,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630a4a9b2618348ececfae61a4905f564b817063bf2d66cdfc2ced523fe1d2d4" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ "ecdsa", "elliptic-curve", @@ -3986,9 +3992,9 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", @@ -3997,15 +4003,15 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" dependencies = [ "digest", "hmac", @@ -4036,15 +4042,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4062,9 +4059,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -4072,9 +4069,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -4082,9 +4079,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", @@ -4095,9 +4092,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", @@ -4116,18 +4113,18 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" dependencies = [ "phf_generator", "phf_shared", @@ -4135,9 +4132,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared", "rand 0.8.5", @@ -4145,9 +4142,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", "uncased", @@ -4187,9 +4184,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs1" -version = "0.4.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" +checksum = "178ba28ece1961eafdff1991bd1744c29564cbab5d803f3ccb4a4895a6c550a7" dependencies = [ "der", "pkcs8", @@ -4199,14 +4196,13 @@ dependencies = [ [[package]] name = "pkcs5" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10d862c1f5c302df3c3dbfd837afbae0ad09551a6fa37b10311cb5890a80175" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" dependencies = [ "aes", "cbc", "der", - "hmac", "pbkdf2", "scrypt", "sha2", @@ -4215,9 +4211,9 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" dependencies = [ "der", "pkcs5", @@ -4233,16 +4229,18 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polling" -version = "2.5.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] @@ -4276,9 +4274,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "4ebcd279d20a4a0a2404a33056388e950504d891c855c7975b9a8fef75f3bf04" dependencies = [ "proc-macro2", "syn", @@ -4286,9 +4284,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2" +checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0" dependencies = [ "elliptic-curve", ] @@ -4329,9 +4327,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -4439,16 +4437,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "50686e0021c4136d1d453b2dfe059902278681512a34d4248435dc34b6b5c8ec" dependencies = [ "proc-macro2", ] @@ -4536,7 +4534,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4635,13 +4633,12 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "rfc6979" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "crypto-bigint", "hmac", - "zeroize", + "subtle", ] [[package]] @@ -4661,9 +4658,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.8.1" +version = "0.9.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b3896c9b7790b70a9aa314a30e4ae114200992a19c96cbe0ca6070edd32ab8" +checksum = "a7bc1d34159d63536b4d89944e9ab5bb952f45db6fa0b8b03c2f8c09fb5b7171" dependencies = [ "byteorder", "digest", @@ -4681,9 +4678,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.28.1" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13cf35f7140155d02ba4ec3294373d513a3c7baa8364c162b030e33c61520a8" +checksum = "2b1b21b8760b0ef8ae5b43d40913ff711a2053cb7ff892a34facff7a6365375a" dependencies = [ "arrayvec", "num-traits", @@ -4706,11 +4703,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4753,15 +4750,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "salsa20" @@ -4824,17 +4821,16 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "scrypt" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "hmac", "pbkdf2", "salsa20", "sha2", @@ -4852,9 +4848,9 @@ dependencies = [ [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" dependencies = [ "base16ct", "der", @@ -4870,7 +4866,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4889,9 +4885,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "sentry" @@ -5005,9 +5001,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" dependencies = [ "serde_derive", ] @@ -5027,9 +5023,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" dependencies = [ "proc-macro2", "quote", @@ -5049,9 +5045,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -5060,9 +5056,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "db0969fff533976baadd92e08b1d102c5a3d8a8049eadfd69d4d1e3c5b2ed189" dependencies = [ "serde", ] @@ -5092,9 +5088,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" +checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf" dependencies = [ "base64 0.13.1", "chrono", @@ -5108,9 +5104,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" +checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f" dependencies = [ "darling", "proc-macro2", @@ -5120,9 +5116,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.17" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" +checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ "indexmap", "itoa", @@ -5235,9 +5231,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -5251,15 +5247,15 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" +checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" [[package]] name = "spki" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" dependencies = [ "base64ct", "der", @@ -5301,7 +5297,7 @@ dependencies = [ "ahash", "atoi", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "byteorder", "bytes 1.4.0", "chrono", @@ -5475,9 +5471,9 @@ dependencies = [ [[package]] name = "tera" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c" +checksum = "27df4164dd125228af4c90c9799a29740e39151767d579f3fc711491054a0378" dependencies = [ "chrono", "chrono-tz", @@ -5492,6 +5488,7 @@ dependencies = [ "serde", "serde_json", "slug", + "thread_local", "unic-segment", ] @@ -5506,18 +5503,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", @@ -5526,11 +5523,10 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "cfg-if", "once_cell", ] @@ -5611,9 +5607,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes 1.4.0", @@ -5626,7 +5622,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -5732,9 +5728,9 @@ checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" dependencies = [ "indexmap", "toml_datetime", @@ -5814,7 +5810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "async-compression", - "bitflags", + "bitflags 1.3.2", "bytes 1.4.0", "futures-core", "futures-util", @@ -5898,7 +5894,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.26", + "futures 0.3.27", "futures-task", "pin-project", "tracing", @@ -6074,15 +6070,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -6129,9 +6125,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" +checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" [[package]] name = "untrusted" @@ -6333,9 +6329,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9010891d0b8e367c3be94ca35d7bc25c1de3240463bb1d61bcfc8c2233c4e0d0" +checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" dependencies = [ "anyhow", "async-trait", @@ -6363,18 +6359,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65805c663eaa8257b910666f6d4b056b5c7329750da754ba5df54f3af7dbf35c" +checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2049ddfc1b10efc3c5591d0e84b9570ca50478f8818f3bfabb1a467918f53fb4" +checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa" dependencies = [ "anyhow", "base64 0.13.1", @@ -6392,9 +6388,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9086679497e0a0b441d47ebb4781def9fed3d224feee913464a9a9e2950bac89" +checksum = "059ded8e36aa047039093fb3203e719864b219ba706ef83115897208c45c7227" dependencies = [ "anyhow", "proc-macro2", @@ -6407,15 +6403,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3dd61938af6e06b60b9c5b916b48c9d2b77102e80559fcb4e5afb0c5f5bfdf" +checksum = "925da75e4b2ba3a45671238037f8b496418c092dff287503ca4375824a234024" [[package]] name = "wasmtime-cranelift" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9065cad6a724fa838ec8497567e0b23acc26417bb2449f8d9d2021925c72f2" +checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c" dependencies = [ "anyhow", "cranelift-codegen", @@ -6434,9 +6430,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f964bb0b91fa021b8d1b488c62cc77b346c1dae6e3ebd010050b57c1f2ca657" +checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" dependencies = [ "anyhow", "cranelift-entity", @@ -6453,9 +6449,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9172517a3331b2a486266f7e16b637b27db6cdf5cddf7d055cd145da14cada46" +checksum = "07739b74248aa609a51061956735e3e394cc9e0fe475e8f821bc837f12d5e547" dependencies = [ "cc", "cfg-if", @@ -6466,9 +6462,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a1d06f5d109539e0168fc74fa65e3948ac8dac3bb8cdbd08b62b36a0ae27b8" +checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -6489,18 +6485,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76ef2e410329aaf8555ac6571d6fe07711be0646dcdf7ff3ab750a42ed2e583" +checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1fd0f0dd79e7cc0f55b102e320d7c77ab76cd272008a8fd98e25b5777e2636" +checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" dependencies = [ "cfg-if", "libc", @@ -6509,9 +6505,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271aef9b4ca2e953a866293683f2db33cda46f6933c5e431e68d8373723d4ab6" +checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" dependencies = [ "anyhow", "cc", @@ -6534,9 +6530,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18144b0e45479a830ac9fcebfc71a16d90dc72d8ebd5679700eb3bfe974d7df" +checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" dependencies = [ "cranelift-entity", "serde", @@ -6546,9 +6542,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "6.0.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92eb1c58cfa115b29e04ff3882ecbd1c8b6db3639b200c72418be5fd43eab3ff" +checksum = "c85c2889e5b4fd2713f02238c7bce6bd4a7e901e1ef251f8b414d5d9449167ea" dependencies = [ "anyhow", "heck", @@ -6563,7 +6559,7 @@ checksum = "839fea2d85719bb69089290d7970bba2131f544448db8f990ea75813c30775ca" dependencies = [ "anyhow", "bytes 1.4.0", - "futures 0.3.26", + "futures 0.3.27", "maplit", "serde", "serde_bser", @@ -6602,15 +6598,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "which" version = "4.4.0" @@ -6624,9 +6611,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" +checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" dependencies = [ "wasm-bindgen", "web-sys", @@ -6689,9 +6676,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -6704,51 +6691,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" dependencies = [ "memchr", ] @@ -6772,7 +6759,7 @@ dependencies = [ "async-trait", "base64 0.13.1", "deadpool", - "futures 0.3.26", + "futures 0.3.27", "futures-timer", "http-types", "hyper", @@ -6786,9 +6773,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48914ea89d43d7b51fed072143b86b499059a85e27b401e6cdbd0ca1f0c1dc9" +checksum = "f887c3da527a51b321076ebe6a7513026a4757b6d4d144259946552d6fc728b3" dependencies = [ "anyhow", "id-arena", diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index 205def9d..def8fe11 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -6,24 +6,24 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.64" -axum = { version = "0.6.9", features = ["headers"] } -axum-extra = { version = "0.6.0", features = ["cookie-private"] } -chrono = "0.4.23" +async-trait = "0.1.66" +axum = { version = "0.6.11", features = ["headers"] } +axum-extra = { version = "0.7.1", features = ["cookie-private"] } +chrono = "0.4.24" data-encoding = "2.3.3" -futures-util = "0.3.26" +futures-util = "0.3.27" headers = "0.3.8" http = "0.2.9" http-body = "0.4.5" mime = "0.3.16" rand = "0.8.5" sentry = { version = "0.30.0", default-features = false } -serde = "1.0.152" -serde_with = "2.2.0" +serde = "1.0.155" +serde_with = "2.3.1" serde_urlencoded = "0.7.1" -serde_json = "1.0.93" -thiserror = "1.0.38" -tokio = "1.25.0" +serde_json = "1.0.94" +thiserror = "1.0.39" +tokio = "1.26.0" tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.37" url = "2.3.1" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 7b63ada9..7e7d37f7 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,20 +8,20 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.69" atty = "0.2.14" -axum = "0.6.9" -camino = "1.1.3" -clap = { version = "4.1.6", features = ["derive"] } +axum = "0.6.11" +camino = "1.1.4" +clap = { version = "4.1.8", features = ["derive"] } dotenv = "0.15.0" -hyper = { version = "0.14.24", features = ["full"] } +hyper = { version = "0.14.25", features = ["full"] } itertools = "0.10.5" -listenfd = "1.0.0" +listenfd = "1.0.1" rand = "0.8.5" rand_chacha = "0.3.1" rustls = "0.20.8" -serde_json = "1.0.93" -serde_yaml = "0.9.17" +serde_json = "1.0.94" +serde_yaml = "0.9.19" sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } -tokio = { version = "1.25.0", features = ["full"] } +tokio = { version = "1.26.0", features = ["full"] } tower = { version = "0.4.13", features = ["full"] } tower-http = { version = "0.4.0", features = ["fs", "compression-full"] } url = "2.3.1" @@ -59,7 +59,7 @@ mas-templates = { path = "../templates" } oauth2-types = { path = "../oauth2-types" } [dev-dependencies] -indoc = "2.0.0" +indoc = "2.0.1" [features] default = ["jaeger", "zipkin", "webpki-roots", "policy-cache"] diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 0259b0e7..9b2bbe08 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -6,30 +6,30 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.25.0", features = ["fs", "rt"] } +tokio = { version = "1.26.0", features = ["fs", "rt"] } tracing = { version = "0.1.37" } -async-trait = "0.1.64" +async-trait = "0.1.66" -thiserror = "1.0.38" +thiserror = "1.0.39" anyhow = "1.0.69" -camino = { version = "1.1.3", features = ["serde1"] } -chrono = { version = "0.4.23", features = ["serde"] } +camino = { version = "1.1.4", features = ["serde1"] } +chrono = { version = "0.4.24", features = ["serde"] } figment = { version = "0.10.8", features = ["env", "yaml", "test"] } schemars = { version = "0.8.12", features = ["url", "chrono"] } ulid = { version = "1.0.0", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } -serde = { version = "1.0.152", features = ["derive"] } -serde_with = { version = "2.2.0", features = ["hex", "chrono"] } -serde_json = "1.0.93" +serde = { version = "1.0.155", features = ["derive"] } +serde_with = { version = "2.3.1", features = ["hex", "chrono"] } +serde_json = "1.0.94" pem-rfc7468 = "0.7.0" rustls-pemfile = "1.0.2" rand = "0.8.5" rand_chacha = "0.3.1" -indoc = "2.0.0" +indoc = "2.0.1" mas-jose = { path = "../jose" } mas-keystore = { path = "../keystore" } diff --git a/crates/data-model/Cargo.toml b/crates/data-model/Cargo.toml index 98d6f4f0..313c50ed 100644 --- a/crates/data-model/Cargo.toml +++ b/crates/data-model/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -chrono = "0.4.23" -thiserror = "1.0.38" -serde = "1.0.152" +chrono = "0.4.24" +thiserror = "1.0.39" +serde = "1.0.155" url = { version = "2.3.1", features = ["serde"] } crc = "3.0.1" ulid = { version = "1.0.0", features = ["serde"] } diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index 5ffefed8..bf936a5c 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.64" +async-trait = "0.1.66" tracing = "0.1.37" -thiserror = "1.0.38" +thiserror = "1.0.39" aws-sdk-sesv2 = { version = "0.24.0", default-features = false } aws-config = { version = "0.54.1", default-features = false } diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml index b06849dd..e1441ba5 100644 --- a/crates/graphql/Cargo.toml +++ b/crates/graphql/Cargo.toml @@ -8,10 +8,10 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.69" async-graphql = { version = "5.0.6", features = ["chrono", "url"] } -chrono = "0.4.23" -serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.25.0", features = ["sync"] } -thiserror = "1.0.38" +chrono = "0.4.24" +serde = { version = "1.0.155", features = ["derive"] } +tokio = { version = "1.26.0", features = ["sync"] } +thiserror = "1.0.39" tracing = "0.1.37" ulid = "1.0.0" url = "2.3.1" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index f7383297..0e960719 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -7,24 +7,24 @@ license = "Apache-2.0" [dependencies] # Async runtime -tokio = { version = "1.25.0", features = ["macros"] } -futures-util = "0.3.26" +tokio = { version = "1.26.0", features = ["macros"] } +futures-util = "0.3.27" # Logging and tracing tracing = "0.1.37" # Error management -thiserror = "1.0.38" +thiserror = "1.0.39" anyhow = "1.0.69" sentry = { version = "0.30.0", default-features = false } # Web server -hyper = { version = "0.14.24", features = ["full"] } +hyper = { version = "0.14.25", features = ["full"] } tower = "0.4.13" tower-http = { version = "0.4.0", features = ["cors"] } -axum = "0.6.9" -axum-macros = "0.3.4" -axum-extra = { version = "0.6.0", features = ["cookie-private"] } +axum = "0.6.11" +axum-macros = "0.3.6" +axum-extra = { version = "0.7.1", features = ["cookie-private"] } async-graphql = { version = "5.0.6", features = ["tracing", "apollo_tracing"] } @@ -35,20 +35,20 @@ lettre = { version = "0.10.3", default-features = false, features = ["builder"] sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization -serde = { version = "1.0.152", features = ["derive"] } -serde_with = { version = "2.2.0", features = ["hex", "chrono"] } -serde_json = "1.0.93" +serde = { version = "1.0.155", features = ["derive"] } +serde_with = { version = "2.3.1", features = ["hex", "chrono"] } +serde_json = "1.0.94" serde_urlencoded = "0.7.1" # Password hashing -argon2 = { version = "0.4.1", features = ["password-hash", "std"] } +argon2 = { version = "0.5.0", features = ["password-hash", "std"] } bcrypt = "0.14.0" -pbkdf2 = { version = "0.11.0", features = ["password-hash", "std"] } +pbkdf2 = { version = "0.12.1", features = ["password-hash", "std", "simple"] } zeroize = "1.5.7" # Various data types and utilities -camino = "1.1.3" -chrono = { version = "0.4.23", features = ["serde"] } +camino = "1.1.4" +chrono = { version = "0.4.24", features = ["serde"] } time = "0.3.20" url = { version = "2.3.1", features = ["serde"] } mime = "0.3.16" @@ -74,7 +74,7 @@ mas-templates = { path = "../templates" } oauth2-types = { path = "../oauth2-types" } [dev-dependencies] -indoc = "2.0.0" +indoc = "2.0.1" insta = "1.28.0" tracing-subscriber = "0.3.16" diff --git a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-2.snap b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-2.snap index 667a6db8..00b3c9ab 100644 --- a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-2.snap +++ b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-2.snap @@ -2,4 +2,4 @@ source: crates/handlers/src/passwords.rs expression: hash --- -$argon2id$v=19$m=4096,t=3,p=1$4aRFZH7bgRs24delZVap/Q$x9rbM2Yx2N/aWfSuyVJGZGaQ+zyoE4Vz1FO2+q9fu2Q +$argon2id$v=19$m=19456,t=2,p=1$4aRFZH7bgRs24delZVap/Q$Y2SNOQuEfwWuBXflRnbJhqpksexRziQ9Wf9BatCuIVY diff --git a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-3.snap b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-3.snap index 6aeca73d..62a4cee9 100644 --- a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-3.snap +++ b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hash_verify_and_upgrade-3.snap @@ -2,4 +2,4 @@ source: crates/handlers/src/passwords.rs expression: hash --- -$argon2id$v=19$m=4096,t=3,p=1$1Ke64U6Mrdl5imSjjFRU+g$nL9kuMffxzJtFwANOEudh7FCpNJFPcYOA7xTbBLTCKI +$argon2id$v=19$m=19456,t=2,p=1$1Ke64U6Mrdl5imSjjFRU+g$yirg39x3QVVTxsV5OI4usyIaCw6IRxPl5Li3mQyNmN8 diff --git a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id-2.snap b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id-2.snap index 38302828..b72eb99b 100644 --- a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id-2.snap +++ b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id-2.snap @@ -2,4 +2,4 @@ source: crates/handlers/src/passwords.rs expression: hash --- -$argon2id$v=19$m=4096,t=3,p=1$1WdxAF1UChkYSTnJ6NDbKg$5Gxr/7C+gWUwqDLQmLJ2JiAzg/VxVb5Z+A65bqVoFkU +$argon2id$v=19$m=19456,t=2,p=1$1WdxAF1UChkYSTnJ6NDbKg$ajKAfwlUmkbxITSdh55j+Hvoxzppx20ArNUF44oV9Nk diff --git a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id.snap b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id.snap index b7514c33..81780432 100644 --- a/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id.snap +++ b/crates/handlers/src/snapshots/mas_handlers__passwords__tests__hashing_argon2id.snap @@ -2,4 +2,4 @@ source: crates/handlers/src/passwords.rs expression: hash --- -$argon2id$v=19$m=4096,t=3,p=1$eEi11xG8mIOZYxej+ckCaQ$pHZ/JwntSCS5qx6+MPK8XJUQSmSZ5rdXtxUew+rnXQI +$argon2id$v=19$m=19456,t=2,p=1$eEi11xG8mIOZYxej+ckCaQ$eBeygPqiuImQAaFQOkE6oVkPfqxIGgnqpQd/MwW4YX4 diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index f9391e97..ed8d0066 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -8,13 +8,13 @@ license = "Apache-2.0" [dependencies] aws-smithy-http = { version = "0.54.4", optional = true } aws-types = { version = "0.54.1", optional = true } -axum = { version = "0.6.9", optional = true } +axum = { version = "0.6.11", optional = true } bytes = "1.4.0" -futures-util = "0.3.26" +futures-util = "0.3.27" headers = "0.3.8" http = "0.2.9" http-body = "0.4.5" -hyper = "0.14.24" +hyper = "0.14.25" hyper-rustls = { version = "0.23.2", features = ["http1", "http2"], default-features = false, optional = true } once_cell = "1.17.1" opentelemetry = "0.18.0" @@ -22,11 +22,11 @@ opentelemetry-http = "0.7.0" opentelemetry-semantic-conventions = "0.10.0" rustls = { version = "0.20.8", optional = true } rustls-native-certs = { version = "0.6.2", optional = true } -serde = "1.0.152" -serde_json = "1.0.93" +serde = "1.0.155" +serde_json = "1.0.94" serde_urlencoded = "0.7.1" -thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["sync", "parking_lot"], optional = true } +thiserror = "1.0.39" +tokio = { version = "1.26.0", features = ["sync", "parking_lot"], optional = true } tower = { version = "0.4.13", features = [] } tower-http = { version = "0.4.0", features = ["cors"] } tracing = "0.1.37" @@ -36,8 +36,8 @@ webpki-roots = { version = "0.22.6", optional = true } [dev-dependencies] anyhow = "1.0.69" -serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.25.0", features = ["macros", "rt"] } +serde = { version = "1.0.155", features = ["derive"] } +tokio = { version = "1.26.0", features = ["macros", "rt"] } tower = { version = "0.4.13", features = ["util"] } [features] diff --git a/crates/iana-codegen/Cargo.toml b/crates/iana-codegen/Cargo.toml index aae4f06c..5a0364b9 100644 --- a/crates/iana-codegen/Cargo.toml +++ b/crates/iana-codegen/Cargo.toml @@ -7,13 +7,13 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.69" -async-trait = "0.1.64" -camino = "1.1.3" +async-trait = "0.1.66" +camino = "1.1.4" convert_case = "0.6.0" -csv = "1.2.0" -futures-util = "0.3.26" +csv = "1.2.1" +futures-util = "0.3.27" reqwest = { version = "0.11.14", features = ["blocking", "rustls-tls"], default-features = false } -serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.25.0", features = ["full"] } +serde = { version = "1.0.155", features = ["derive"] } +tokio = { version = "1.26.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = "0.3.16" diff --git a/crates/iana/Cargo.toml b/crates/iana/Cargo.toml index 75fe6db3..b15d0a52 100644 --- a/crates/iana/Cargo.toml +++ b/crates/iana/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "1.0.152", optional = true } +serde = { version = "1.0.155", optional = true } schemars = { version = "0.8.12", default-features = false, optional = true } [features] diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index c8a1b6fb..a54bf9dd 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -7,25 +7,25 @@ license = "Apache-2.0" [dependencies] base64ct = { version = "1.6.0", features = ["std"] } -chrono = { version = "0.4.23", features = ["serde"] } +chrono = { version = "0.4.24", features = ["serde"] } digest = "0.10.6" -ecdsa = { version = "0.15.1", features = ["signing", "verifying"] } -elliptic-curve = "0.12.3" +ecdsa = { version = "0.16.1", features = ["signing", "verifying"] } +elliptic-curve = "0.13.2" generic-array = "0.14.6" hmac = "0.12.1" -k256 = { version = "0.12.0", features = ["ecdsa"] } -p256 = { version = "0.12.0", features = ["ecdsa"] } -p384 = { version = "0.12.0", features = ["ecdsa"] } +k256 = { version = "0.13.0", features = ["ecdsa"] } +p256 = { version = "0.13.0", features = ["ecdsa"] } +p384 = { version = "0.13.0", features = ["ecdsa"] } rand = "0.8.5" -rsa = "0.8.1" +rsa = "0.9.0-pre.0" schemars = "0.8.12" -sec1 = "0.3.0" -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" -serde_with = { version = "2.2.0", features = ["base64"] } +sec1 = "0.7.1" +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" +serde_with = { version = "2.3.1", features = ["base64"] } sha2 = { version = "0.10.6", features = ["oid"] } signature = "2.0.0" -thiserror = "1.0.38" +thiserror = "1.0.39" tracing = "0.1.37" url = { version = "2.3.1", features = ["serde"] } diff --git a/crates/jose/src/jwk/private_parameters.rs b/crates/jose/src/jwk/private_parameters.rs index 15f9c746..29345038 100644 --- a/crates/jose/src/jwk/private_parameters.rs +++ b/crates/jose/src/jwk/private_parameters.rs @@ -306,7 +306,7 @@ impl From for super::public_parameters::EcPublicParameters mod ec_impls { use elliptic_curve::{ sec1::{Coordinates, FromEncodedPoint, ModulusSize, ToEncodedPoint}, - AffinePoint, Curve, FieldSize, SecretKey, + AffinePoint, Curve, SecretKey, }; use super::{super::JwkEcCurve, EcPrivateParameters}; @@ -328,15 +328,15 @@ mod ec_impls { type Error = elliptic_curve::Error; fn try_from(value: &EcPrivateParameters) -> Result { - SecretKey::from_be_bytes(&value.d) + SecretKey::from_slice(&value.d) } } impl From> for EcPrivateParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: SecretKey) -> Self { (&key).into() @@ -345,16 +345,16 @@ mod ec_impls { impl From<&SecretKey> for EcPrivateParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: &SecretKey) -> Self { let point = key.public_key().to_encoded_point(false); let Coordinates::Uncompressed { x, y } = point.coordinates() else { unreachable!() }; - let d = key.to_be_bytes(); + let d = key.to_bytes(); EcPrivateParameters { crv: C::CRV, x: x.to_vec(), diff --git a/crates/jose/src/jwk/public_parameters.rs b/crates/jose/src/jwk/public_parameters.rs index a9263075..ed170fe3 100644 --- a/crates/jose/src/jwk/public_parameters.rs +++ b/crates/jose/src/jwk/public_parameters.rs @@ -235,26 +235,26 @@ mod ec_impls { use ecdsa::EncodedPoint; use elliptic_curve::{ sec1::{Coordinates, FromEncodedPoint, ModulusSize, ToEncodedPoint}, - AffinePoint, Curve, FieldBytes, FieldSize, PublicKey, + AffinePoint, FieldBytes, PublicKey, }; use super::{super::JwkEcCurve, EcPublicParameters, JsonWebKeyPublicParameters}; impl TryFrom<&EcPublicParameters> for PublicKey where - C: Curve + elliptic_curve::ProjectiveArithmetic, + C: elliptic_curve::CurveArithmetic, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize + Unsigned, { type Error = elliptic_curve::Error; fn try_from(value: &EcPublicParameters) -> Result { let x = value .x - .get(..FieldSize::::USIZE) + .get(..C::FieldBytesSize::USIZE) .ok_or(elliptic_curve::Error)?; let y = value .y - .get(..FieldSize::::USIZE) + .get(..C::FieldBytesSize::USIZE) .ok_or(elliptic_curve::Error)?; let x = FieldBytes::::from_slice(x); @@ -267,9 +267,9 @@ mod ec_impls { impl From> for JsonWebKeyPublicParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: PublicKey) -> Self { (&key).into() @@ -278,9 +278,9 @@ mod ec_impls { impl From<&PublicKey> for JsonWebKeyPublicParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: &PublicKey) -> Self { Self::Ec(key.into()) @@ -289,9 +289,9 @@ mod ec_impls { impl From> for EcPublicParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: PublicKey) -> Self { (&key).into() @@ -300,9 +300,9 @@ mod ec_impls { impl From<&PublicKey> for EcPublicParameters where - C: Curve + elliptic_curve::ProjectiveArithmetic + JwkEcCurve, + C: elliptic_curve::CurveArithmetic + JwkEcCurve, AffinePoint: FromEncodedPoint + ToEncodedPoint, - FieldSize: ModulusSize, + C::FieldBytesSize: ModulusSize, { fn from(key: &PublicKey) -> Self { let point = key.to_encoded_point(false); diff --git a/crates/keystore/Cargo.toml b/crates/keystore/Cargo.toml index 3ca573ed..b970d5f8 100644 --- a/crates/keystore/Cargo.toml +++ b/crates/keystore/Cargo.toml @@ -6,24 +6,23 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.69" aead = { version = "0.5.1", features = ["std"] } const-oid = { version = "0.9.2", features = ["std"] } cookie = { version = "0.17.0", features = ["key-expansion", "private"] } -der = { version = "0.6.1", features = ["std"] } -ecdsa = { version = "0.15.1", features = ["std"] } -elliptic-curve = { version = "0.12.3", features = ["std", "pem", "sec1"] } -k256 = { version = "0.12.0", features = ["std"] } -p256 = { version = "0.12.0", features = ["std"] } -p384 = { version = "0.12.0", features = ["std"] } -pem-rfc7468 = { version = "0.6.0", features = ["std"] } -pkcs1 = { version = "0.4.1", features = ["std"] } -pkcs8 = { version = "0.9.0", features = ["std", "pkcs5", "encryption"] } +der = { version = "0.7.1", features = ["std"] } +ecdsa = { version = "0.16.1", features = ["std"] } +elliptic-curve = { version = "0.13.2", features = ["std", "pem", "sec1"] } +k256 = { version = "0.13.0", features = ["std"] } +p256 = { version = "0.13.0", features = ["std"] } +p384 = { version = "0.13.0", features = ["std"] } +pem-rfc7468 = { version = "0.7.0", features = ["std"] } +pkcs1 = { version = "0.7.1", features = ["std"] } +pkcs8 = { version = "0.10.1", features = ["std", "pkcs5", "encryption"] } rand = "0.8.5" -rsa = { version = "0.8.1", features = ["std", "pem"] } -sec1 = { version = "0.3.0", features = ["std"] } -spki = { version = "0.6.0", features = ["std"] } -thiserror = "1.0.38" +rsa = { version = "0.9.0-pre.0", features = ["std", "pem"] } +sec1 = { version = "0.7.1", features = ["std"] } +spki = { version = "0.7.0", features = ["std"] } +thiserror = "1.0.39" generic-array = "0.14.6" chacha20poly1305 = { version = "0.10.1", features = ["std"] } base64ct = "1.6.0" diff --git a/crates/keystore/src/lib.rs b/crates/keystore/src/lib.rs index 0899bcdc..49e9cb89 100644 --- a/crates/keystore/src/lib.rs +++ b/crates/keystore/src/lib.rs @@ -20,8 +20,8 @@ use std::{ops::Deref, sync::Arc}; -use der::{zeroize::Zeroizing, Decode}; -use elliptic_curve::pkcs8::EncodePrivateKey; +use der::{zeroize::Zeroizing, Decode, Encode, EncodePem}; +use elliptic_curve::{pkcs8::EncodePrivateKey, sec1::ToEncodedPoint}; use mas_iana::jose::{JsonWebKeyType, JsonWebSignatureAlg}; pub use mas_jose::jwk::{JsonWebKey, JsonWebKeySet}; use mas_jose::{ @@ -33,7 +33,6 @@ use pkcs1::EncodeRsaPrivateKey; use pkcs8::{AssociatedOid, PrivateKeyInfo}; use rand::{CryptoRng, RngCore}; use rsa::BigUint; -use sec1::EncodeEcPrivateKey; use thiserror::Error; mod encrypter; @@ -200,12 +199,12 @@ impl PrivateKey { /// # Errors /// /// Returns an error if the encoding failed - pub fn to_der(&self) -> Result>, anyhow::Error> { + pub fn to_der(&self) -> Result>, pkcs1::Error> { let der = match self { PrivateKey::Rsa(key) => key.to_pkcs1_der()?.to_bytes(), - PrivateKey::EcP256(key) => key.to_sec1_der()?, - PrivateKey::EcP384(key) => key.to_sec1_der()?, - PrivateKey::EcK256(key) => key.to_sec1_der()?, + PrivateKey::EcP256(key) => to_sec1_der(key)?, + PrivateKey::EcP384(key) => to_sec1_der(key)?, + PrivateKey::EcK256(key) => to_sec1_der(key)?, }; Ok(der) @@ -216,7 +215,7 @@ impl PrivateKey { /// # Errors /// /// Returns an error if the encoding failed - pub fn to_pkcs8_der(&self) -> Result>, anyhow::Error> { + pub fn to_pkcs8_der(&self) -> Result>, pkcs8::Error> { let der = match self { PrivateKey::Rsa(key) => key.to_pkcs8_der()?, PrivateKey::EcP256(key) => key.to_pkcs8_der()?, @@ -238,12 +237,12 @@ impl PrivateKey { pub fn to_pem( &self, line_ending: pem_rfc7468::LineEnding, - ) -> Result, anyhow::Error> { + ) -> Result, pkcs1::Error> { let pem = match self { PrivateKey::Rsa(key) => key.to_pkcs1_pem(line_ending)?, - PrivateKey::EcP256(key) => key.to_sec1_pem(line_ending)?, - PrivateKey::EcP384(key) => key.to_sec1_pem(line_ending)?, - PrivateKey::EcK256(key) => key.to_sec1_pem(line_ending)?, + PrivateKey::EcP256(key) => to_sec1_pem(key, line_ending)?, + PrivateKey::EcP384(key) => to_sec1_pem(key, line_ending)?, + PrivateKey::EcK256(key) => to_sec1_pem(key, line_ending)?, }; Ok(pem) @@ -516,24 +515,66 @@ impl PrivateKey { } /// Generate an Elliptic Curve key for the P-256 curve - pub fn generate_ec_p256(rng: R) -> Self { - let key = elliptic_curve::SecretKey::random(rng); + pub fn generate_ec_p256(mut rng: R) -> Self { + let key = elliptic_curve::SecretKey::random(&mut rng); Self::EcP256(Box::new(key)) } /// Generate an Elliptic Curve key for the P-384 curve - pub fn generate_ec_p384(rng: R) -> Self { - let key = elliptic_curve::SecretKey::random(rng); + pub fn generate_ec_p384(mut rng: R) -> Self { + let key = elliptic_curve::SecretKey::random(&mut rng); Self::EcP384(Box::new(key)) } /// Generate an Elliptic Curve key for the secp256k1 curve - pub fn generate_ec_k256(rng: R) -> Self { - let key = elliptic_curve::SecretKey::random(rng); + pub fn generate_ec_k256(mut rng: R) -> Self { + let key = elliptic_curve::SecretKey::random(&mut rng); Self::EcK256(Box::new(key)) } } +// The default implementation of SecretKey::to_sec1_pem/der do not include the +// named curve OID. This is a basic reimplementation of those two functions with +// the OID included, so that it matches the implementation in OpenSSL. +fn to_sec1_der(key: &elliptic_curve::SecretKey) -> Result>, der::Error> +where + C: elliptic_curve::Curve + elliptic_curve::CurveArithmetic + AssociatedOid, + elliptic_curve::PublicKey: elliptic_curve::sec1::ToEncodedPoint, + C::FieldBytesSize: elliptic_curve::sec1::ModulusSize, +{ + let private_key_bytes = Zeroizing::new(key.to_bytes()); + let public_key_bytes = key.public_key().to_encoded_point(false); + Ok(Zeroizing::new( + sec1::EcPrivateKey { + private_key: &private_key_bytes, + parameters: Some(sec1::EcParameters::NamedCurve(C::OID)), + public_key: Some(public_key_bytes.as_bytes()), + } + .to_der()?, + )) +} + +fn to_sec1_pem( + key: &elliptic_curve::SecretKey, + line_ending: pem_rfc7468::LineEnding, +) -> Result, der::Error> +where + C: elliptic_curve::Curve + elliptic_curve::CurveArithmetic + AssociatedOid, + elliptic_curve::PublicKey: elliptic_curve::sec1::ToEncodedPoint, + C::FieldBytesSize: elliptic_curve::sec1::ModulusSize, +{ + let private_key_bytes = Zeroizing::new(key.to_bytes()); + let public_key_bytes = key.public_key().to_encoded_point(false); + Ok(Zeroizing::new( + sec1::EcPrivateKey { + private_key: &private_key_bytes, + parameters: Some(sec1::EcParameters::NamedCurve(C::OID)), + public_key: Some(public_key_bytes.as_bytes()), + } + .to_pem(line_ending)?, + )) +} + impl From<&PrivateKey> for JsonWebKeyPublicParameters { fn from(val: &PrivateKey) -> Self { match val { diff --git a/crates/keystore/tests/keystore.rs b/crates/keystore/tests/keystore.rs index 57df2d41..59d0fba5 100644 --- a/crates/keystore/tests/keystore.rs +++ b/crates/keystore/tests/keystore.rs @@ -76,18 +76,13 @@ macro_rules! enc_test { /// Generate a PEM decoding and encoding test macro_rules! pem_test { ($name:ident, $path:literal) => { - pem_test!($name, $path, compare = true); - }; - ($name:ident, $path:literal, compare = $compare:literal) => { #[test] fn $name() { let pem = include_str!(concat!("./keys/", $path, ".pem")); let key = PrivateKey::load_pem(pem).unwrap(); let pem2 = key.to_pem(pem_rfc7468::LineEnding::LF).unwrap(); - if $compare { - assert_eq!(pem, pem2.as_str()); - } + assert_eq!(pem, pem2.as_str()); } }; } @@ -95,18 +90,13 @@ macro_rules! pem_test { /// Generate a DER decoding and encoding test macro_rules! der_test { ($name:ident, $path:literal) => { - der_test!($name, $path, compare = true); - }; - ($name:ident, $path:literal, compare = $compare:literal) => { #[test] fn $name() { let der = include_bytes!(concat!("./keys/", $path, ".der")); let key = PrivateKey::load_der(der).unwrap(); let der2 = key.to_der().unwrap(); - if $compare { - assert_eq!(der, der2.as_slice()); - } + assert_eq!(der, der2.as_slice()); } }; } @@ -137,16 +127,15 @@ enc_test!(enc_ec_p384_pkcs8_der, EcP384, "ec-p384.pkcs8.encrypted.der"); enc_test!(enc_ec_k256_pkcs8_pem, EcK256, "ec-k256.pkcs8.encrypted.pem"); enc_test!(enc_ec_k256_pkcs8_der, EcK256, "ec-k256.pkcs8.encrypted.der"); -// Test PEM/DER serialization. For some reason, DER serialization of EC keys -// have some extra bytes +// Test PEM/DER serialization pem_test!(serialize_rsa_pkcs1_pem, "rsa.pkcs1"); der_test!(serialize_rsa_pkcs1_der, "rsa.pkcs1"); pem_test!(serialize_ec_p256_sec1_pem, "ec-p256.sec1"); -der_test!(serialize_ec_p256_sec1_der, "ec-p256.sec1", compare = false); +der_test!(serialize_ec_p256_sec1_der, "ec-p256.sec1"); pem_test!(serialize_ec_p384_sec1_pem, "ec-p384.sec1"); -der_test!(serialize_ec_p384_sec1_der, "ec-p384.sec1", compare = false); +der_test!(serialize_ec_p384_sec1_der, "ec-p384.sec1"); pem_test!(serialize_ec_k256_sec1_pem, "ec-k256.sec1"); -der_test!(serialize_ec_k256_sec1_der, "ec-k256.sec1", compare = false); +der_test!(serialize_ec_k256_sec1_der, "ec-k256.sec1"); #[test] fn load_encrypted_as_unencrypted_error() { diff --git a/crates/listener/Cargo.toml b/crates/listener/Cargo.toml index 7df85cb5..77099e65 100644 --- a/crates/listener/Cargo.toml +++ b/crates/listener/Cargo.toml @@ -7,22 +7,22 @@ license = "Apache-2.0" [dependencies] bytes = "1.4.0" -futures-util = "0.3.26" +futures-util = "0.3.27" http-body = "0.4.5" -hyper = { version = "0.14.24", features = ["server", "http1", "http2", "tcp"] } +hyper = { version = "0.14.25", features = ["server", "http1", "http2", "tcp"] } pin-project-lite = "0.2.9" -thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["net", "rt", "macros", "signal", "time"] } +thiserror = "1.0.39" +tokio = { version = "1.26.0", features = ["net", "rt", "macros", "signal", "time"] } tokio-rustls = "0.23.4" tower-http = { version = "0.4.0", features = ["add-extension"] } tower-service = "0.3.2" tracing = "0.1.37" -libc = "0.2.139" +libc = "0.2.140" [dev-dependencies] anyhow = "1.0.69" rustls-pemfile = "1.0.2" -tokio = { version = "1.25.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] } +tokio = { version = "1.26.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] } tokio-test = "0.4.2" tracing-subscriber = "0.3.16" diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 0f9bdd24..1fd16d9d 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -7,17 +7,17 @@ license = "Apache-2.0" [dependencies] http = "0.2.9" -serde = "1.0.152" -serde_json = "1.0.93" +serde = "1.0.155" +serde_json = "1.0.94" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } parse-display = "0.8.0" -indoc = "2.0.0" -serde_with = { version = "2.2.0", features = ["chrono"] } -chrono = "0.4.23" +indoc = "2.0.1" +serde_with = { version = "2.3.1", features = ["chrono"] } +chrono = "0.4.24" sha2 = "0.10.6" data-encoding = "2.3.3" -thiserror = "1.0.38" +thiserror = "1.0.39" mas-iana = { path = "../iana" } mas-jose = { path = "../jose" } diff --git a/crates/oidc-client/Cargo.toml b/crates/oidc-client/Cargo.toml index 9ca81a0b..b48d3561 100644 --- a/crates/oidc-client/Cargo.toml +++ b/crates/oidc-client/Cargo.toml @@ -20,22 +20,22 @@ keystore = ["dep:mas-keystore"] [dependencies] base64ct = { version = "1.6.0", features = ["std"] } bytes = "1.4.0" -chrono = "0.4.23" +chrono = "0.4.24" form_urlencoded = "1.1.0" -futures = "0.3.26" +futures = "0.3.27" futures-signals = "0.3.31" -futures-util = "0.3.26" +futures-util = "0.3.27" headers = "0.3.8" http = "0.2.9" once_cell = "1.17.1" mime = "0.3.16" rand = "0.8.5" -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" serde_urlencoded = "0.7.1" -serde_with = "2.2.0" -thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["rt", "macros", "rt-multi-thread"] } +serde_with = "2.3.1" +thiserror = "1.0.39" +tokio = { version = "1.26.0", features = ["rt", "macros", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["full"] } tracing = "0.1.37" url = { version = "2.3.1", features = ["serde"] } @@ -55,7 +55,7 @@ features = ["http1", "http2", "rustls-native-certs"] default-features = false optional = true [dependencies.hyper] -version = "0.14.24" +version = "0.14.25" features = ["client", "http1", "http2", "stream", "runtime" ] optional = true [dependencies.tower-http] @@ -65,7 +65,7 @@ optional = true [dev-dependencies] assert_matches = "1.5.0" -bitflags = "1.3.2" +bitflags = "2.0.0" mas-keystore = { path = "../keystore" } rand_chacha = "0.3.1" wiremock = "0.5.17" diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index 3f669fd1..172ca2b4 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -8,18 +8,18 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.69" opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" -thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["io-util"] } +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" +thiserror = "1.0.39" +tokio = { version = "1.26.0", features = ["io-util"] } tracing = "0.1.37" -wasmtime = { version = "6.0.0", default-features = false, features = ["async", "cranelift"] } +wasmtime = { version = "6.0.1", default-features = false, features = ["async", "cranelift"] } mas-data-model = { path = "../data-model" } oauth2-types = { path = "../oauth2-types" } [dev-dependencies] -tokio = { version = "1.25.0", features = ["fs", "rt", "macros"] } +tokio = { version = "1.26.0", features = ["fs", "rt", "macros"] } [features] cache = ["wasmtime/cache"] diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 6b2ce231..0932fb5a 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -axum = { version = "0.6.9", default-features = false } -serde = { version = "1.0.152", features = ["derive"] } +axum = { version = "0.6.11", default-features = false } +serde = { version = "1.0.155", features = ["derive"] } serde_urlencoded = "0.7.1" url = "2.3.1" ulid = "1.0.0" diff --git a/crates/spa/Cargo.toml b/crates/spa/Cargo.toml index 73cfc99c..03aa6816 100644 --- a/crates/spa/Cargo.toml +++ b/crates/spa/Cargo.toml @@ -6,15 +6,15 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" -thiserror = "1.0.38" -camino = { version = "1.1.3", features = ["serde1"] } +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" +thiserror = "1.0.39" +camino = { version = "1.1.4", features = ["serde1"] } headers = "0.3.8" http = "0.2.9" tower-service = "0.3.2" tower-http = { version = "0.4.0", features = ["fs"] } -tokio = { version = "1.25.0", features = ["fs"] } +tokio = { version = "1.26.0", features = ["fs"] } [[bin]] name = "render" diff --git a/crates/storage-pg/Cargo.toml b/crates/storage-pg/Cargo.toml index 2e6c4a35..37750d13 100644 --- a/crates/storage-pg/Cargo.toml +++ b/crates/storage-pg/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.64" +async-trait = "0.1.66" sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] } -chrono = { version = "0.4.23", features = ["serde"] } -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" -thiserror = "1.0.38" +chrono = { version = "0.4.24", features = ["serde"] } +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" +thiserror = "1.0.39" tracing = "0.1.37" -futures-util = "0.3.26" +futures-util = "0.3.27" rand = "0.8.5" rand_chacha = "0.3.1" diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index cbf88666..beef6f23 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.64" -chrono = "0.4.23" -thiserror = "1.0.38" -futures-util = "0.3.26" +async-trait = "0.1.66" +chrono = "0.4.24" +thiserror = "1.0.39" +futures-util = "0.3.27" rand_core = "0.6.4" url = "2.3.1" diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index 2fbe0916..9e88b710 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = "1.25.0" -async-trait = "0.1.64" +tokio = "1.26.0" +async-trait = "0.1.66" tokio-stream = "0.1.12" -futures-util = "0.3.26" +futures-util = "0.3.27" tracing = "0.1.37" sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index a50ec9b0..98508cc7 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -7,18 +7,18 @@ license = "Apache-2.0" [dependencies] tracing = "0.1.37" -tokio = { version = "1.25.0", features = ["macros", "rt"] } +tokio = { version = "1.26.0", features = ["macros", "rt"] } anyhow = "1.0.69" -thiserror = "1.0.38" +thiserror = "1.0.39" -tera = "1.17.1" -serde = { version = "1.0.152", features = ["derive"] } -serde_json = "1.0.93" +tera = "1.18.0" +serde = { version = "1.0.155", features = ["derive"] } +serde_json = "1.0.94" serde_urlencoded = "0.7.1" -camino = "1.1.3" -chrono = "0.4.23" +camino = "1.1.4" +chrono = "0.4.24" url = "2.3.1" http = "0.2.9" ulid = { version = "1.0.0", features = ["serde"] }