8000 Merge master into live by cxwtool · Pull Request #4445 · dotnet/dotnet-api-docs · GitHub
[go: up one dir, main page]

Skip to content

Merge master into live #4445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static int Main(string[] args)
sslStream.BeginAuthenticateAsClient(
serverName,
clientCertificates,
SslProtocols.Ssl3,
SslProtocols.None,
true,
new AsyncCallback(AuthenticateCallback),
sslStream);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void ProcessClient (ClientState state, X509Certificate serverCertificate)
try
{
state.stream.BeginAuthenticateAsServer (serverCertificate,
true, SslProtocols.Tls, true,
true, SslProtocols.None, true,
new AsyncCallback(AuthenticateCallback),
state);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Namespace Examples.Ssl
' The server name must match the name on the server certificate.
sslStream.BeginAuthenticateAsClient(
serverName, clientCertificates,
SslProtocols.Ssl3, True,
SslProtocols.None, True,
New AsyncCallback(AddressOf AuthenticateCallback), sslStream)

' User can press a key to exit application, or let the
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Security.Authentication/SslProtocols.xml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
</ReturnValue>
<MemberValue>192</MemberValue>
<Docs>
<summary>Specifies the TLS 1.0 security protocol. The TLS protocol is defined in IETF RFC 2246.</summary>
<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>
</Docs>
</Member>
<Member MemberName="Tls11">
Expand Down
0