Commit 181ef532 authored by Max Lv's avatar Max Lv

Update shadowsocks-rust and add back some ciphers

Fix #2705 and #2663.
parent 44dc47fe
...@@ -40,6 +40,7 @@ cargo { ...@@ -40,6 +40,7 @@ cargo {
extraCargoBuildArguments = listOf("--bin", libname!!) extraCargoBuildArguments = listOf("--bin", libname!!)
featureSpec.noDefaultBut(arrayOf( featureSpec.noDefaultBut(arrayOf(
"stream-cipher", "stream-cipher",
"aead-cipher-extra",
"logging", "logging",
"local-flow-stat", "local-flow-stat",
"local-dns")) "local-dns"))
......
...@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro ...@@ -56,7 +56,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
} }
// check the crypto // check the crypto
val deprecatedCiphers val deprecatedCiphers
= arrayOf("xchacha20-ietf-poly1305", "aes-192-gcm", "chacha20", "salsa20") = arrayOf("aes-192-gcm", "chacha20", "salsa20")
for (c in deprecatedCiphers) for (c in deprecatedCiphers)
{ {
if (profile.method == c) { if (profile.method == c) {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<item>AES-128-GCM</item> <item>AES-128-GCM</item>
<item>AES-256-GCM</item> <item>AES-256-GCM</item>
<item>CHACHA20-IETF-POLY1305</item> <item>CHACHA20-IETF-POLY1305</item>
<item>XCHACHA20-IETF-POLY1305</item>
</string-array> </string-array>
<string-array name="enc_method_value" translatable="false"> <string-array name="enc_method_value" translatable="false">
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
<item>aes-128-gcm</item> <item>aes-128-gcm</item>
<item>aes-256-gcm</item> <item>aes-256-gcm</item>
<item>chacha20-ietf-poly1305</item> <item>chacha20-ietf-poly1305</item>
<item>xchacha20-ietf-poly1305</item>
</string-array> </string-array>
<string-array name="bypass_private_route" translatable="false"> <string-array name="bypass_private_route" translatable="false">
......
Subproject commit f805b5d3503e5ca0f85c22dabdeac3341618ec86 Subproject commit 9977eb724e6d257e6a570b788d91d70b432a49e0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment