From 14df3d30752997d2b090d417d39ab09f28c48564 Mon Sep 17 00:00:00 2001 From: "Sijie.Sun" Date: Tue, 7 May 2024 23:14:29 +0800 Subject: [PATCH] mips support wireguard (#87) --- .github/workflows/rust.yml | 4 ++-- Cargo.lock | 5 +++-- easytier/Cargo.toml | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 696882b..21ee9a0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -147,8 +147,8 @@ jobs: cp libgcc_eh.a libunwind.a # for mimalloc - ar x libgcc.a _ctzsi2.o _clz.o - ar rcs libctz.a _ctzsi2.o _clz.o + ar x libgcc.a _ctzsi2.o _clz.o _bswapsi2.o + ar rcs libctz.a _ctzsi2.o _clz.o _bswapsi2.o rustup toolchain install nightly-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu diff --git a/Cargo.lock b/Cargo.lock index 519eb6d..3dc6e30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,9 +387,10 @@ dependencies = [ [[package]] name = "boringtun" version = "0.6.0" -source = "git+https://github.com/cloudflare/boringtun.git#f672bb6c1e1e371240a8d151f15854687eb740bb" +source = "git+https://github.com/KKRainbow/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a" dependencies = [ "aead", + "atomic-shim", "base64 0.13.1", "blake2", "chacha20poly1305", @@ -1309,7 +1310,7 @@ dependencies = [ "rand 0.8.5", "rcgen", "reqwest", - "ring 0.16.20", + "ring 0.17.8", "rstest", "rustls", "serde", diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index c59a0f4..7382266 100644 --- a/easytier/Cargo.toml +++ b/easytier/Cargo.toml @@ -125,8 +125,8 @@ network-interface = "1.1.1" pathfinding = "4.9.1" # for encryption -boringtun = { git = "https://github.com/cloudflare/boringtun.git", optional = true } -ring = { version = "0.16", optional = true } +boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true } +ring = { version = "0.17", optional = true } bitflags = "2.5" aes-gcm = { version = "0.10.3", optional = true } @@ -168,7 +168,7 @@ defguard_wireguard_rs = "0.4.2" [features] default = ["wireguard", "quic", "mimalloc"] -mips = ["aes-gcm", "mimalloc"] +mips = ["aes-gcm", "mimalloc", "wireguard"] wireguard = ["dep:boringtun", "dep:ring"] quic = ["dep:quinn", "dep:rustls", "dep:rcgen"] mimalloc = ["dep:mimalloc-rust"]