Merge 98ee790771 into 9c74b51d74

up 7.17.0
Add Cert SHA-256 pinning support
2026-01-15 10:29:33 +00:00 · 2026-01-09 16:01:28 +05:00 · 2026-01-09 18:44:28 +08:00 · 2026-01-09 16:56:48 +08:00
3 changed files with 4 additions and 4 deletions
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>

    <PropertyGroup>
-        <Version>7.16.9</Version>
+        <Version>7.17.0</Version>
    </PropertyGroup>

    <PropertyGroup>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@ -1609,7 +1609,7 @@
    <value>固定证书（二选一填写即可）
 当指定此证书后，将固定该证书，并禁用“跳过证书验证”选项。

-“获取证书”操作可能失败，原因可能是使用了自签证书，或系统中存在不受信任或恶意的 CA。</value>
+“获取证书”操作可能失败，原因包括使用了自签名证书，或系统中存在不受信任甚至恶意的 CA。</value>
  </data>
  <data name="TbFetchCert" xml:space="preserve">
    <value>获取证书</value>
@ -1648,6 +1648,6 @@
    <value>完整证书（链），PEM 格式</value>
  </data>
  <data name="TbCertSha256Tips" xml:space="preserve">
-    <value>证书指纹（Sha256）</value>
+    <value>证书指纹（SHA-256）</value>
  </data>
 </root>
--- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
@ -150,7 +150,7 @@ public class AddServerViewModel : MyReactiveObject
            }
            shaList.Add(sha);
        }
-        CertSha = string.Join('|', shaList);
+        CertSha = string.Join('~', shaList);
    }

    private async Task FetchCert()
Author	SHA1	Message	Date
DHR60	aee4479b8a	Merge `98ee790771` into `9c74b51d74`	2026-01-09 16:01:28 +05:00
2dust	9c74b51d74	up 7.17.0 Some checks are pending release Linux / build (Release) (push) Waiting to run Details release Linux / rpm (push) Blocked by required conditions Details release macOS / build (Release) (push) Waiting to run Details release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run Details release Windows / build (Release) (push) Waiting to run Details	2026-01-09 18:44:28 +08:00
DHR60	98ee790771	Add Cert SHA-256 pinning support	2026-01-09 16:56:48 +08:00