Fix #2642

shadowsocks · Dec 31, 2020 · 3a89c52 · 3a89c52
1 parent 4573306
commit 3a89c52
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
@@ -16,7 +16,6 @@
         <item>AES-128-GCM</item>
         <item>AES-256-GCM</item>
         <item>CHACHA20-IETF-POLY1305</item>
-        <item>XCHACHA20-IETF-POLY1305</item>
     </string-array>
 
     <string-array name="enc_method_value" translatable="false">
@@ -35,7 +34,6 @@
         <item>aes-128-gcm</item>
         <item>aes-256-gcm</item>
         <item>chacha20-ietf-poly1305</item>
-        <item>xchacha20-ietf-poly1305</item>
     </string-array>
 
     <string-array name="bypass_private_route" translatable="false">

diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust
+3 −6		.github/workflows/build-and-test.yml
+24 −0		Cargo.lock
+1 −1		crates/shadowsocks-service/Cargo.toml
+2 −25		crates/shadowsocks-service/src/config.rs
+1 −2		rust-toolchain