Merge branch 'proc-macro-error-unmaintained'

mullvad · Sep 20, 2024 · f20eda4 · f20eda4
2 parents bd8f0b8 + dfaa2d8
commit f20eda4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 93 deletions.
diff --git a/.github/workflows/cargo-audit.yml b/.github/workflows/cargo-audit.yml
@@ -29,9 +29,7 @@ jobs:
           # Ignored audit issues. This list should be kept short, and effort should be
           # put into removing items from the list.
           # RUSTSEC-2023-0079 - KyberSlash in `pqc_kyber`.
-          # RUSTSEC-2024-0370 - `proc-macro-error` is unmaintained.
-          # `nftnl 0.6.2` uses `proc-macro-error`.
-          ignore: RUSTSEC-2023-0079,RUSTSEC-2024-0370
+          ignore: RUSTSEC-2023-0079
 
       - uses: actions-rust-lang/audit@v1.1.11
         name: Audit testrunner Rust Dependencies
@@ -41,6 +39,4 @@ jobs:
           # Ignored audit issues. This list should be kept short, and effort should be
           # put into removing items from the list.
           # RUSTSEC-2023-0079 - KyberSlash in `pqc_kyber`.
-          # RUSTSEC-2024-0370 - `proc-macro-error` is unmaintained.
-          # `nftnl 0.6.2` uses `proc-macro-error`.
-          ignore: RUSTSEC-2023-0079,RUSTSEC-2024-0370
+          ignore: RUSTSEC-2023-0079
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -28,9 +28,6 @@ ignore = [
     # put into removing items from the list.
     # RUSTSEC-2023-0079 - KyberSlash in `pqc_kyber`.
     "RUSTSEC-2023-0079",
-    # RUSTSEC-2024-0370 - `proc-macro-error` is unmaintained.
-    # `nftnl 0.6.2` uses `proc-macro-error`.
-    "RUSTSEC-2024-0370",
 ]
 
 

diff --git a/osv-scanner.toml b/osv-scanner.toml
@@ -50,11 +50,3 @@ KyberSlash is not exploitable in our usage of it:
 https://mullvad.net/en/blog/mullvads-usage-of-kyber-is-not-affected-by-kyberslash
 And no patched version is available.
 """
-
-[[IgnoredVulns]]
-id = "RUSTSEC-2024-0370"
-ignoreUntil = 2024-12-06
-reason = """
-proc-macro-error is unmaintained, but it does not necessarily contain any vulns.
-Will be fixed by bumping `nftnl`.
-"""
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
@@ -37,7 +37,7 @@ jnix = { version = "0.5.1", features = ["derive"] }
 nix = "0.23"
 inotify = "0.10"
 resolv-conf = "0.7"
-nftnl = { version = "0.6.2", features = ["nftnl-1-1-0"] }
+nftnl = { version = "0.7.0", features = ["nftnl-1-1-0"] }
 mnl = { version = "0.2.2", features = ["mnl-1-0-4"] }
 which = { version = "4.0", default-features = false }
 talpid-dbus = { path = "../talpid-dbus" }
@@ -62,7 +62,7 @@ serde_json = { workspace = true }
 talpid-net = { path = "../talpid-net" }
 
 [target.'cfg(windows)'.dependencies]
-bitflags = "1.2"
+bitflags = "2.6"
 widestring = "1.0"
 winreg = { version = "0.51", features = ["transactions"] }
 memoffset = "0.6"

diff --git a/talpid-core/src/split_tunnel/windows/driver.rs b/talpid-core/src/split_tunnel/windows/driver.rs
@@ -155,6 +155,7 @@ pub enum EventBody {
 }
 
 bitflags! {
+    #[derive(Debug)]
     pub struct SplittingChangeReason: u32 {
         const BY_INHERITANCE = 1;
         const BY_CONFIG = 2;