From 6d0c6c2471905a849d16746232445970ebc0f663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E6=B1=9D=E6=A3=8B=E8=8C=97?= <505554090@qq.com> Date: Thu, 21 Aug 2025 13:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9A3.1.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TouchSocketVersion.props | 2 +- src/TouchSocket.Core/Extensions/SystemExtension.cs | 4 +--- src/TouchSocket/Common/Options/ClientSslOption.cs | 9 +-------- src/TouchSocket/Common/Options/SslOption.cs | 2 +- .../Extensions/TouchSocketConfigExtension.cs | 12 ++---------- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/TouchSocketVersion.props b/TouchSocketVersion.props index 44a75920c..7627e4193 100644 --- a/TouchSocketVersion.props +++ b/TouchSocketVersion.props @@ -1,7 +1,7 @@  - 3.1.15 + 3.1.16 $(BaseVersion) diff --git a/src/TouchSocket.Core/Extensions/SystemExtension.cs b/src/TouchSocket.Core/Extensions/SystemExtension.cs index 8707a3829..c99105719 100644 --- a/src/TouchSocket.Core/Extensions/SystemExtension.cs +++ b/src/TouchSocket.Core/Extensions/SystemExtension.cs @@ -930,9 +930,7 @@ public static class SystemExtension public static async Task WriteAsync(this Stream stream, ReadOnlyMemory memory, CancellationToken token) { var segment = memory.GetArray(); - - await stream.WriteAsync(segment.Array, segment.Offset, segment.Count, token) - .ConfigureAwait(EasyTask.ContinueOnCapturedContext); + await stream.WriteAsync(segment.Array, segment.Offset, segment.Count, token).ConfigureAwait(EasyTask.ContinueOnCapturedContext); } /// diff --git a/src/TouchSocket/Common/Options/ClientSslOption.cs b/src/TouchSocket/Common/Options/ClientSslOption.cs index 48831ff29..232131057 100644 --- a/src/TouchSocket/Common/Options/ClientSslOption.cs +++ b/src/TouchSocket/Common/Options/ClientSslOption.cs @@ -24,14 +24,7 @@ public class ClientSslOption : SslOption /// public ClientSslOption() { - // 初始化一个X509证书存储,用于读取和验证根证书 - var store = new X509Store(StoreName.Root); - // 打开证书存储,允许读写操作 - store.Open(OpenFlags.ReadWrite); - // 将证书存储中的所有证书赋值给客户端证书属性 - this.ClientCertificates = store.Certificates; - // 关闭证书存储 - store.Close(); + this.ClientCertificates = new X509Certificate2Collection(); } /// diff --git a/src/TouchSocket/Common/Options/SslOption.cs b/src/TouchSocket/Common/Options/SslOption.cs index 24e106f62..03bf2f5a2 100644 --- a/src/TouchSocket/Common/Options/SslOption.cs +++ b/src/TouchSocket/Common/Options/SslOption.cs @@ -46,7 +46,7 @@ public abstract class SslOption /// /// 协议版本 /// - public SslProtocols SslProtocols { get; set; } + public SslProtocols SslProtocols { get; set; } = SslProtocols.None; /// /// 该值指定身份验证期间是否检查证书吊销列表 diff --git a/src/TouchSocket/Extensions/TouchSocketConfigExtension.cs b/src/TouchSocket/Extensions/TouchSocketConfigExtension.cs index 100867e09..20546fbdc 100644 --- a/src/TouchSocket/Extensions/TouchSocketConfigExtension.cs +++ b/src/TouchSocket/Extensions/TouchSocketConfigExtension.cs @@ -264,16 +264,8 @@ public static class TouchSocketConfigExtension { config.SetClientSslOption(new ClientSslOption() { - TargetHost = value.Authority, -#if NET45 || NETSTANDARD2_0 - SslProtocols = SslProtocols.Ssl2 | SslProtocols.Ssl3 | SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 -#elif NET481_OR_GREATER - SslProtocols = SslProtocols.Ssl2 | SslProtocols.Ssl3 | SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13 -#elif NET6_0 - SslProtocols = SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | SslProtocols.Tls13 -#elif NET7_0_OR_GREATER - SslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13 -#endif + TargetHost = value.Host, + SslProtocols= SslProtocols.None }); } return config;