From fbfbe2eb3493c57e03bdd3ac92f7628bf3085aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Fri, 8 Sep 2023 16:51:07 +0200 Subject: [PATCH] Update ipnetwork to 0.20 --- Cargo.lock | 29 +++++++++++++++++++---------- mullvad-api/Cargo.toml | 2 +- mullvad-jni/Cargo.toml | 2 +- mullvad-relay-selector/Cargo.toml | 2 +- mullvad-types/Cargo.toml | 2 +- talpid-core/Cargo.toml | 2 +- talpid-routing/Cargo.toml | 2 +- talpid-tunnel/Cargo.toml | 2 +- talpid-types/Cargo.toml | 2 +- talpid-wireguard/Cargo.toml | 2 +- 10 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b5b6192ecf0..0c3b76d5e192 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1480,6 +1480,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + [[package]] name = "iprange" version = "0.6.7" @@ -1792,7 +1801,7 @@ dependencies = [ "futures", "http", "hyper", - "ipnetwork", + "ipnetwork 0.20.0", "log", "mullvad-fs", "mullvad-types", @@ -1896,7 +1905,7 @@ version = "0.0.0" dependencies = [ "err-derive", "futures", - "ipnetwork", + "ipnetwork 0.20.0", "jnix", "log", "log-panics", @@ -1981,7 +1990,7 @@ dependencies = [ "chrono", "err-derive", "futures", - "ipnetwork", + "ipnetwork 0.20.0", "log", "mullvad-api", "mullvad-types", @@ -2020,7 +2029,7 @@ dependencies = [ "chrono", "clap", "err-derive", - "ipnetwork", + "ipnetwork 0.20.0", "jnix", "log", "once_cell", @@ -2436,7 +2445,7 @@ dependencies = [ "errno 0.2.8", "error-chain", "ioctl-sys", - "ipnetwork", + "ipnetwork 0.16.0", "libc", ] @@ -3432,7 +3441,7 @@ dependencies = [ "err-derive", "futures", "inotify 0.10.2", - "ipnetwork", + "ipnetwork 0.20.0", "jnix", "libc", "log", @@ -3549,7 +3558,7 @@ dependencies = [ "bitflags 1.3.2", "err-derive", "futures", - "ipnetwork", + "ipnetwork 0.20.0", "libc", "log", "netlink-packet-route", @@ -3581,7 +3590,7 @@ dependencies = [ "duct", "err-derive", "futures", - "ipnetwork", + "ipnetwork 0.20.0", "jnix", "log", "nix 0.23.2", @@ -3618,7 +3627,7 @@ version = "0.0.0" dependencies = [ "base64 0.13.1", "err-derive", - "ipnetwork", + "ipnetwork 0.20.0", "jnix", "serde", "x25519-dalek", @@ -3648,7 +3657,7 @@ dependencies = [ "futures", "hex", "internet-checksum", - "ipnetwork", + "ipnetwork 0.20.0", "libc", "log", "netlink-packet-core", diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml index 59adb7da3e26..4e6308c1bd8f 100644 --- a/mullvad-api/Cargo.toml +++ b/mullvad-api/Cargo.toml @@ -18,7 +18,7 @@ err-derive = { workspace = true } futures = "0.3" http = "0.2" hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] } -ipnetwork = "0.16" +ipnetwork = "0.20" log = "0.4" serde = "1" serde_json = "1.0" diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml index 002832762967..553bdd3b3f2e 100644 --- a/mullvad-jni/Cargo.toml +++ b/mullvad-jni/Cargo.toml @@ -18,7 +18,7 @@ crate_type = ["cdylib"] [target.'cfg(target_os = "android")'.dependencies] err-derive = { workspace = true } futures = "0.3" -ipnetwork = "0.16" +ipnetwork = "0.20" jnix = { version = "0.5", features = ["derive"] } log = "0.4" log-panics = "2" diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml index 56a6807db46b..6d74bc4b6471 100644 --- a/mullvad-relay-selector/Cargo.toml +++ b/mullvad-relay-selector/Cargo.toml @@ -12,7 +12,7 @@ publish.workspace = true chrono = { workspace = true } err-derive = { workspace = true } futures = "0.3" -ipnetwork = "0.16" +ipnetwork = "0.20" log = "0.4" parking_lot = "0.12.0" rand = "0.8.5" diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml index b603e4e03e90..dee10f39ec1a 100644 --- a/mullvad-types/Cargo.toml +++ b/mullvad-types/Cargo.toml @@ -11,7 +11,7 @@ publish.workspace = true [dependencies] chrono = { workspace = true, features = ["clock", "serde"] } err-derive = { workspace = true } -ipnetwork = "0.16" +ipnetwork = "0.20" once_cell = "1.13" log = "0.4" regex = "1" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 44fee73f19b3..a4f3e9ce5513 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -12,7 +12,7 @@ publish.workspace = true duct = "0.13" err-derive = { workspace = true } futures = "0.3.15" -ipnetwork = "0.16" +ipnetwork = "0.20" once_cell = "1.13" libc = "0.2" log = "0.4" diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml index d4bb319cd1f0..a79d2854d341 100644 --- a/talpid-routing/Cargo.toml +++ b/talpid-routing/Cargo.toml @@ -12,7 +12,7 @@ publish.workspace = true [dependencies] err-derive = { workspace = true } futures = "0.3.15" -ipnetwork = "0.16" +ipnetwork = "0.20" log = "0.4" tokio = { workspace = true, features = ["process", "rt-multi-thread", "net"] } diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml index bf0a2fc834ba..b1a132c4170f 100644 --- a/talpid-tunnel/Cargo.toml +++ b/talpid-tunnel/Cargo.toml @@ -11,7 +11,7 @@ publish.workspace = true [dependencies] err-derive = { workspace = true } cfg-if = "1.0" -ipnetwork = "0.16" +ipnetwork = "0.20" talpid-routing = { path = "../talpid-routing" } talpid-types = { path = "../talpid-types" } futures = "0.3.15" diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml index d95aa7e5ee7c..715254bee15d 100644 --- a/talpid-types/Cargo.toml +++ b/talpid-types/Cargo.toml @@ -10,7 +10,7 @@ publish.workspace = true [dependencies] serde = { version = "1.0", features = ["derive"] } -ipnetwork = "0.16" +ipnetwork = "0.20" base64 = "0.13" x25519-dalek = { version = "2.0.0", features = ["static_secrets", "zeroize", "getrandom"] } err-derive = { workspace = true } diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml index ee04a4cfe77c..51960147f233 100644 --- a/talpid-wireguard/Cargo.toml +++ b/talpid-wireguard/Cargo.toml @@ -13,7 +13,7 @@ publish.workspace = true err-derive = { workspace = true } futures = "0.3.15" hex = "0.4" -ipnetwork = "0.16" +ipnetwork = "0.20" once_cell = "1.13" libc = "0.2" log = "0.4"