Update shadowsocks-rust and add back some ciphers

madeye · madeye · commit 181ef5322c1a · 2021-04-18T16:19:02.000+08:00
Fix #2705 and #2663.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -40,6 +40,7 @@ cargo {
     extraCargoBuildArguments = listOf("--bin", libname!!)
     featureSpec.noDefaultBut(arrayOf(
             "stream-cipher",
+            "aead-cipher-extra",
             "logging",
             "local-flow-stat",
             "local-dns"))
diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
         }
         // check the crypto
         val deprecatedCiphers
-            = arrayOf("xchacha20-ietf-poly1305", "aes-192-gcm", "chacha20", "salsa20")
+            = arrayOf("aes-192-gcm", "chacha20", "salsa20")
         for (c in deprecatedCiphers)
         {
             if (profile.method == c) {
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
@@ -17,6 +17,7 @@
         <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">
@@ -36,6 +37,7 @@
         <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
@@ -1 +1 @@
-Subproject commit f805b5d3503e5ca0f85c22dabdeac3341618ec86
+Subproject commit 9977eb724e6d257e6a570b788d91d70b432a49e0

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro`
`56`	`56`	`}`
`57`	`57`	`// check the crypto`
`58`	`58`	`val deprecatedCiphers`
`59`		`- = arrayOf("xchacha20-ietf-poly1305", "aes-192-gcm", "chacha20", "salsa20")`
	`59`	`+ = arrayOf("aes-192-gcm", "chacha20", "salsa20")`
`60`	`60`	`for (c in deprecatedCiphers)`
`61`	`61`	`{`
`62`	`62`	`if (profile.method == c) {`