Check deprecated ciphers (#2651)

shadowsocks · Jan 5, 2021 · 5352fae · 5352fae
1 parent e51f177
commit 5352fae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -38,6 +38,7 @@ cargo {
     profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor
     extraCargoBuildArguments = listOf("--bin", libname!!)
     featureSpec.noDefaultBut(arrayOf(
+            "stream-cipher",
             "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
@@ -53,6 +53,13 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
                 throw UnknownHostException().initCause(e)
             }?.hostAddress ?: throw UnknownHostException()
         }
+        // check the crypto
+        if (profile.method == "xchacha20-ietf-poly1305") {
+            throw IllegalArgumentException("cipher xchacha20-ietf-poly1305 is deprecated.")
+        }
+        if (profile.method == "aes-192-gcm") {
+            throw IllegalArgumentException("cipher aes-192-gcm is deprecated.")
+        }
     }
 
     /**

diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
@@ -4,11 +4,14 @@
         <item>NONE</item>
         <item>RC4-MD5</item>
         <item>AES-128-CFB</item>
+        <item>AES-192-CFB</item>
         <item>AES-256-CFB</item>
         <item>AES-128-CTR</item>
+        <item>AES-192-CTR</item>
         <item>AES-256-CTR</item>
         <item>BF-CFB</item>
         <item>CAMELLIA-128-CFB</item>
+        <item>CAMELLIA-192-CFB</item>
         <item>CAMELLIA-256-CFB</item>
         <item>SALSA20</item>
         <item>CHACHA20</item>
@@ -22,11 +25,14 @@
         <item>none</item>
         <item>rc4-md5</item>
         <item>aes-128-cfb</item>
+        <item>aes-192-cfb</item>
         <item>aes-256-cfb</item>
         <item>aes-128-ctr</item>
+        <item>aes-192-ctr</item>
         <item>aes-256-ctr</item>
         <item>bf-cfb</item>
         <item>camellia-128-cfb</item>
+        <item>camellia-192-cfb</item>
         <item>camellia-256-cfb</item>
         <item>salsa20</item>
         <item>chacha20</item>

diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust
+3 −3		.github/workflows/build-and-test.yml
+16 −16		Cargo.lock
+6 −5		Cargo.toml
+8 −0		bin/common/validator/mod.rs
+4 −4		bin/sslocal.rs
+1 −1		bin/ssmanager.rs
+1 −1		bin/ssserver.rs
+6 −0		crates/shadowsocks-service/Cargo.toml
+3 −1		crates/shadowsocks-service/src/config.rs
+0 −1		crates/shadowsocks-service/src/local/dns/client_cache.rs
+52 −0		crates/shadowsocks-service/src/local/dns/config.rs
+2 −1		crates/shadowsocks-service/src/local/dns/mod.rs
+48 −33		crates/shadowsocks-service/src/local/dns/server.rs
+39 −38		crates/shadowsocks-service/src/local/mod.rs
+1 −0		crates/shadowsocks-service/src/server/mod.rs
+8 −2		crates/shadowsocks/Cargo.toml
+11 −4		crates/shadowsocks/src/relay/tcprelay/crypto_io.rs
+1 −0		crates/shadowsocks/src/relay/tcprelay/mod.rs
+6 −2		crates/shadowsocks/src/relay/tcprelay/utils.rs
+5 −0		crates/shadowsocks/src/relay/udprelay/crypto_io.rs
+1 −0		crates/shadowsocks/tests/tcp.rs
+1 −0		crates/shadowsocks/tests/udp.rs
+1 −0		tests/socks5.rs