From 27fa4fef4f21343ae92a340440d15c2f31486f62 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Mon, 27 Jun 2022 11:33:21 +0200 Subject: [PATCH] Bump dependencies --- Cargo.lock | 87 ++++++++++++++++++---------------- crates/axum-utils/Cargo.toml | 4 +- crates/cli/Cargo.toml | 2 +- crates/handlers/Cargo.toml | 6 +-- crates/http/Cargo.toml | 4 +- crates/jose/Cargo.toml | 8 ++-- crates/policy/Cargo.toml | 2 +- crates/router/Cargo.toml | 2 +- crates/static-files/Cargo.toml | 4 +- 9 files changed, 63 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 328127a6..71e36219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -927,23 +927,24 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa7c3188913c2d11a361e0431e135742372a2709a99b103e79758e11a0a797e" +checksum = "899dc8d22f7771e7f887fb8bafa0c0d3ac1dea0c7f2c0ded6e20a855a7a1e890" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29285f70fd396a8f64455a15a6e1d390322e4a5f5186de513141313211b0a23e" +checksum = "8dbdc03f695cf67e7bc45da57155528274f47390b85060af8107eb304ef167c4" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", + "cranelift-isle", "gimli", "log", "regalloc2", @@ -953,33 +954,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057eac2f202ec95aebfd8d495e88560ac085f6a415b3c6c28529dc5eb116a141" +checksum = "9ea66cbba3eb7fcb3ec9f42839a6d381bd40cf97780397e7167daf9725d4ffa0" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d93869efd18874a9341cfd8ad66bcb08164e86357a694a0e939d29e87410b9" +checksum = "712fbebd119a476f59122b4ba51fdce893a66309b5c92bd5506bfb11a0587496" [[package]] name = "cranelift-entity" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e34bd7a1fefa902c90a921b36323f17a398b788fa56a75f07a29d83b6e28808" +checksum = "4cb8b95859c4e14c9e860db78d596a904fdbe9261990233b62bd526346cb56cb" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457018dd2d6ee300953978f63215b5edf3ae42dbdf8c7c038972f10394599f72" +checksum = "c7b91b19a7d1221a73f190c0e865c12be77a84f661cac89abfd4ab5820142886" dependencies = [ "cranelift-codegen", "log", @@ -988,10 +989,16 @@ dependencies = [ ] [[package]] -name = "cranelift-native" -version = "0.84.0" +name = "cranelift-isle" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba027cc41bf1d0eee2ddf16caba2ee1be682d0214520fff0129d2c6557fda89" +checksum = "86d4f53bc86fb458e59c695c6a95ce8346e6a8377ee7ffc058e3ac08b5f94cb1" + +[[package]] +name = "cranelift-native" +version = "0.85.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592f035d0ed41214dfeeb37abd536233536a27be6b4c2d39f380cd402f0cff4f" dependencies = [ "cranelift-codegen", "libc", @@ -1000,9 +1007,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b17639ced10b9916c9be120d38c872ea4f9888aa09248568b10056ef0559bfa" +checksum = "295add6bf0b527a8bc50d02e31ff878585d2d2db53cb7e8754d6d82b84480086" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2862,7 +2869,7 @@ checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#47586f82ca39390aeed7bb56b8220395899f3176" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#a4385b5eed33f3c89c367f890a76b8839c6dac7b" dependencies = [ "anyhow", "base64", @@ -3539,9 +3546,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.1.3" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904196c12c9f55d3aea578613219f493ced8e05b3d0c6a42d11cb4142d8b4879" +checksum = "0d37148700dbb38f994cd99a1431613057f37ed934d7e4d799b7ab758c482461" dependencies = [ "fxhash", "log", @@ -5120,18 +5127,18 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.84.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dc97c22bb5ce49a47b745bed8812d30206eff5ef3af31424f2c1820c0974b2" +checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" dependencies = [ "indexmap", ] [[package]] name = "wasmtime" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdd1101bdfa0414a19018ec0a091951a20b695d4d04f858d49f6c4cc53cd8dd" +checksum = "c842f9c8e190fe01300fc8d715e9368c775670fb9856247c67abffdb5236d6db" dependencies = [ "anyhow", "async-trait", @@ -5163,9 +5170,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79da81ed0724392948ad7a0fb5088ff1bd15fa937356c8c037c6b1c8b5473cde" +checksum = "cce2aa752e864a33eef2a6629edc59554e75f0bc1719431dac5e49eed516af69" dependencies = [ "anyhow", "base64", @@ -5183,9 +5190,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e78edcfb0daa9a9579ac379d00e2d5a5b2a60c0d653c8c95e8412f2166acb9" +checksum = "922361eb8c03cea8909bc922471202f6c6bc2f0c682fac2fe473740441c86b3b" dependencies = [ "anyhow", "cranelift-codegen", @@ -5205,9 +5212,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4201389132ec467981980549574b33fc70d493b40f2c045c8ce5c7b54fbad97e" +checksum = "e602f1120fc40a3f016f1f69d08c86cfeff7b867bed1462901953e6871f85167" dependencies = [ "anyhow", "cranelift-entity", @@ -5225,9 +5232,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba6777a84b44f9a384b5c9d511ae3d86534438b7e25d928b8e8e858ecad5df2" +checksum = "1e078bd1a01b8bacd982280eca4dfc22093ae2b19607ae6a38a97278f45aa5fa" dependencies = [ "cc", "rustix", @@ -5236,9 +5243,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1587ca7752d00862faa540d00fd28e5ccf1ac61ba19756449193f1153cb2b127" +checksum = "49af1445759a8e797a92f27dd0983c155615648263052e0b80d69e7d223896b7" dependencies = [ "addr2line", "anyhow", @@ -5263,9 +5270,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27233ab6c8934b23171c64f215f902ef19d18c1712b46a0674286d1ef28d5dd" +checksum = "e6d5dd480cc6dc0a401653e45b79796a3317f8228990d84bc2271bdaf0810071" dependencies = [ "lazy_static", "object", @@ -5274,9 +5281,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d3b0b8f13db47db59d616e498fe45295819d04a55f9921af29561827bdb816" +checksum = "e875bcd02d1ecfc7d099dd58354d55d73467652eb2b103ff470fe3aecb7d0381" dependencies = [ "anyhow", "backtrace", @@ -5301,9 +5308,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1630d9dca185299bec7f557a7e73b28742fe5590caf19df001422282a0a98ad1" +checksum = "8fd63a19ba61ac7448add4dc1fecb8d78304812af2a52dad04b89f887791b156" dependencies = [ "cranelift-entity", "serde", diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index a8d59d8e..c1b89893 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.56" -axum = { version = "0.5.7", features = ["headers"] } +axum = { version = "0.5.9", features = ["headers"] } axum-extra = { version = "0.3.4", features = ["cookie-private"] } bincode = "1.3.3" chrono = "0.4.19" @@ -25,7 +25,7 @@ serde_json = "1.0.81" sqlx = "0.6.0" thiserror = "1.0.31" tokio = "1.19.2" -tower = { version = "0.4.12", features = ["util"] } +tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.35" url = "2.2.2" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 86e0bbad..a20446df 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0.58" clap = { version = "3.2.6", features = ["derive"] } dotenv = "0.15.0" schemars = { version = "0.8.10", features = ["url", "chrono"] } -tower = { version = "0.4.12", features = ["full"] } +tower = { version = "0.4.13", features = ["full"] } hyper = { version = "0.14.19", features = ["full"] } serde_yaml = "0.8.24" serde_json = "1.0.81" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 2932157d..f6ffb224 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -18,9 +18,9 @@ anyhow = "1.0.58" # Web server hyper = { version = "0.14.19", features = ["full"] } -tower = "0.4.12" +tower = "0.4.13" tower-http = { version = "0.3.4", features = ["cors"] } -axum = "0.5.7" +axum = "0.5.9" axum-macros = "0.2.2" axum-extra = { version = "0.3.4", features = ["cookie-private"] } @@ -42,7 +42,7 @@ argon2 = { version = "0.4.0", features = ["password-hash"] } # Crypto, hashing and signing stuff rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } pkcs8 = { version = "0.9.0", features = ["pem"] } -elliptic-curve = { version = "0.12.0", features = ["pem"] } +elliptic-curve = { version = "0.12.1", features = ["pem"] } sha2 = "0.10.2" crc = "3.0.0" diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index dcb097ad..951d15c1 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -axum = "0.5.7" +axum = "0.5.9" bytes = "1.1.0" futures-util = "0.3.21" headers = "0.3.7" @@ -23,7 +23,7 @@ serde = "1.0.137" serde_json = "1.0.81" thiserror = "1.0.31" tokio = { version = "1.19.2", features = ["sync", "parking_lot"] } -tower = { version = "0.4.12", features = ["timeout", "limit"] } +tower = { version = "0.4.13", features = ["timeout", "limit"] } tower-http = { version = "0.3.4", features = ["follow-redirect", "decompression-full", "set-header", "compression-full", "cors"] } tracing = "0.1.35" tracing-opentelemetry = "0.17.3" diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index 73615cc6..32f7531a 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -8,12 +8,12 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.58" async-trait = "0.1.56" -base64ct = { version = "1.5.0", features = ["std"] } +base64ct = { version = "1.5.1", features = ["std"] } chrono = { version = "0.4.19", features = ["serde"] } crypto-mac = { version = "0.11.1", features = ["std"] } digest = "0.10.3" -ecdsa = { version = "0.14.1", features = ["sign", "verify", "pem", "pkcs8"] } -elliptic-curve = { version = "0.12.0", features = ["ecdh", "pem"] } +ecdsa = { version = "0.14.3", features = ["sign", "verify", "pem", "pkcs8"] } +elliptic-curve = { version = "0.12.1", features = ["ecdh", "pem"] } futures-util = "0.3.21" hmac = "0.12.1" http = "0.2.8" @@ -31,7 +31,7 @@ sha2 = "0.10.2" signature = "1.5.0" thiserror = "1.0.31" tokio = { version = "1.19.2", features = ["macros", "rt", "sync"] } -tower = { version = "0.4.12", features = ["util"] } +tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.35" url = { version = "2.2.2", features = ["serde"] } diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index 7150ac99..76ef30e6 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -13,7 +13,7 @@ serde_json = "1.0.81" thiserror = "1.0.31" tokio = { version = "1.19.2", features = ["io-util", "rt"] } tracing = "0.1.35" -wasmtime = "0.37.0" +wasmtime = "0.38.0" mas-data-model = { path = "../data-model" } oauth2-types = { path = "../oauth2-types" } diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index f8192f2d..deeed157 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -axum = { version = "0.5.7", default-features = false } +axum = { version = "0.5.9", default-features = false } serde = { version = "1.0.137", features = ["derive"] } serde_urlencoded = "0.7.1" serde_with = "1.14.0" diff --git a/crates/static-files/Cargo.toml b/crates/static-files/Cargo.toml index a0ff5577..05601419 100644 --- a/crates/static-files/Cargo.toml +++ b/crates/static-files/Cargo.toml @@ -9,12 +9,12 @@ license = "Apache-2.0" dev = [] [dependencies] -axum = "0.5.7" +axum = "0.5.9" headers = "0.3.7" http = "0.2.8" http-body = "0.4.5" mime_guess = "2.0.4" rust-embed = "6.4.0" -tower = "0.4.12" +tower = "0.4.13" tower-http = { version = "0.3.4", features = ["fs"] } tracing = "0.1.35"