Skip to content

reduce certificate allocations #121

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
Oct 24, 2016
Merged

reduce certificate allocations #121

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
27 changes: 8 additions & 19 deletions src/MySqlConnector/Serialization/ConnectionSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using MySql.Data.MySqlClient;

namespace MySql.Data.Serialization
Expand Down Expand Up @@ -34,19 +31,8 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)

// SSL/TLS Options
SslMode = csb.SslMode;
if (SslMode != MySqlSslMode.None)
{
try
{
Certificate = new X509Certificate2(csb.CertificateFile, csb.CertificatePassword);
}
catch (CryptographicException ex)
{
if (!File.Exists(csb.CertificateFile))
throw new MySqlException("Cannot find SSL Certificate File", ex);
throw new MySqlException("Either the SSL Certificate Password is incorrect or the SSL Certificate File is invalid", ex);
}
}
CertificateFile = csb.CertificateFile;
CertificatePassword = csb.CertificatePassword;

// Connection Pooling Options
Pooling = csb.Pooling;
Expand Down Expand Up @@ -83,7 +69,8 @@ private ConnectionSettings(ConnectionSettings other, bool? useCompression)

// SSL/TLS Options
SslMode = other.SslMode;
Certificate = other.Certificate;
CertificateFile = other.CertificateFile;
CertificatePassword = other.CertificatePassword;

// Connection Pooling Options
Pooling = other.Pooling;
Expand Down Expand Up @@ -114,7 +101,8 @@ private ConnectionSettings(ConnectionSettings other, bool? useCompression)

// SSL/TLS Options
internal readonly MySqlSslMode SslMode;
internal readonly X509Certificate2 Certificate;
internal readonly string CertificateFile;
internal readonly string CertificatePassword;

// Connection Pooling Options
internal readonly bool Pooling;
Expand All @@ -134,3 +122,4 @@ private ConnectionSettings(ConnectionSettings other, bool? useCompression)
}

}

15 changes: 14 additions & 1 deletion src/MySqlConnector/Serialization/MySqlSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Security.Authentication;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading;
Expand Down Expand Up @@ -299,6 +300,18 @@ private async Task<bool> OpenUnixSocketAsync(ConnectionSettings cs, IOBehavior i

private async Task InitSslAsync(ConnectionSettings cs, IOBehavior ioBehavior, CancellationToken cancellationToken)
{
X509Certificate2 certificate;
try
{
certificate = new X509Certificate2(cs.CertificateFile, cs.CertificatePassword);
}
catch (CryptographicException ex)
{
if (!File.Exists(cs.CertificateFile))
throw new MySqlException("Cannot find SSL Certificate File", ex);
throw new MySqlException("Either the SSL Certificate Password is incorrect or the SSL Certificate File is invalid", ex);
}

Func<object, string, X509CertificateCollection, X509Certificate, string[], X509Certificate> localCertificateCb =
(lcbSender, lcbTargetHost, lcbLocalCertificates, lcbRemoteCertificate, lcbAcceptableIssuers) => lcbLocalCertificates[0];

Expand All @@ -319,7 +332,7 @@ private async Task InitSslAsync(ConnectionSettings cs, IOBehavior ioBehavior, Ca
var sslStream = new SslStream(m_networkStream, false,
new RemoteCertificateValidationCallback(remoteCertificateCb),
new LocalCertificateSelectionCallback(localCertificateCb));
var clientCertificates = new X509CertificateCollection { cs.Certificate };
var clientCertificates = new X509CertificateCollection { certificate };

// SslProtocols.Tls1.2 throws an exception in Windows, see https://github.com/mysql-net/MySqlConnector/pull/101
var sslProtocols = SslProtocols.Tls | SslProtocols.Tls11;
Expand Down