From be79042a237182fd6670d2b78da23e06966bf357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Thu, 30 May 2024 16:00:51 +0200
Subject: [PATCH] Bump defguard wg (#4625)

---
 Cargo.lock                  | 5 +++--
 Cargo.toml                  | 2 +-
 common/wireguard/Cargo.toml | 2 +-
 common/wireguard/src/lib.rs | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c9cd69d32..45061bfa35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1804,8 +1804,9 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "defguard_wireguard_rs"
-version = "0.3.0"
-source = "git+https://github.com/neacsu/wireguard-rs.git?rev=c2cd0c1119f699f4bc43f5e6ffd6fc242caa42ed#c2cd0c1119f699f4bc43f5e6ffd6fc242caa42ed"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba16f17698d4b389907310af018b0c3a80b025bba9c38d947cbc6dd70921743"
 dependencies = [
  "base64 0.21.7",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 75a8e1eaf0..27d3cc8b13 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -197,7 +197,7 @@ ctr = "0.9.1"
 cupid = "0.6.1"
 curve25519-dalek = "3.2"
 dashmap = "5.5.3"
-defguard_wireguard_rs = { git = "https://github.com/neacsu/wireguard-rs.git", rev = "c2cd0c1119f699f4bc43f5e6ffd6fc242caa42ed" }
+defguard_wireguard_rs = "0.4.2"
 doc-comment = "0.3"
 dotenvy = "0.15.6"
 ecdsa = "0.16"
diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml
index 639f45a873..0ef630aa23 100644
--- a/common/wireguard/Cargo.toml
+++ b/common/wireguard/Cargo.toml
@@ -12,7 +12,7 @@ license.workspace = true
 
 [dependencies]
 base64 = "0.21.3"
-defguard_wireguard_rs = { git = "https://github.com/neacsu/wireguard-rs.git", rev = "c2cd0c1119f699f4bc43f5e6ffd6fc242caa42ed" }
+defguard_wireguard_rs = { workspace = true }
 # The latest version on crates.io at the time of writing this (6.0.0) has a
 # version mismatch with x25519-dalek/curve25519-dalek that is resolved in the
 # latest commit. So pick that for now.
diff --git a/common/wireguard/src/lib.rs b/common/wireguard/src/lib.rs
index 297ddfd15a..2eb3d2760c 100644
--- a/common/wireguard/src/lib.rs
+++ b/common/wireguard/src/lib.rs
@@ -34,7 +34,7 @@ pub async fn start_wireguard(
 ) -> Result<WgApiWrapper, Box<dyn std::error::Error + Send + Sync + 'static>> {
     use base64::{prelude::BASE64_STANDARD, Engine};
     use defguard_wireguard_rs::{
-        host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, WGApi, WireguardInterfaceApi,
+        host::Peer, key::Key, net::IpAddrMask, InterfaceConfiguration, WireguardInterfaceApi,
     };
 
     let mut peers = vec![];