github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2077 from PragmaTwice/add-xchacha20-poly1305 

add xchacha20-poly1305 to shadowsocks ciphers for xray
pull/2097/head
2dust 2022-03-05 17:58:26 +08:00 committed by GitHub
parent 0b8d66a87e f05b5d7fff
commit 61bd48fd1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/v2rayN/Forms/AddServer3Form.cs
View File

@ -15,7 +15,7 @@ namespace v2rayN.Forms
private void AddServer3Form_Load(object sender, EventArgs e) private void AddServer3Form_Load(object sender, EventArgs e)
{ {
cmbSecurity.Items.AddRange(Global.ssSecuritys.ToArray()); cmbSecurity.Items.AddRange(config.GetShadowsocksSecuritys().ToArray());
if (EditIndex >= 0) if (EditIndex >= 0)
{ {
vmessItem = config.vmess[EditIndex]; vmessItem = config.vmess[EditIndex];

1
v2rayN/v2rayN/Global.cs
View File

@ -195,6 +195,7 @@ namespace v2rayN
public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" }; public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" }; public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
public static readonly List<string> ssSecuritysInXray = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain" };
public static readonly List<string> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443" }; public static readonly List<string> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443" };
public static readonly List<string> networks = new List<string> { "tcp", "kcp", "ws", "h2", "quic", "grpc" }; public static readonly List<string> networks = new List<string> { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
public static readonly List<string> kcpHeaderTypes = new List<string> { "srtp", "utp", "wechat-video", "dtls", "wireguard" }; public static readonly List<string> kcpHeaderTypes = new List<string> { "srtp", "utp", "wechat-video", "dtls", "wireguard" };

2
v2rayN/v2rayN/Handler/ConfigHandler.cs
View File

@ -540,7 +540,7 @@ namespace v2rayN.Handler
vmessItem.id = vmessItem.id.TrimEx(); vmessItem.id = vmessItem.id.TrimEx();
vmessItem.security = vmessItem.security.TrimEx(); vmessItem.security = vmessItem.security.TrimEx();
if (!Global.ssSecuritys.Contains(vmessItem.security)) if (!config.GetShadowsocksSecuritys().Contains(vmessItem.security))
{ {
return -1; return -1;
} }

2
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
View File

@ -401,7 +401,7 @@ namespace v2rayN.Handler
serversItem.address = config.address(); serversItem.address = config.address();
serversItem.port = config.port(); serversItem.port = config.port();
serversItem.password = config.id(); serversItem.password = config.id();
if (Global.ssSecuritys.Contains(config.security())) if (config.GetShadowsocksSecuritys().Contains(config.security()))
{ {
serversItem.method = config.security(); serversItem.method = config.security();
} }

10
v2rayN/v2rayN/Mode/Config.cs
View File

@ -411,6 +411,16 @@ namespace v2rayN.Mode
return vmess.FindIndex(it => it.indexId == indexId); return vmess.FindIndex(it => it.indexId == indexId);
} }
public List<string> GetShadowsocksSecuritys()
{
if (coreType == ECoreType.v2fly_core)
{
return Global.ssSecuritys;
}
return Global.ssSecuritysInXray;
}
#endregion #endregion
} }