From 206b4409661db67d3731f3b40fd5b38c529d909b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 28 Jan 2022 20:58:28 +0800
Subject: [PATCH] add vmess Securitys
---
.../v2rayN/Forms/AddServer3Form.Designer.cs | 7 --
v2rayN/v2rayN/Forms/AddServer3Form.cs | 1 +
v2rayN/v2rayN/Forms/AddServer3Form.resx | 18 ----
v2rayN/v2rayN/Forms/AddServerForm.Designer.cs | 6 --
v2rayN/v2rayN/Forms/AddServerForm.cs | 1 +
v2rayN/v2rayN/Forms/AddServerForm.resx | 15 ----
.../v2rayN/Forms/AddServerForm.zh-Hans.resx | 86 +------------------
v2rayN/v2rayN/Global.cs | 3 +-
8 files changed, 5 insertions(+), 132 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs
index f8e5a6cb..b3cf7d3e 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs
@@ -83,13 +83,6 @@
//
this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSecurity.FormattingEnabled = true;
- this.cmbSecurity.Items.AddRange(new object[] {
- resources.GetString("cmbSecurity.Items"),
- resources.GetString("cmbSecurity.Items1"),
- resources.GetString("cmbSecurity.Items2"),
- resources.GetString("cmbSecurity.Items3"),
- resources.GetString("cmbSecurity.Items4"),
- resources.GetString("cmbSecurity.Items5")});
resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
this.cmbSecurity.Name = "cmbSecurity";
//
diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.cs b/v2rayN/v2rayN/Forms/AddServer3Form.cs
index 6eda1582..bd076170 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.cs
@@ -15,6 +15,7 @@ namespace v2rayN.Forms
private void AddServer3Form_Load(object sender, EventArgs e)
{
+ cmbSecurity.Items.AddRange(Global.ssSecuritys.ToArray());
if (EditIndex >= 0)
{
vmessItem = config.vmess[EditIndex];
diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.resx b/v2rayN/v2rayN/Forms/AddServer3Form.resx
index 0f5bdcb4..ce2ee4e9 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.resx
@@ -174,24 +174,6 @@
0
-
- aes-256-gcm
-
-
- aes-128-gcm
-
-
- chacha20-poly1305
-
-
- chacha20-ietf-poly1305
-
-
- none
-
-
- plain
-
127, 123
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
index 2abd7e1a..f9ca539f 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -109,12 +109,6 @@
//
this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSecurity.FormattingEnabled = true;
- this.cmbSecurity.Items.AddRange(new object[] {
- resources.GetString("cmbSecurity.Items"),
- resources.GetString("cmbSecurity.Items1"),
- resources.GetString("cmbSecurity.Items2"),
- resources.GetString("cmbSecurity.Items3"),
- resources.GetString("cmbSecurity.Items4")});
resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
this.cmbSecurity.Name = "cmbSecurity";
//
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs
index 2c231ac8..4f643eca 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -15,6 +15,7 @@ namespace v2rayN.Forms
private void AddServerForm_Load(object sender, EventArgs e)
{
+ cmbSecurity.Items.AddRange(Global.vmessSecuritys.ToArray());
if (EditIndex >= 0)
{
vmessItem = config.vmess[EditIndex];
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx
index c8d1d996..826ea809 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -221,21 +221,6 @@
2
-
- aes-128-gcm
-
-
- chacha20-poly1305
-
-
- auto
-
-
- none
-
-
- zero
-
195, 114
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
index 5c854d9e..018a8578 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -127,87 +127,6 @@
*手填,方便识别管理
-
- 149, 12
-
-
- 95, 12
-
-
- 167, 12
-
-
- 180, 7
-
-
- 350, 36
-
-
- 143, 12
-
-
- 149, 12
-
-
- 127, 168
-
-
- 127, 32
-
-
- 211, 20
-
-
- 9, 36
-
-
- 107, 12
-
-
- 9, 168
-
-
- 65, 12
-
-
- 161, 12
-
-
- 9, 237
-
-
- 107, 12
-
-
- 127, 237
-
-
- 282, 71
-
-
- 197, 12
-
-
- 127, 102
-
-
- 334, 51
-
-
- 9, 71
-
-
- 89, 12
-
-
- 9, 102
-
-
- 89, 12
-
-
- 127, 67
-
113, 12
@@ -215,7 +134,7 @@
*随便选,建议(auto)
- 127, 143
+ 127, 114
211, 20
@@ -232,9 +151,6 @@
加密方式(security)
-
- 95, 12
-
65, 12
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index de142806..10c892e4 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -196,7 +196,8 @@ namespace v2rayN
public const string RoutingRuleComma = "";
- public static readonly IEnumerable ssSecuritys = new HashSet { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+ public static readonly List vmessSecuritys = new List { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+ public static readonly List ssSecuritys = new List { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
public const string GrpcgunMode = "gun";
public const string GrpcmultiMode = "multi";