diff --git a/Netch/Servers/Shadowsocks/ShadowsocksServer.cs b/Netch/Servers/Shadowsocks/ShadowsocksServer.cs index 17d72e70..3f1a52eb 100644 --- a/Netch/Servers/Shadowsocks/ShadowsocksServer.cs +++ b/Netch/Servers/Shadowsocks/ShadowsocksServer.cs @@ -43,44 +43,50 @@ public static class SSGlobal /// public static readonly List EncryptMethods = new() { - 'none', - '2022-blake3-aes-128-gcm', - '2022-blake3-aes-256-gcm', - '2022-blake3-chacha20-poly1305', - 'aes-128-gcm', - 'aes-192-gcm', - 'aes-256-gcm', - 'chacha20-ietf-poly1305', - 'xchacha20-ietf-poly1305', - 'rc4', - 'rc4-md5', - 'aes-128-ctr', - 'aes-192-ctr', - 'aes-256-ctr', - 'aes-128-cfb', - 'aes-192-cfb', - 'aes-256-cfb', - 'aes-128-cfb8', - 'aes-192-cfb8', - 'aes-256-cfb8', - 'aes-128-ofb', - 'aes-192-ofb', - 'aes-256-ofb', - 'bf-cfb', - 'cast5-cfb', - 'des-cfb', - 'idea-cfb', - 'rc2-cfb', - 'seed-cfb', - 'camellia-128-cfb', - 'camellia-192-cfb', - 'camellia-256-cfb', - 'camellia-128-cfb8', - 'camellia-192-cfb8', - 'camellia-256-cfb8', - 'salsa20', - 'chacha20', - 'chacha20-ietf', - 'xchacha20' + "none", + + // 2022 edition cipher + "2022-blake3-aes-128-gcm", + "2022-blake3-aes-256-gcm", + "2022-blake3-chacha20-poly1305", + + // AEAD cipher + "aes-128-gcm", + "aes-192-gcm", + "aes-256-gcm", + "chacha20-ietf-poly1305", + "xchacha20-ietf-poly1305", + + // stream cipher + "rc4", + "rc4-md5", + "aes-128-ctr", + "aes-192-ctr", + "aes-256-ctr", + "aes-128-cfb", + "aes-192-cfb", + "aes-256-cfb", + "aes-128-cfb8", + "aes-192-cfb8", + "aes-256-cfb8", + "aes-128-ofb", + "aes-192-ofb", + "aes-256-ofb", + "bf-cfb", + "cast5-cfb", + "des-cfb", + "idea-cfb", + "rc2-cfb", + "seed-cfb", + "camellia-128-cfb", + "camellia-192-cfb", + "camellia-256-cfb", + "camellia-128-cfb8", + "camellia-192-cfb8", + "camellia-256-cfb8", + "salsa20", + "chacha20", + "chacha20-ietf", + "xchacha20" }; } \ No newline at end of file diff --git a/Netch/Servers/V2ray/V2rayConfigUtils.cs b/Netch/Servers/V2ray/V2rayConfigUtils.cs index ac7db5f5..20fd1772 100644 --- a/Netch/Servers/V2ray/V2rayConfigUtils.cs +++ b/Netch/Servers/V2ray/V2rayConfigUtils.cs @@ -154,7 +154,7 @@ public static class V2rayConfigUtils }, plugin = ss.Plugin ?? "", pluginOpts = ss.PluginOption ?? "" - } + }; break; case ShadowsocksRServer ssr: outbound.protocol = "shadowsocks"; @@ -178,10 +178,10 @@ public static class V2rayConfigUtils "--protocol=" + ssr.Protocol, "--protocol-param=" + ssr.ProtocolParam ?? "" } - } + }; break; case TrojanServer trojan: - outbound.protocol = "trojan_sing"; + outbound.protocol = "trojan"; outbound.settings.servers = new[] { new ShadowsocksServerItem // I'm not serious @@ -191,7 +191,7 @@ public static class V2rayConfigUtils method = "", password = trojan.Password } - } + }; break; } diff --git a/README.md b/README.md index 48cb6c4c..a8be2dd2 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Some features may not be implemented in version 1 - [`WireGuard`](https://www.wireguard.com) - [`Trojan`](https://trojan-gfw.github.io/trojan) - [`VMess`](https://www.v2fly.org) -- [`VLess`](https://xtls.github.io) +- [`VLESS`](https://xtls.github.io) ### Others - UDP NAT FullCone (Limited by your server)