From d7574e66cfc6aba9b03cc5b5516bf465429a40ae Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Sun, 5 May 2024 10:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8Dnightly?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

issues: https://github.com/KKRainbow/EasyTier/issues/74
---
 Cargo.lock                       | 17 ++++++++---------
 easytier/Cargo.toml              |  2 +-
 easytier/src/tunnel/wireguard.rs | 19 ++++++++-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c21b9daf..519eb6dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -387,8 +387,7 @@ dependencies = [
 [[package]]
 name = "boringtun"
 version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "751787b019c674b9ac353f4eaa285e6711c21badb421cd8c199bf2c83b727f29"
+source = "git+https://github.com/cloudflare/boringtun.git#f672bb6c1e1e371240a8d151f15854687eb740bb"
 dependencies = [
  "aead",
  "base64 0.13.1",
@@ -402,7 +401,7 @@ dependencies = [
  "nix 0.25.1",
  "parking_lot",
  "rand_core 0.6.4",
- "ring 0.16.20",
+ "ring 0.17.8",
  "tracing",
  "untrusted 0.9.0",
  "x25519-dalek",
@@ -978,9 +977,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-rc.3"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1449,9 +1448,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.1.20"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e"
 
 [[package]]
 name = "field-offset"
@@ -6399,9 +6398,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0-rc.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7fae07da688e17059d5886712c933bb0520f15eff2e09cfa18e30968f4e63a"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
  "rand_core 0.6.4",
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index 88fc478f..c59a0f4f 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -125,7 +125,7 @@ network-interface = "1.1.1"
 pathfinding = "4.9.1"
 
 # for encryption
-boringtun = { version = "0.6.0", optional = true }
+boringtun = { git = "https://github.com/cloudflare/boringtun.git", optional = true }
 ring = { version = "0.16", optional = true }
 bitflags = "2.5"
 aes-gcm = { version = "0.10.3", optional = true }
diff --git a/easytier/src/tunnel/wireguard.rs b/easytier/src/tunnel/wireguard.rs
index c4dd2fce..de1f561a 100644
--- a/easytier/src/tunnel/wireguard.rs
+++ b/easytier/src/tunnel/wireguard.rs
@@ -392,17 +392,14 @@ impl WgPeer {
         let data = WgPeerData {
             udp: self.udp.clone(),
             endpoint: self.endpoint,
-            tunn: Arc::new(Mutex::new(
-                Tunn::new(
-                    self.config.my_secret_key.clone(),
-                    self.config.peer_public_key.clone(),
-                    None,
-                    None,
-                    rand::thread_rng().next_u32(),
-                    None,
-                )
-                .unwrap(),
-            )),
+            tunn: Arc::new(Mutex::new(Tunn::new(
+                self.config.my_secret_key.clone(),
+                self.config.peer_public_key.clone(),
+                None,
+                None,
+                rand::thread_rng().next_u32(),
+                None,
+            ))),
             wg_type: self.config.wg_type.clone(),
             stopped: Arc::new(AtomicBool::new(false)),
         };