Renamed ClientSslAuthConfiguration class to ClientSslConfiguration class
This commit is contained in:
parent
e3e8fafaa6
commit
c1d20ec706
@ -1,6 +1,6 @@
|
|||||||
#region License
|
#region License
|
||||||
/*
|
/*
|
||||||
* ClientSslAuthConfiguration.cs
|
* ClientSslConfiguration.cs
|
||||||
*
|
*
|
||||||
* The MIT License
|
* The MIT License
|
||||||
*
|
*
|
||||||
@ -43,7 +43,7 @@ namespace WebSocketSharp.Net
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Stores the parameters used to configure a <see cref="SslStream"/> instance as a client.
|
/// Stores the parameters used to configure a <see cref="SslStream"/> instance as a client.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ClientSslAuthConfiguration
|
public class ClientSslConfiguration
|
||||||
{
|
{
|
||||||
#region Private Fields
|
#region Private Fields
|
||||||
|
|
||||||
@ -59,20 +59,20 @@ namespace WebSocketSharp.Net
|
|||||||
#region Public Constructors
|
#region Public Constructors
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ClientSslAuthConfiguration"/> class with
|
/// Initializes a new instance of the <see cref="ClientSslConfiguration"/> class with
|
||||||
/// the specified <paramref name="targetHost"/>.
|
/// the specified <paramref name="targetHost"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="targetHost">
|
/// <param name="targetHost">
|
||||||
/// A <see cref="string"/> that represents the name of the server that shares
|
/// A <see cref="string"/> that represents the name of the server that shares
|
||||||
/// a secure connection.
|
/// a secure connection.
|
||||||
/// </param>
|
/// </param>
|
||||||
public ClientSslAuthConfiguration (string targetHost)
|
public ClientSslConfiguration (string targetHost)
|
||||||
: this (targetHost, null, SslProtocols.Default, false)
|
: this (targetHost, null, SslProtocols.Default, false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ClientSslAuthConfiguration"/> class with
|
/// Initializes a new instance of the <see cref="ClientSslConfiguration"/> class with
|
||||||
/// the specified <paramref name="targetHost"/>, <paramref name="clientCertificates"/>,
|
/// the specified <paramref name="targetHost"/>, <paramref name="clientCertificates"/>,
|
||||||
/// <paramref name="enabledSslProtocols"/>, and <paramref name="checkCertificateRevocation"/>.
|
/// <paramref name="enabledSslProtocols"/>, and <paramref name="checkCertificateRevocation"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -91,7 +91,7 @@ namespace WebSocketSharp.Net
|
|||||||
/// <c>true</c> if the certificate revocation list is checked during authentication;
|
/// <c>true</c> if the certificate revocation list is checked during authentication;
|
||||||
/// otherwise, <c>false</c>.
|
/// otherwise, <c>false</c>.
|
||||||
/// </param>
|
/// </param>
|
||||||
public ClientSslAuthConfiguration (
|
public ClientSslConfiguration (
|
||||||
string targetHost,
|
string targetHost,
|
||||||
X509CertificateCollection clientCertificates,
|
X509CertificateCollection clientCertificates,
|
||||||
SslProtocols enabledSslProtocols,
|
SslProtocols enabledSslProtocols,
|
@ -97,8 +97,7 @@ namespace WebSocketSharp
|
|||||||
private volatile WebSocketState _readyState;
|
private volatile WebSocketState _readyState;
|
||||||
private AutoResetEvent _receivePong;
|
private AutoResetEvent _receivePong;
|
||||||
private bool _secure;
|
private bool _secure;
|
||||||
private ClientSslAuthConfiguration
|
private ClientSslConfiguration _sslConfig;
|
||||||
_sslConfig;
|
|
||||||
private Stream _stream;
|
private Stream _stream;
|
||||||
private TcpClient _tcpClient;
|
private TcpClient _tcpClient;
|
||||||
private Uri _uri;
|
private Uri _uri;
|
||||||
@ -431,14 +430,14 @@ namespace WebSocketSharp
|
|||||||
/// optionally the client for secure connection.
|
/// optionally the client for secure connection.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>
|
/// <value>
|
||||||
/// A <see cref="ClientSslAuthConfiguration"/> that represents the configuration
|
/// A <see cref="ClientSslConfiguration"/> that represents the configuration used
|
||||||
/// used to authenticate the server and optionally the client for secure connection,
|
/// to authenticate the server and optionally the client for secure connection,
|
||||||
/// or <see langword="null"/> if the <see cref="WebSocket"/> is used as server.
|
/// or <see langword="null"/> if the <see cref="WebSocket"/> is used as server.
|
||||||
/// </value>
|
/// </value>
|
||||||
public ClientSslAuthConfiguration SslConfiguration {
|
public ClientSslConfiguration SslConfiguration {
|
||||||
get {
|
get {
|
||||||
return _client
|
return _client
|
||||||
? (_sslConfig ?? (_sslConfig = new ClientSslAuthConfiguration (_uri.DnsSafeHost)))
|
? (_sslConfig ?? (_sslConfig = new ClientSslConfiguration (_uri.DnsSafeHost)))
|
||||||
: null;
|
: null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
@ -67,7 +67,6 @@
|
|||||||
<Compile Include="CloseEventArgs.cs" />
|
<Compile Include="CloseEventArgs.cs" />
|
||||||
<Compile Include="ByteOrder.cs" />
|
<Compile Include="ByteOrder.cs" />
|
||||||
<Compile Include="ErrorEventArgs.cs" />
|
<Compile Include="ErrorEventArgs.cs" />
|
||||||
<Compile Include="Net\ClientSslAuthConfiguration.cs" />
|
|
||||||
<Compile Include="Net\ServerSslAuthConfiguration.cs" />
|
<Compile Include="Net\ServerSslAuthConfiguration.cs" />
|
||||||
<Compile Include="WebSocket.cs" />
|
<Compile Include="WebSocket.cs" />
|
||||||
<Compile Include="Server\WebSocketServer.cs" />
|
<Compile Include="Server\WebSocketServer.cs" />
|
||||||
@ -136,6 +135,7 @@
|
|||||||
<Compile Include="HttpResponse.cs" />
|
<Compile Include="HttpResponse.cs" />
|
||||||
<Compile Include="Server\WebSocketBehavior.cs" />
|
<Compile Include="Server\WebSocketBehavior.cs" />
|
||||||
<Compile Include="Net\HttpListenerPrefix.cs" />
|
<Compile Include="Net\HttpListenerPrefix.cs" />
|
||||||
|
<Compile Include="Net\ClientSslConfiguration.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
Loading…
Reference in New Issue
Block a user