diff --git a/Cargo.lock b/Cargo.lock index 59009271..b8e6c5eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,15 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - [[package]] name = "aead" version = "0.5.1" @@ -36,18 +27,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", -] - [[package]] name = "aes" version = "0.8.1" @@ -55,19 +34,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" dependencies = [ "cfg-if", - "cipher 0.4.3", + "cipher", "cpufeatures", ] [[package]] name = "aes-gcm" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "cipher 0.3.0", + "aead", + "aes", + "cipher", "ctr", "ghash", "subtle", @@ -86,33 +65,33 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] [[package]] name = "alloc-no-stdlib" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ "alloc-no-stdlib", ] [[package]] name = "android_system_properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] @@ -128,9 +107,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "argon2" @@ -251,7 +230,7 @@ dependencies = [ "http", "hyper", "ring", - "time 0.3.12", + "time 0.3.14", "tokio", "tower", "tracing", @@ -383,7 +362,7 @@ dependencies = [ "percent-encoding", "regex", "ring", - "time 0.3.12", + "time 0.3.14", "tracing", ] @@ -439,7 +418,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.4", "tracing", ] @@ -483,10 +462,10 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4149b09b9d8cf37f0afc390144f5d71b8f4daadfd9540ddf43ad27b54d407470" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", "num-integer", "ryu", - "time 0.3.12", + "time 0.3.14", ] [[package]] @@ -529,7 +508,7 @@ dependencies = [ "http", "http-body", "hyper", - "itoa 1.0.2", + "itoa 1.0.3", "matchit", "memchr", "mime", @@ -633,7 +612,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -647,9 +626,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] @@ -698,9 +677,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" [[package]] name = "byteorder" @@ -729,9 +708,9 @@ dependencies = [ [[package]] name = "bytes-utils" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1934a3ef9cac8efde4966a92781e77713e1ba329f1d42e446c7d7eba340d8ef1" +checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ "bytes 1.2.1", "either", @@ -743,7 +722,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.3", + "cipher", ] [[package]] @@ -768,7 +747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" dependencies = [ "cfg-if", - "cipher 0.4.3", + "cipher", "cpufeatures", ] @@ -778,9 +757,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.5.1", + "aead", "chacha20", - "cipher 0.4.3", + "cipher", "poly1305", "zeroize", ] @@ -823,15 +802,6 @@ dependencies = [ "phf_codegen", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - [[package]] name = "cipher" version = "0.4.3" @@ -845,9 +815,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.21" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "atty", "bitflags", @@ -899,18 +869,18 @@ dependencies = [ [[package]] name = "cookie" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" +checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" dependencies = [ "aes-gcm", "base64", "hkdf", "percent-encoding", "rand", - "sha2 0.10.5", + "sha2 0.10.6", "subtle", - "time 0.3.12", + "time 0.3.14", "version_check", ] @@ -941,9 +911,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -1179,11 +1149,11 @@ dependencies = [ [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1265,11 +1235,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.3", + "const-oid", "crypto-common", "subtle", ] @@ -1323,24 +1294,24 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "dotenvy" -version = "0.15.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e851a83c30366fd01d75b913588e95e74a1705c1ecc5d58b1f8e1a6d556525f" +checksum = "ed9155c8f4dc55c7470ae9da3f63c6785245093b3f6aeb0f5bf2e968efbba314" dependencies = [ "dirs", ] [[package]] name = "dyn-clone" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d07a982d1fb29db01e5a59b1918e03da4df7297eaeee7686ac45542fd4e59c8" +checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" [[package]] name = "ecdsa" -version = "0.14.5" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1826508d57f3140a2e8e3c307b19915a266c92a1b8c2f6bb54e29e5d72a394ae" +checksum = "85789ce7dfbd0f0624c07ef653a08bb2ebf43d3e16531361f46d36dd54334fed" dependencies = [ "der", "elliptic-curve", @@ -1350,9 +1321,9 @@ dependencies = [ [[package]] name = "either" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" dependencies = [ "serde", ] @@ -1366,7 +1337,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.3", + "digest 0.10.5", "ff", "generic-array", "group", @@ -1391,9 +1362,9 @@ dependencies = [ [[package]] name = "email_address" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8684b7c9cb4857dfa1e5b9629ef584ba618c9b93bae60f58cb23f4f271d0468e" +checksum = "b1b32a7a2580c4473f10f66b512c34bdd7d33c5e3473227ca833abdb5afe4809" [[package]] name = "encoding_rs" @@ -1406,9 +1377,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -1665,9 +1636,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", "polyval", @@ -1721,9 +1692,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" dependencies = [ "bytes 1.2.1", "fnv", @@ -1734,7 +1705,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.4", "tracing", ] @@ -1749,18 +1720,18 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ "hashbrown", ] [[package]] name = "hdrhistogram" -version = "7.5.0" +version = "7.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" dependencies = [ "byteorder", "num-traits", @@ -1839,7 +1810,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -1861,7 +1832,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes 1.2.1", "fnv", - "itoa 1.0.2", + "itoa 1.0.3", ] [[package]] @@ -1883,9 +1854,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1920,7 +1891,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.2", + "itoa 1.0.3", "pin-project-lite", "socket2", "tokio", @@ -1974,9 +1945,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.46" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" +checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2080,9 +2051,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-lifetimes" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" +checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" [[package]] name = "iovec" @@ -2110,9 +2081,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -2125,9 +2096,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "ittapi" @@ -2151,18 +2122,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -2180,14 +2151,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2573d3fd3e4cc741affc9b5ce1a8ce36cf29f09f80f36da4309d0ae6d7854" +checksum = "3636d281d46c3b64182eb3a0a42b7b483191a2ecc3f05301fa67403f7c9bc949" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", - "sha2 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -2246,15 +2217,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "libm" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145" +checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "linux-raw-sys" @@ -2264,9 +2235,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2531,7 +2502,7 @@ dependencies = [ "anyhow", "base64ct", "chrono", - "digest 0.10.3", + "digest 0.10.5", "ecdsa", "elliptic-curve", "generic-array", @@ -2547,7 +2518,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "sha2 0.10.5", + "sha2 0.10.6", "signature", "thiserror", "tracing", @@ -2558,7 +2529,7 @@ dependencies = [ name = "mas-keystore" version = "0.1.0" dependencies = [ - "aead 0.5.1", + "aead", "anyhow", "base64ct", "chacha20poly1305", @@ -2708,11 +2679,11 @@ checksum = "3dfc802da7b1cf80aefffa0c7b2f77247c8b32206cc83c270b61264f5b360a80" [[package]] name = "md-5" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -2763,9 +2734,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" dependencies = [ "adler", ] @@ -2882,7 +2853,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "sha2 0.10.5", + "sha2 0.10.6", "thiserror", "url", ] @@ -2901,18 +2872,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#24bb1700edc48b9bb77e778bef0e3c1f6a94f645" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#5371885f992d47a23caeb5728227719df05d7b64" dependencies = [ "anyhow", "base64", - "digest 0.10.3", + "digest 0.10.5", "hex", "hmac", "json-patch", @@ -2924,7 +2895,7 @@ dependencies = [ "serde_json", "serde_yaml", "sha1", - "sha2 0.10.5", + "sha2 0.10.6", "sprintf", "thiserror", "tokio", @@ -3056,9 +3027,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] name = "p256" @@ -3068,7 +3039,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sha2 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -3079,7 +3050,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "sha2 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -3184,9 +3155,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "pbkdf2" @@ -3194,7 +3165,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -3237,9 +3208,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" +checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048" dependencies = [ "thiserror", "ucd-trie", @@ -3247,9 +3218,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91" +checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1" dependencies = [ "pest", "pest_generator", @@ -3257,9 +3228,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0" +checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c" dependencies = [ "pest", "pest_meta", @@ -3270,13 +3241,13 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe" +checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6" dependencies = [ "once_cell", "pest", - "sha-1", + "sha1", ] [[package]] @@ -3291,18 +3262,18 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4724fa946c8d1e7cd881bd3dbee63ce32fc1e9e191e35786b3dc1320a3f68131" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ba0c43d7a1b6492b2924a62290cfd83987828af037b0743b38e6ab092aee58" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ "phf_generator", "phf_shared", @@ -3310,9 +3281,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" dependencies = [ "phf_shared", "rand", @@ -3320,9 +3291,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd5609d4b2df87167f908a32e1b146ce309c16cf35df76bc11f440b756048e4" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ "siphasher", "uncased", @@ -3330,18 +3301,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", @@ -3377,13 +3348,13 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d10d862c1f5c302df3c3dbfd837afbae0ad09551a6fa37b10311cb5890a80175" dependencies = [ - "aes 0.8.1", + "aes", "cbc", "der", "hmac", "pbkdf2", "scrypt", - "sha2 0.10.5", + "sha2 0.10.6", "spki", ] @@ -3407,19 +3378,19 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.5.0", + "universal-hash", ] [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash 0.4.1", + "universal-hash", ] [[package]] @@ -3454,9 +3425,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -3529,9 +3500,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f446d0a6efba22928558c4fb4ce0b3fd6c89b0061343e390bf01a703742b8125" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ "cc", ] @@ -3574,9 +3545,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] @@ -3674,9 +3645,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" dependencies = [ "base64", "bytes 1.2.1", @@ -3690,9 +3661,9 @@ dependencies = [ "hyper-rustls 0.23.0", "ipnet", "js-sys", - "lazy_static", "log", "mime", + "once_cell", "percent-encoding", "pin-project-lite", "rustls 0.20.6", @@ -3740,12 +3711,12 @@ dependencies = [ [[package]] name = "rsa" -version = "0.7.0-pre" +version = "0.7.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6168b9a0f38e487db90dc109ad6d8f37fc5590183b7bfe8d8687e0b86116d53f" +checksum = "237a0c597c9fdb501f592f52e8ab754dc43787dd8a8bf20c191f562817d50b08" dependencies = [ "byteorder", - "digest 0.10.3", + "digest 0.10.5", "num-bigint-dig", "num-integer", "num-iter", @@ -3753,6 +3724,7 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core", + "signature", "smallvec", "subtle", "zeroize", @@ -3788,7 +3760,7 @@ version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054" dependencies = [ - "sha2 0.10.5", + "sha2 0.10.6", "walkdir", ] @@ -3809,9 +3781,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.7" +version = "0.35.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" +checksum = "af895b90e5c071badc3136fc10ff0bcfc98747eadbaf43ed8f214e07ba8f8477" dependencies = [ "bitflags", "errno", @@ -3872,18 +3844,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ "base64", ] [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "salsa20" @@ -3891,7 +3863,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" dependencies = [ - "cipher 0.4.3", + "cipher", ] [[package]] @@ -3954,7 +3926,7 @@ dependencies = [ "hmac", "pbkdf2", "salsa20", - "sha2 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -3993,9 +3965,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ "bitflags", "core-foundation", @@ -4016,15 +3988,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] @@ -4044,9 +4016,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -4070,7 +4042,7 @@ version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", ] @@ -4082,7 +4054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", ] @@ -4100,7 +4072,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.12", + "time 0.3.14", ] [[package]] @@ -4117,37 +4089,26 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3" +checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1" dependencies = [ "indexmap", - "itoa 1.0.2", + "itoa 1.0.3", "ryu", "serde", "unsafe-libyaml", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha1" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -4165,13 +4126,12 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" +version = "0.10.6" +source = "git+https://github.com/RustCrypto/hashes.git?rev=f9af45fdde84bb24c25f90011d7b2316783eb29f#f9af45fdde84bb24c25f90011d7b2316783eb29f" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -4194,11 +4154,11 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e90531723b08e4d6d71b791108faf51f03e1b4a7784f96b2b87f852ebc247228" +checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", "rand_core", ] @@ -4240,9 +4200,9 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -4266,15 +4226,15 @@ dependencies = [ [[package]] name = "sprintf" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082cb9266c8691c70a98442f8f893ba3549f02f64e128cb096dac92e1c428340" +checksum = "dce67a1f173db2f623678dc914d20870090a4bc8d066e9812e59508af0159aef" [[package]] name = "sqlformat" -version = "0.1.8" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" +checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" dependencies = [ "itertools", "nom", @@ -4283,9 +4243,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1" +checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4293,9 +4253,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" +checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" dependencies = [ "ahash", "atoi", @@ -4319,7 +4279,7 @@ dependencies = [ "hkdf", "hmac", "indexmap", - "itoa 1.0.2", + "itoa 1.0.3", "libc", "log", "md-5", @@ -4332,8 +4292,8 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha-1", - "sha2 0.10.5", + "sha1", + "sha2 0.10.6", "smallvec", "sqlformat", "sqlx-rt", @@ -4347,9 +4307,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c" +checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" dependencies = [ "dotenvy", "either", @@ -4360,7 +4320,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.5", + "sha2 0.10.6", "sqlx-core", "sqlx-rt", "syn", @@ -4369,9 +4329,9 @@ dependencies = [ [[package]] name = "sqlx-rt" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" +checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ "once_cell", "tokio", @@ -4431,9 +4391,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -4468,9 +4428,9 @@ dependencies = [ [[package]] name = "tera" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4685e72cb35f0eb74319c8fe2d3b61e93da5609841cde2cb87fcc3bea56d20" +checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c" dependencies = [ "chrono", "chrono-tz", @@ -4499,24 +4459,24 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43" dependencies = [ "proc-macro2", "quote", @@ -4567,12 +4527,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" +checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ - "itoa 1.0.2", - "js-sys", + "itoa 1.0.3", "libc", "num_threads", "serde", @@ -4666,9 +4625,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" dependencies = [ "futures-core", "pin-project-lite", @@ -4693,9 +4652,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes 1.2.1", "futures-core", @@ -4772,7 +4731,7 @@ dependencies = [ "rand", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.4", "tower-layer", "tower-service", "tracing", @@ -4799,7 +4758,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.4", "tower", "tower-layer", "tower-service", @@ -4837,7 +4796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.12", + "time 0.3.14", "tracing-subscriber", ] @@ -4949,9 +4908,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uncased" @@ -5029,30 +4988,30 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode_categories" @@ -5060,16 +5019,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "universal-hash" version = "0.5.0" @@ -5082,9 +5031,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" +checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" [[package]] name = "untrusted" @@ -5106,9 +5055,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" [[package]] name = "valuable" @@ -5157,9 +5106,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5167,9 +5116,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", @@ -5182,9 +5131,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -5194,9 +5143,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5204,9 +5153,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -5217,15 +5166,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasm-encoder" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8905fd25fdadeb0e7e8bf43a9f46f9f972d6291ad0c7a32573b88dd13a6cfa6b" +checksum = "7e7ca71c70a6de5b10968ae4d298e548366d9cd9588176e6ff8866f3c49c96ee" dependencies = [ "leb128", ] @@ -5429,9 +5378,9 @@ dependencies = [ [[package]] name = "wast" -version = "45.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186c474c4f9bb92756b566d592a16591b4526b1a4841171caa3f31d7fe330d96" +checksum = "117ccfc4262e62a28a13f0548a147f19ffe71e8a08be802af23ae4ea0bedad73" dependencies = [ "leb128", "memchr", @@ -5441,9 +5390,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d4bc4724b4f02a482c8cab053dac5ef26410f264c06ce914958f9a42813556" +checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898" dependencies = [ "wast", ] @@ -5468,9 +5417,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", @@ -5498,30 +5447,31 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" dependencies = [ "webpki 0.22.0", ] [[package]] name = "which" -version = "4.2.5" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "whoami" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" +checksum = "d6631b6a2fd59b1841b622e8f1a7ad241ef0a46f2d580464ce8140ac94cbd571" dependencies = [ + "bumpalo", "wasm-bindgen", "web-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 20704f87..9be79196 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,3 +2,7 @@ default-members = ["crates/cli"] members = ["crates/*"] + +[patch.crates-io] +# XXX: temporary override waiting on a new version of the sha2 crate +sha2 = { git = "https://github.com/RustCrypto/hashes.git", rev = "f9af45fdde84bb24c25f90011d7b2316783eb29f" } diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index ba574b16..b82ada1d 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -18,12 +18,12 @@ http = "0.2.8" http-body = "0.4.5" mime = "0.3.16" rand = "0.8.5" -serde = "1.0.144" +serde = "1.0.145" serde_with = "2.0.1" serde_urlencoded = "0.7.1" serde_json = "1.0.85" -sqlx = "0.6.1" -thiserror = "1.0.35" +sqlx = "0.6.2" +thiserror = "1.0.36" tokio = "1.21.1" tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.36" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index b6395046..2f00a349 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,17 +8,17 @@ license = "Apache-2.0" [dependencies] tokio = { version = "1.21.1", features = ["full"] } futures = "0.3.24" -anyhow = "1.0.64" -clap = { version = "3.2.21", features = ["derive"] } +anyhow = "1.0.65" +clap = { version = "3.2.22", features = ["derive"] } dotenv = "0.15.0" schemars = { version = "0.8.10", features = ["url", "chrono"] } tower = { version = "0.4.13", features = ["full"] } hyper = { version = "0.14.20", features = ["full"] } -serde_yaml = "0.9.11" +serde_yaml = "0.9.13" serde_json = "1.0.85" url = "2.3.1" argon2 = { version = "0.4.1", features = ["password-hash"] } -reqwest = { version = "0.11.11", features = ["rustls-tls"], default-features = false, optional = true } +reqwest = { version = "0.11.12", features = ["rustls-tls"], default-features = false, optional = true } watchman_client = "0.8.0" atty = "0.2.14" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index a59ad378..007a1fb3 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -10,18 +10,18 @@ tokio = { version = "1.21.1", features = [] } tracing = { version = "0.1.36", features = ["log"] } async-trait = "0.1.57" -thiserror = "1.0.35" -anyhow = "1.0.64" +thiserror = "1.0.36" +anyhow = "1.0.65" schemars = { version = "0.8.10", features = ["url", "chrono"] } figment = { version = "0.10.7", features = ["env", "yaml", "test"] } chrono = { version = "0.4.22", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_with = { version = "2.0.1", features = ["hex", "chrono"] } serde_json = "1.0.85" -sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } lettre = { version = "0.10.1", default-features = false, features = ["serde", "builder"] } pem-rfc7468 = "0.6.0" diff --git a/crates/data-model/Cargo.toml b/crates/data-model/Cargo.toml index 09550a44..82ae09ce 100644 --- a/crates/data-model/Cargo.toml +++ b/crates/data-model/Cargo.toml @@ -7,8 +7,8 @@ license = "Apache-2.0" [dependencies] chrono = "0.4.22" -thiserror = "1.0.35" -serde = "1.0.144" +thiserror = "1.0.36" +serde = "1.0.145" url = { version = "2.3.1", features = ["serde"] } crc = "3.0.0" rand = "0.8.5" diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index 79fc8137..09d85ec7 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.64" +anyhow = "1.0.65" async-trait = "0.1.57" tokio = { version = "1.21.1", features = ["macros"] } tracing = "0.1.36" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 22483181..d9fcaf94 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -13,8 +13,8 @@ tokio = { version = "1.21.1", features = ["macros"] } tracing = "0.1.36" # Error management -thiserror = "1.0.35" -anyhow = "1.0.64" +thiserror = "1.0.36" +anyhow = "1.0.65" # Web server hyper = { version = "0.14.20", features = ["full"] } @@ -28,10 +28,10 @@ axum-extra = { version = "0.4.0-rc.1", features = ["cookie-private"] } lettre = { version = "0.10.1", default-features = false, features = ["builder"] } # Database access -sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_with = { version = "2.0.1", features = ["hex", "chrono"] } serde_json = "1.0.85" serde_urlencoded = "0.7.1" diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index a7f41d67..2bf90932 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -14,15 +14,15 @@ http = "0.2.8" http-body = "0.4.5" hyper = "0.14.20" hyper-rustls = { version = "0.23.0", features = ["http1", "http2", "rustls-native-certs"], default-features = false, optional = true } -once_cell = "1.14.0" +once_cell = "1.15.0" opentelemetry = "0.17.0" opentelemetry-http = "0.6.0" opentelemetry-semantic-conventions = "0.9.0" rustls = "0.20.6" -serde = "1.0.144" +serde = "1.0.145" serde_json = "1.0.85" serde_urlencoded = "0.7.1" -thiserror = "1.0.35" +thiserror = "1.0.36" tokio = { version = "1.21.1", optional = true } tower = { version = "0.4.13", features = ["timeout", "limit"] } tower-http = { version = "0.3.4", features = ["follow-redirect", "decompression-full", "set-header", "compression-full", "cors", "util"] } @@ -30,8 +30,8 @@ tracing = "0.1.36" tracing-opentelemetry = "0.17.4" [dev-dependencies] -anyhow = "1.0.64" -serde = { version = "1.0.144", features = ["derive"] } +anyhow = "1.0.65" +serde = { version = "1.0.145", features = ["derive"] } tokio = { version = "1.21.1", features = ["macros", "rt"] } tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/iana-codegen/Cargo.toml b/crates/iana-codegen/Cargo.toml index 949df9b2..10915cb9 100644 --- a/crates/iana-codegen/Cargo.toml +++ b/crates/iana-codegen/Cargo.toml @@ -6,13 +6,13 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.64" +anyhow = "1.0.65" async-trait = "0.1.57" convert_case = "0.6.0" csv = "1.1.6" futures-util = "0.3.24" -reqwest = { version = "0.11.11", features = ["blocking", "rustls-tls"], default-features = false } -serde = { version = "1.0.144", features = ["derive"] } +reqwest = { version = "0.11.12", features = ["blocking", "rustls-tls"], default-features = false } +serde = { version = "1.0.145", features = ["derive"] } tokio = { version = "1.21.1", features = ["full"] } tracing = "0.1.36" tracing-subscriber = "0.3.15" diff --git a/crates/iana/Cargo.toml b/crates/iana/Cargo.toml index 169214e1..c1cbc3f9 100644 --- a/crates/iana/Cargo.toml +++ b/crates/iana/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = "1.0.144" +serde = "1.0.145" schemars = "0.8.10" parse-display = "0.6.0" diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index 180c561b..b9a2299c 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -6,27 +6,27 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.64" +anyhow = "1.0.65" base64ct = { version = "1.5.2", features = ["std"] } chrono = { version = "0.4.22", features = ["serde"] } -digest = "0.10.3" -ecdsa = { version = "0.14.5", features = ["sign", "verify"] } +digest = "0.10.5" +ecdsa = { version = "0.14.7", features = ["sign", "verify"] } elliptic-curve = "0.12.3" generic-array = "0.14.6" hmac = "0.12.1" -k256 = { version = "0.11.2", features = ["ecdsa"] } +k256 = { version = "0.11.5", features = ["ecdsa"] } p256 = { version = "0.11.1", features = ["ecdsa"] } p384 = { version = "0.11.2", features = ["ecdsa"] } rand = "0.8.5" -rsa = "0.7.0-pre" +rsa = "0.7.0-rc.0" schemars = "0.8.10" sec1 = "0.3.0" -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" serde_with = { version = "2.0.1", features = ["base64"] } -sha2 = "0.10.5" -signature = "1.6.1" -thiserror = "1.0.35" +sha2 = { version = "0.10.6", features = ["oid"] } +signature = "1.6.3" +thiserror = "1.0.36" tracing = "0.1.36" url = { version = "2.3.1", features = ["serde"] } diff --git a/crates/jose/src/jwa/asymmetric.rs b/crates/jose/src/jwa/asymmetric.rs index 8409391f..88ebc091 100644 --- a/crates/jose/src/jwa/asymmetric.rs +++ b/crates/jose/src/jwa/asymmetric.rs @@ -13,6 +13,8 @@ // limitations under the License. use mas_iana::jose::{JsonWebKeyEcEllipticCurve, JsonWebSignatureAlg}; +use rand::thread_rng; +use signature::RandomizedSigner; use thiserror::Error; use super::signature::Signature; @@ -60,18 +62,15 @@ impl AsymmetricSigningKey { alg: JsonWebSignatureAlg, ) -> Result { match (params, alg) { - (JsonWebKeyPrivateParameters::Rsa(params), alg) => { - let key = rsa::RsaPrivateKey::try_from(params)?; - match alg { - JsonWebSignatureAlg::Rs256 => Ok(Self::Rs256(key.into())), - JsonWebSignatureAlg::Rs384 => Ok(Self::Rs384(key.into())), - JsonWebSignatureAlg::Rs512 => Ok(Self::Rs512(key.into())), - JsonWebSignatureAlg::Ps256 => Ok(Self::Ps256(key.into())), - JsonWebSignatureAlg::Ps384 => Ok(Self::Ps384(key.into())), - JsonWebSignatureAlg::Ps512 => Ok(Self::Ps512(key.into())), - _ => Err(AsymmetricKeyFromJwkError::KeyNotSuitable { alg }), - } - } + (JsonWebKeyPrivateParameters::Rsa(params), alg) => match alg { + JsonWebSignatureAlg::Rs256 => Ok(Self::Rs256(params.try_into()?)), + JsonWebSignatureAlg::Rs384 => Ok(Self::Rs384(params.try_into()?)), + JsonWebSignatureAlg::Rs512 => Ok(Self::Rs512(params.try_into()?)), + JsonWebSignatureAlg::Ps256 => Ok(Self::Ps256(params.try_into()?)), + JsonWebSignatureAlg::Ps384 => Ok(Self::Ps384(params.try_into()?)), + JsonWebSignatureAlg::Ps512 => Ok(Self::Ps512(params.try_into()?)), + _ => Err(AsymmetricKeyFromJwkError::KeyNotSuitable { alg }), + }, (JsonWebKeyPrivateParameters::Ec(params), JsonWebSignatureAlg::Es256) if params.crv == JsonWebKeyEcEllipticCurve::P256 => @@ -176,15 +175,15 @@ impl signature::Signer for AsymmetricSigningKey { Ok(Signature::from_signature(&signature)) } Self::Ps256(key) => { - let signature = key.try_sign(msg)?; + let signature = key.try_sign_with_rng(thread_rng(), msg)?; Ok(Signature::from_signature(&signature)) } Self::Ps384(key) => { - let signature = key.try_sign(msg)?; + let signature = key.try_sign_with_rng(thread_rng(), msg)?; Ok(Signature::from_signature(&signature)) } Self::Ps512(key) => { - let signature = key.try_sign(msg)?; + let signature = key.try_sign_with_rng(thread_rng(), msg)?; Ok(Signature::from_signature(&signature)) } Self::Es256(key) => { @@ -223,18 +222,15 @@ impl AsymmetricVerifyingKey { alg: JsonWebSignatureAlg, ) -> Result { match (params, alg) { - (JsonWebKeyPublicParameters::Rsa(params), alg) => { - let key = rsa::RsaPublicKey::try_from(params)?; - match alg { - JsonWebSignatureAlg::Rs256 => Ok(Self::Rs256(key.into())), - JsonWebSignatureAlg::Rs384 => Ok(Self::Rs384(key.into())), - JsonWebSignatureAlg::Rs512 => Ok(Self::Rs512(key.into())), - JsonWebSignatureAlg::Ps256 => Ok(Self::Ps256(key.into())), - JsonWebSignatureAlg::Ps384 => Ok(Self::Ps384(key.into())), - JsonWebSignatureAlg::Ps512 => Ok(Self::Ps512(key.into())), - _ => Err(AsymmetricKeyFromJwkError::KeyNotSuitable { alg }), - } - } + (JsonWebKeyPublicParameters::Rsa(params), alg) => match alg { + JsonWebSignatureAlg::Rs256 => Ok(Self::Rs256(params.try_into()?)), + JsonWebSignatureAlg::Rs384 => Ok(Self::Rs384(params.try_into()?)), + JsonWebSignatureAlg::Rs512 => Ok(Self::Rs512(params.try_into()?)), + JsonWebSignatureAlg::Ps256 => Ok(Self::Ps256(params.try_into()?)), + JsonWebSignatureAlg::Ps384 => Ok(Self::Ps384(params.try_into()?)), + JsonWebSignatureAlg::Ps512 => Ok(Self::Ps512(params.try_into()?)), + _ => Err(AsymmetricKeyFromJwkError::KeyNotSuitable { alg }), + }, (JsonWebKeyPublicParameters::Ec(params), JsonWebSignatureAlg::Es256) if params.crv == JsonWebKeyEcEllipticCurve::P256 => diff --git a/crates/jose/src/jwa/mod.rs b/crates/jose/src/jwa/mod.rs index b6a398fc..8b47d253 100644 --- a/crates/jose/src/jwa/mod.rs +++ b/crates/jose/src/jwa/mod.rs @@ -17,7 +17,6 @@ use sha2::{Sha256, Sha384, Sha512}; mod asymmetric; pub(crate) mod hmac; -pub(crate) mod rsa; pub(self) mod signature; mod symmetric; @@ -30,19 +29,19 @@ pub type Hs256Key = self::hmac::Hmac; pub type Hs384Key = self::hmac::Hmac; pub type Hs512Key = self::hmac::Hmac; -pub type Rs256SigningKey = self::rsa::pkcs1v15::SigningKey; -pub type Rs256VerifyingKey = self::rsa::pkcs1v15::VerifyingKey; -pub type Rs384SigningKey = self::rsa::pkcs1v15::SigningKey; -pub type Rs384VerifyingKey = self::rsa::pkcs1v15::VerifyingKey; -pub type Rs512SigningKey = self::rsa::pkcs1v15::SigningKey; -pub type Rs512VerifyingKey = self::rsa::pkcs1v15::VerifyingKey; +pub type Rs256SigningKey = rsa::pkcs1v15::SigningKey; +pub type Rs256VerifyingKey = rsa::pkcs1v15::VerifyingKey; +pub type Rs384SigningKey = rsa::pkcs1v15::SigningKey; +pub type Rs384VerifyingKey = rsa::pkcs1v15::VerifyingKey; +pub type Rs512SigningKey = rsa::pkcs1v15::SigningKey; +pub type Rs512VerifyingKey = rsa::pkcs1v15::VerifyingKey; -pub type Ps256SigningKey = self::rsa::pss::SigningKey; -pub type Ps256VerifyingKey = self::rsa::pss::VerifyingKey; -pub type Ps384SigningKey = self::rsa::pss::SigningKey; -pub type Ps384VerifyingKey = self::rsa::pss::VerifyingKey; -pub type Ps512SigningKey = self::rsa::pss::SigningKey; -pub type Ps512VerifyingKey = self::rsa::pss::VerifyingKey; +pub type Ps256SigningKey = rsa::pss::SigningKey; +pub type Ps256VerifyingKey = rsa::pss::VerifyingKey; +pub type Ps384SigningKey = rsa::pss::SigningKey; +pub type Ps384VerifyingKey = rsa::pss::VerifyingKey; +pub type Ps512SigningKey = rsa::pss::SigningKey; +pub type Ps512VerifyingKey = rsa::pss::VerifyingKey; pub type Es256SigningKey = ecdsa::SigningKey; pub type Es256VerifyingKey = ecdsa::VerifyingKey; diff --git a/crates/jose/src/jwa/rsa.rs b/crates/jose/src/jwa/rsa.rs deleted file mode 100644 index 661c8c57..00000000 --- a/crates/jose/src/jwa/rsa.rs +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright 2022 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This is a temporary wrapper until the RSA crate actually hashes the input -// See - -use super::signature::Signature; - -pub(crate) trait RsaHashIdentifier { - const HASH: rsa::Hash; -} - -impl RsaHashIdentifier for sha2::Sha224 { - const HASH: rsa::Hash = rsa::Hash::SHA2_224; -} - -impl RsaHashIdentifier for sha2::Sha256 { - const HASH: rsa::Hash = rsa::Hash::SHA2_256; -} - -impl RsaHashIdentifier for sha2::Sha384 { - const HASH: rsa::Hash = rsa::Hash::SHA2_384; -} - -impl RsaHashIdentifier for sha2::Sha512 { - const HASH: rsa::Hash = rsa::Hash::SHA2_512; -} - -pub(crate) mod pkcs1v15 { - use std::marker::PhantomData; - - use digest::Digest; - use rsa::{PaddingScheme, PublicKey, RsaPrivateKey, RsaPublicKey}; - - use super::{RsaHashIdentifier, Signature}; - - pub struct VerifyingKey { - inner: RsaPublicKey, - hash: PhantomData, - } - - impl From for VerifyingKey { - fn from(inner: RsaPublicKey) -> Self { - Self { - inner, - hash: PhantomData, - } - } - } - - impl signature::Verifier for VerifyingKey - where - H: Digest + RsaHashIdentifier, - { - fn verify(&self, msg: &[u8], signature: &Signature) -> Result<(), signature::Error> { - let digest = H::digest(msg); - let padding = PaddingScheme::new_pkcs1v15_sign(Some(H::HASH)); - self.inner - .verify(padding, &digest, signature.as_ref()) - .map_err(signature::Error::from_source) - } - } - - pub struct SigningKey { - inner: RsaPrivateKey, - hash: PhantomData, - } - - impl From for SigningKey { - fn from(inner: RsaPrivateKey) -> Self { - Self { - inner, - hash: PhantomData, - } - } - } - - impl signature::Signer for SigningKey - where - H: Digest + RsaHashIdentifier, - { - fn try_sign(&self, msg: &[u8]) -> Result { - let digest = H::digest(msg); - let padding = PaddingScheme::new_pkcs1v15_sign(Some(H::HASH)); - self.inner - .sign(padding, &digest) - .map_err(signature::Error::from_source) - .map(Signature::new) - } - } -} - -pub(crate) mod pss { - use std::marker::PhantomData; - - use digest::{Digest, DynDigest}; - use rand::thread_rng; - use rsa::{PaddingScheme, PublicKey, RsaPrivateKey, RsaPublicKey}; - - use super::Signature; - - pub struct VerifyingKey { - inner: RsaPublicKey, - hash: PhantomData, - } - - impl From for VerifyingKey { - fn from(inner: RsaPublicKey) -> Self { - Self { - inner, - hash: PhantomData, - } - } - } - - impl signature::Verifier for VerifyingKey - where - H: Digest + DynDigest + 'static, - { - fn verify(&self, msg: &[u8], signature: &Signature) -> Result<(), signature::Error> { - let digest = H::digest(msg); - let padding = PaddingScheme::new_pss::(thread_rng()); - self.inner - .verify(padding, &digest, signature.as_ref()) - .map_err(signature::Error::from_source) - } - } - - pub struct SigningKey { - inner: RsaPrivateKey, - hash: PhantomData, - } - - impl From for SigningKey { - fn from(inner: RsaPrivateKey) -> Self { - Self { - inner, - hash: PhantomData, - } - } - } - - impl signature::Signer for SigningKey - where - H: Digest + DynDigest + 'static, - { - fn try_sign(&self, msg: &[u8]) -> Result { - let digest = H::digest(msg); - let padding = PaddingScheme::new_pss::(thread_rng()); - self.inner - .sign(padding, &digest) - .map_err(signature::Error::from_source) - .map(Signature::new) - } - } -} diff --git a/crates/jose/src/jwk/private_parameters.rs b/crates/jose/src/jwk/private_parameters.rs index c86de9f1..f8729819 100644 --- a/crates/jose/src/jwk/private_parameters.rs +++ b/crates/jose/src/jwk/private_parameters.rs @@ -228,15 +228,14 @@ struct RsaOtherPrimeInfo { } mod rsa_impls { - use digest::DynDigest; + use digest::{const_oid::AssociatedOid, Digest}; use rsa::{BigUint, RsaPrivateKey}; use super::RsaPrivateParameters; - use crate::jwa::rsa::RsaHashIdentifier; - impl TryFrom for crate::jwa::rsa::pkcs1v15::SigningKey + impl TryFrom for rsa::pkcs1v15::SigningKey where - H: RsaHashIdentifier, + H: Digest + AssociatedOid, { type Error = rsa::errors::Error; fn try_from(value: RsaPrivateParameters) -> Result { @@ -244,20 +243,20 @@ mod rsa_impls { } } - impl TryFrom<&RsaPrivateParameters> for crate::jwa::rsa::pkcs1v15::SigningKey + impl TryFrom<&RsaPrivateParameters> for rsa::pkcs1v15::SigningKey where - H: RsaHashIdentifier, + H: Digest + AssociatedOid, { type Error = rsa::errors::Error; fn try_from(value: &RsaPrivateParameters) -> Result { let key: RsaPrivateKey = value.try_into()?; - Ok(Self::from(key)) + Ok(Self::new_with_prefix(key)) } } - impl TryFrom for crate::jwa::rsa::pss::SigningKey + impl TryFrom for rsa::pss::SigningKey where - H: DynDigest + Default + 'static, + H: Digest, { type Error = rsa::errors::Error; fn try_from(value: RsaPrivateParameters) -> Result { @@ -265,14 +264,14 @@ mod rsa_impls { } } - impl TryFrom<&RsaPrivateParameters> for crate::jwa::rsa::pss::SigningKey + impl TryFrom<&RsaPrivateParameters> for rsa::pss::SigningKey where - H: DynDigest + Default + 'static, + H: Digest, { type Error = rsa::errors::Error; fn try_from(value: &RsaPrivateParameters) -> Result { let key: RsaPrivateKey = value.try_into()?; - Ok(Self::from(key)) + Ok(Self::new(key)) } } @@ -298,7 +297,7 @@ mod rsa_impls { .map(|i| BigUint::from_bytes_be(i)) .collect(); - let key = RsaPrivateKey::from_components(n, e, d, primes); + let key = RsaPrivateKey::from_components(n, e, d, primes)?; key.validate()?; diff --git a/crates/jose/src/jwk/public_parameters.rs b/crates/jose/src/jwk/public_parameters.rs index b448b49a..674887fe 100644 --- a/crates/jose/src/jwk/public_parameters.rs +++ b/crates/jose/src/jwk/public_parameters.rs @@ -188,11 +188,10 @@ impl OkpPublicParameters { } mod rsa_impls { - use digest::DynDigest; + use digest::{const_oid::AssociatedOid, Digest}; use rsa::{BigUint, PublicKeyParts, RsaPublicKey}; use super::{JsonWebKeyPublicParameters, RsaPublicParameters}; - use crate::jwa::rsa::RsaHashIdentifier; impl From for JsonWebKeyPublicParameters { fn from(key: RsaPublicKey) -> Self { @@ -221,9 +220,9 @@ mod rsa_impls { } } - impl TryFrom for crate::jwa::rsa::pkcs1v15::VerifyingKey + impl TryFrom for rsa::pkcs1v15::VerifyingKey where - H: RsaHashIdentifier, + H: Digest + AssociatedOid, { type Error = rsa::errors::Error; fn try_from(value: RsaPublicParameters) -> Result { @@ -231,20 +230,20 @@ mod rsa_impls { } } - impl TryFrom<&RsaPublicParameters> for crate::jwa::rsa::pkcs1v15::VerifyingKey + impl TryFrom<&RsaPublicParameters> for rsa::pkcs1v15::VerifyingKey where - H: RsaHashIdentifier, + H: Digest + AssociatedOid, { type Error = rsa::errors::Error; fn try_from(value: &RsaPublicParameters) -> Result { let key: RsaPublicKey = value.try_into()?; - Ok(Self::from(key)) + Ok(Self::new_with_prefix(key)) } } - impl TryFrom for crate::jwa::rsa::pss::VerifyingKey + impl TryFrom for rsa::pss::VerifyingKey where - H: DynDigest + Default + 'static, + H: Digest, { type Error = rsa::errors::Error; fn try_from(value: RsaPublicParameters) -> Result { @@ -252,14 +251,14 @@ mod rsa_impls { } } - impl TryFrom<&RsaPublicParameters> for crate::jwa::rsa::pss::VerifyingKey + impl TryFrom<&RsaPublicParameters> for rsa::pss::VerifyingKey where - H: DynDigest + Default + 'static, + H: Digest, { type Error = rsa::errors::Error; fn try_from(value: &RsaPublicParameters) -> Result { let key: RsaPublicKey = value.try_into()?; - Ok(Self::from(key)) + Ok(Self::new(key)) } } diff --git a/crates/keystore/Cargo.toml b/crates/keystore/Cargo.toml index 9dbb914b..b89dbac5 100644 --- a/crates/keystore/Cargo.toml +++ b/crates/keystore/Cargo.toml @@ -6,24 +6,24 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.64" +anyhow = "1.0.65" aead = { version = "0.5.1", features = ["std"] } const-oid = { version = "0.9.0", features = ["std"] } -cookie = { version = "0.16.0", features = ["key-expansion", "private"] } +cookie = { version = "0.16.1", features = ["key-expansion", "private"] } der = { version = "0.6.0", features = ["std"] } -ecdsa = { version = "0.14.5", features = ["std"] } +ecdsa = { version = "0.14.7", features = ["std"] } elliptic-curve = { version = "0.12.3", features = ["std", "pem", "sec1"] } -k256 = { version = "0.11.1", features = ["std"] } +k256 = { version = "0.11.5", features = ["std"] } p256 = { version = "0.11.1", features = ["std"] } -p384 = { version = "0.11.1", features = ["std"] } +p384 = { version = "0.11.2", features = ["std"] } pem-rfc7468 = { version = "0.6.0", features = ["std"] } pkcs1 = { version = "0.4.0", features = ["std"] } pkcs8 = { version = "0.9.0", features = ["std", "pkcs5", "encryption"] } rand = "0.8.5" -rsa = { version = "0.7.0-pre", features = ["std", "pem"] } +rsa = { version = "0.7.0-rc.0", features = ["std", "pem"] } sec1 = { version = "0.3.0", features = ["std"] } spki = { version = "0.6.0", features = ["std"] } -thiserror = "1.0.35" +thiserror = "1.0.36" generic-array = "0.14.6" chacha20poly1305 = { version = "0.10.1", features = ["std"] } base64ct = "1.5.2" diff --git a/crates/keystore/src/lib.rs b/crates/keystore/src/lib.rs index abb65415..25fc257f 100644 --- a/crates/keystore/src/lib.rs +++ b/crates/keystore/src/lib.rs @@ -162,7 +162,7 @@ impl PrivateKey { let first_prime = BigUint::from_bytes_be(pkcs1_key.prime1.as_bytes()); let second_prime = BigUint::from_bytes_be(pkcs1_key.prime2.as_bytes()); let primes = vec![first_prime, second_prime]; - let key = rsa::RsaPrivateKey::from_components(n, e, d, primes); + let key = rsa::RsaPrivateKey::from_components(n, e, d, primes)?; Ok(Self::Rsa(Box::new(key))) } @@ -421,12 +421,24 @@ impl PrivateKey { (Self::Rsa(key), _) => { let key: rsa::RsaPublicKey = key.to_public_key(); match alg { - JsonWebSignatureAlg::Rs256 => AsymmetricVerifyingKey::Rs256(key.into()), - JsonWebSignatureAlg::Rs384 => AsymmetricVerifyingKey::Rs384(key.into()), - JsonWebSignatureAlg::Rs512 => AsymmetricVerifyingKey::Rs512(key.into()), - JsonWebSignatureAlg::Ps256 => AsymmetricVerifyingKey::Ps256(key.into()), - JsonWebSignatureAlg::Ps384 => AsymmetricVerifyingKey::Ps384(key.into()), - JsonWebSignatureAlg::Ps512 => AsymmetricVerifyingKey::Ps512(key.into()), + JsonWebSignatureAlg::Rs256 => { + AsymmetricVerifyingKey::Rs256(rsa::pkcs1v15::VerifyingKey::new(key)) + } + JsonWebSignatureAlg::Rs384 => { + AsymmetricVerifyingKey::Rs384(rsa::pkcs1v15::VerifyingKey::new(key)) + } + JsonWebSignatureAlg::Rs512 => { + AsymmetricVerifyingKey::Rs512(rsa::pkcs1v15::VerifyingKey::new(key)) + } + JsonWebSignatureAlg::Ps256 => { + AsymmetricVerifyingKey::Ps256(rsa::pss::VerifyingKey::new(key)) + } + JsonWebSignatureAlg::Ps384 => { + AsymmetricVerifyingKey::Ps384(rsa::pss::VerifyingKey::new(key)) + } + JsonWebSignatureAlg::Ps512 => { + AsymmetricVerifyingKey::Ps512(rsa::pss::VerifyingKey::new(key)) + } _ => return Err(WrongAlgorithmError), } } @@ -463,12 +475,24 @@ impl PrivateKey { (Self::Rsa(key), _) => { let key: rsa::RsaPrivateKey = *key.clone(); match alg { - JsonWebSignatureAlg::Rs256 => AsymmetricSigningKey::Rs256(key.into()), - JsonWebSignatureAlg::Rs384 => AsymmetricSigningKey::Rs384(key.into()), - JsonWebSignatureAlg::Rs512 => AsymmetricSigningKey::Rs512(key.into()), - JsonWebSignatureAlg::Ps256 => AsymmetricSigningKey::Ps256(key.into()), - JsonWebSignatureAlg::Ps384 => AsymmetricSigningKey::Ps384(key.into()), - JsonWebSignatureAlg::Ps512 => AsymmetricSigningKey::Ps512(key.into()), + JsonWebSignatureAlg::Rs256 => { + AsymmetricSigningKey::Rs256(rsa::pkcs1v15::SigningKey::new(key)) + } + JsonWebSignatureAlg::Rs384 => { + AsymmetricSigningKey::Rs384(rsa::pkcs1v15::SigningKey::new(key)) + } + JsonWebSignatureAlg::Rs512 => { + AsymmetricSigningKey::Rs512(rsa::pkcs1v15::SigningKey::new(key)) + } + JsonWebSignatureAlg::Ps256 => { + AsymmetricSigningKey::Ps256(rsa::pss::SigningKey::new(key)) + } + JsonWebSignatureAlg::Ps384 => { + AsymmetricSigningKey::Ps384(rsa::pss::SigningKey::new(key)) + } + JsonWebSignatureAlg::Ps512 => { + AsymmetricSigningKey::Ps512(rsa::pss::SigningKey::new(key)) + } _ => return Err(WrongAlgorithmError), } } diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 2062837b..f4620928 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] http = "0.2.8" -serde = "1.0.144" +serde = "1.0.145" serde_json = "1.0.85" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } @@ -15,10 +15,10 @@ parse-display = "0.6.0" indoc = "1.0.7" serde_with = { version = "2.0.1", features = ["chrono"] } chrono = "0.4.22" -sha2 = "0.10.5" +sha2 = "0.10.6" data-encoding = "2.3.2" -thiserror = "1.0.35" -itertools = "0.10.3" +thiserror = "1.0.36" +itertools = "0.10.5" mas-iana = { path = "../iana" } mas-jose = { path = "../jose" } diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index dac96d1f..16f66870 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.64" +anyhow = "1.0.65" opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" -thiserror = "1.0.35" +thiserror = "1.0.36" tokio = { version = "1.21.1", features = ["io-util", "rt"] } tracing = "0.1.36" wasmtime = "0.40.1" diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 354fca89..9c3c2479 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] axum = { version = "0.6.0-rc.2", default-features = false } -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_urlencoded = "0.7.1" serde_with = "2.0.1" url = "2.3.1" diff --git a/crates/static-files/Cargo.toml b/crates/static-files/Cargo.toml index a04e964e..e53bbd1e 100644 --- a/crates/static-files/Cargo.toml +++ b/crates/static-files/Cargo.toml @@ -10,7 +10,7 @@ dev = [] [dependencies] axum = { version = "0.6.0-rc.2", features = ["headers"] } -headers = "0.3.7" +headers = "0.3.8" http = "0.2.8" http-body = "0.4.5" mime_guess = "2.0.4" diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 14f399f4..a0f9457d 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -7,12 +7,12 @@ license = "Apache-2.0" [dependencies] tokio = "1.21.1" -sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] } chrono = { version = "0.4.22", features = ["serde"] } -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" -thiserror = "1.0.35" -anyhow = "1.0.64" +thiserror = "1.0.36" +anyhow = "1.0.65" tracing = "0.1.36" # Password hashing diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index 3709ae7d..374ff5ac 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -8,9 +8,9 @@ license = "Apache-2.0" [dependencies] tokio = "1.21.1" async-trait = "0.1.57" -tokio-stream = "0.1.9" +tokio-stream = "0.1.10" futures-util = "0.3.24" tracing = "0.1.36" -sqlx = { version = "0.6.1", features = ["runtime-tokio-rustls", "postgres"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } mas-storage = { path = "../storage" } diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 64d6ddc2..ba6061d1 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -12,11 +12,11 @@ dev = [] tracing = "0.1.36" tokio = { version = "1.21.1", features = ["macros"] } -anyhow = "1.0.64" -thiserror = "1.0.35" +anyhow = "1.0.65" +thiserror = "1.0.36" -tera = "1.17.0" -serde = { version = "1.0.144", features = ["derive"] } +tera = "1.17.1" +serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" serde_urlencoded = "0.7.1"