Skip to content

Commit a826adc

Browse files
authored
Merge pull request #4445 from dotnet/publish-32117
Merge master into live
2 parents abe4237 + 0eb7e5e commit a826adc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

samples/snippets/csharp/VS_Snippets_Remoting/NclSslClientAsync/CS/clientasync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public static int Main(string[] args)
215215
sslStream.BeginAuthenticateAsClient(
216216
serverName,
217217
clientCertificates,
218-
SslProtocols.Ssl3,
218+
SslProtocols.None,
219219
true,
220220
new AsyncCallback(AuthenticateCallback),
221221
sslStream);

samples/snippets/csharp/VS_Snippets_Remoting/NclSslServerAsync/CS/serverasync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void ProcessClient (ClientState state, X509Certificate serverCertificate)
192192
try
193193
{
194194
state.stream.BeginAuthenticateAsServer (serverCertificate,
195-
true, SslProtocols.Tls, true,
195+
true, SslProtocols.None, true,
196196
new AsyncCallback(AuthenticateCallback),
197197
state);
198198
}

samples/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Namespace Examples.Ssl
189189
' The server name must match the name on the server certificate.
190190
sslStream.BeginAuthenticateAsClient(
191191
serverName, clientCertificates,
192-
SslProtocols.Ssl3, True,
192+
SslProtocols.None, True,
193193
New AsyncCallback(AddressOf AuthenticateCallback), sslStream)
194194

195195
' User can press a key to exit application, or let the

xml/System.Security.Authentication/SslProtocols.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</ReturnValue>
253253
<MemberValue>192</MemberValue>
254254
<Docs>
255-
<summary>Specifies the TLS 1.0 security protocol. The TLS protocol is defined in IETF RFC 2246.</summary>
255+
<summary>Specifies the TLS 1.0 security protocol. TLS 1.0 is provided for backward compatibility only. The TLS protocol is defined in IETF RFC 2246.</summary>
256256
</Docs>
257257
</Member>
258258
<Member MemberName="Tls11">

0 commit comments

Comments
 (0)