diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-01 15:20:49 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-01 15:20:49 +0200 |
| commit | d58049f046038d7eba1bc7c41a34f5c5e58385a9 (patch) | |
| tree | 78d9007f059fb084cc933f51a8ad3ea95b22c2e0 | |
| parent | f58d49ebaf4037b67a67762db79a548f0a987fd8 (diff) | |
| parent | 1a9fc9d4014b9c698aac9c31a41224ea1395ac61 (diff) | |
| download | mullvadvpn-d58049f046038d7eba1bc7c41a34f5c5e58385a9.tar.xz mullvadvpn-d58049f046038d7eba1bc7c41a34f5c5e58385a9.zip | |
Merge branch 'upgrade-rustls'
| -rw-r--r-- | Cargo.lock | 37 | ||||
| -rw-r--r-- | mullvad-api/Cargo.toml | 4 |
2 files changed, 20 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock index e8c8786b6e..43ca55d88f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3121,23 +3121,33 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.0", + "base64 0.21.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -3982,13 +3992,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -4541,16 +4550,6 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "which" version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml index 0f8ec95547..29da0f05a2 100644 --- a/mullvad-api/Cargo.toml +++ b/mullvad-api/Cargo.toml @@ -24,8 +24,8 @@ regex = "1" serde = "1" serde_json = "1.0" tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] } -tokio-rustls = "0.23" -rustls-pemfile = "0.2" +tokio-rustls = "0.24.1" +rustls-pemfile = "1.0.3" once_cell = "1.13" mullvad-fs = { path = "../mullvad-fs" } |
