Skip to content

Update and fix Authenticate methods #108

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.

Sign up for GitHub

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 1 commit into from
Nov 12, 2019
Merged

Update and fix Authenticate methods #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 19 additions & 26 deletions source/nanoFramework.System.Net/Security/SslStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public SslStream(Socket socket)
/// The authentication process uses the specified SSL protocols.
/// </summary>
/// <param name="targetHost">The name of the server that will share this SslStream.</param>
/// <param name="sslProtocols">The protocols that may be supported.</param>
public void AuthenticateAsClient(string targetHost, params SslProtocols[] sslProtocols)
/// <param name="enabledSslProtocols">The <see cref="SslProtocols"/> value that represents the protocol used for authentication.</param>
public void AuthenticateAsClient(string targetHost, SslProtocols enabledSslProtocols)
{
Authenticate(false, targetHost, null, null, sslProtocols);
Authenticate(false, targetHost, null, null, enabledSslProtocols);
}

/// <summary>
Expand All @@ -70,10 +70,10 @@ public void AuthenticateAsClient(string targetHost, params SslProtocols[] sslPro
/// </summary>
/// <param name="targetHost">The name of the server that will share this SslStream.</param>
/// <param name="clientCertificate">The client certificate.</param>
/// <param name="sslProtocols">The protocols that may be supported.</param>
public void AuthenticateAsClient(string targetHost, X509Certificate clientCertificate, params SslProtocols[] sslProtocols)
/// <param name="enabledSslProtocols">The <see cref="SslProtocols"/> value that represents the protocol used for authentication.</param>
public void AuthenticateAsClient(string targetHost, X509Certificate clientCertificate, SslProtocols enabledSslProtocols)
{
Authenticate(false, targetHost, clientCertificate, null, sslProtocols);
Authenticate(false, targetHost, clientCertificate, null, enabledSslProtocols);
}

/// <summary>
Expand All @@ -83,59 +83,52 @@ public void AuthenticateAsClient(string targetHost, X509Certificate clientCertif
/// <param name="targetHost">The name of the server that will share this SslStream.</param>
/// <param name="clientCertificate">The client certificate.</param>
/// <param name="ca">Certificate Authority certificate to use for authentication with the server.</param>
/// <param name="sslProtocols">The protocols that may be supported.</param>
public void AuthenticateAsClient(string targetHost, X509Certificate clientCertificate, X509Certificate ca, params SslProtocols[] sslProtocols)
/// <param name="enabledSslProtocols">The <see cref="SslProtocols"/> value that represents the protocol used for authentication.</param>
public void AuthenticateAsClient(string targetHost, X509Certificate clientCertificate, X509Certificate ca, SslProtocols enabledSslProtocols)
{
Authenticate(false, targetHost, clientCertificate, ca, sslProtocols);
Authenticate(false, targetHost, clientCertificate, ca, enabledSslProtocols);
}

/// <summary>
/// Called by servers to authenticate the server and optionally the client in a client-server connection using the specified certificate,
/// verification requirements and security protocol.
/// </summary>
/// <param name="serverCertificate">The certificate used to authenticate the server.</param>
/// <param name="sslProtocols">The protocols that may be used for authentication.</param>
public void AuthenticateAsServer(X509Certificate serverCertificate, params SslProtocols[] sslProtocols)
/// <param name="enabledSslProtocols">The protocols that may be used for authentication.</param>
public void AuthenticateAsServer(X509Certificate serverCertificate, SslProtocols enabledSslProtocols)
{
Authenticate(true, "", null, serverCertificate, sslProtocols);
Authenticate(true, "", serverCertificate, null, enabledSslProtocols);
}

/// <summary>
/// Called by servers to authenticate the server and optionally the client in a client-server connection using the specified certificates, requirements and security protocol.
/// </summary>
/// <param name="serverCertificate">The X509Certificate used to authenticate the server.</param>
/// <param name="clientCertificateRequired">A <see cref="Boolean"/> value that specifies whether the client is asked for a certificate for authentication. Note that this is only a request, if no certificate is provided, the server still accepts the connection request.</param>
/// <param name="sslProtocols">The protocols that may be used for authentication.</param>
public void AuthenticateAsServer(X509Certificate serverCertificate, bool clientCertificateRequired, params SslProtocols[] sslProtocols)
/// <param name="enabledSslProtocols">The protocols that may be used for authentication.</param>
public void AuthenticateAsServer(X509Certificate serverCertificate, bool clientCertificateRequired, SslProtocols enabledSslProtocols)
{
SslVerification = SslVerification.VerifyClientOnce;
SslVerification = clientCertificateRequired ? SslVerification.VerifyClientOnce : SslVerification.NoVerification;

Authenticate(true, "", null, serverCertificate, sslProtocols);
Authenticate(true, "", serverCertificate, null, enabledSslProtocols);
}

internal void Authenticate(bool isServer, string targetHost, X509Certificate certificate, X509Certificate ca, params SslProtocols[] sslProtocols)
internal void Authenticate(bool isServer, string targetHost, X509Certificate certificate, X509Certificate ca, SslProtocols enabledSslProtocols)
{
SslProtocols vers = (SslProtocols)0;

if (-1 != _sslContext) throw new InvalidOperationException();

for (int i = sslProtocols.Length - 1; i >= 0; i--)
{
vers |= sslProtocols[i];
}

_isServer = isServer;

try
{
if (isServer)
{
_sslContext = SslNative.SecureServerInit((int)vers, (int)_sslVerification, certificate, ca);
_sslContext = SslNative.SecureServerInit((int)enabledSslProtocols, (int)_sslVerification, certificate, ca);
SslNative.SecureAccept(_sslContext, _socket);
}
else
{
_sslContext = SslNative.SecureClientInit((int)vers, (int)_sslVerification, certificate, ca);
_sslContext = SslNative.SecureClientInit((int)enabledSslProtocols, (int)_sslVerification, certificate, ca);
SslNative.SecureConnect(_sslContext, targetHost, _socket);
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.4.0-preview.{height}",
"version": "1.4.1-preview.{height}",
"assemblyVersion": {
"precision": "revision"
},
Expand Down