replace raw byte with x509 certificate to allow specify passwords

This commit is contained in:
Anton Yaroshenko
2019-11-17 19:42:23 +02:00
parent 851db2e808
commit a38623cb5a
6 changed files with 6 additions and 6 deletions
@@ -85,7 +85,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
{
foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
{
certificates.Add(new X509Certificate(certificate));
certificates.Add(certificate);
}
}
@@ -256,7 +256,7 @@ namespace MQTTnet.Client.Options
UseTls = true,
SslProtocol = _tlsParameters.SslProtocol,
AllowUntrustedCertificates = _tlsParameters.AllowUntrustedCertificates,
Certificates = _tlsParameters.Certificates?.Select(c => c.ToArray()).ToList(),
Certificates = _tlsParameters.Certificates?.ToList(),
CertificateValidationCallback = _tlsParameters.CertificateValidationCallback,
IgnoreCertificateChainErrors = _tlsParameters.IgnoreCertificateChainErrors,
IgnoreCertificateRevocationErrors = _tlsParameters.IgnoreCertificateRevocationErrors
@@ -18,7 +18,7 @@ namespace MQTTnet.Client.Options
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12;
public IEnumerable<IEnumerable<byte>> Certificates { get; set; }
public IEnumerable<X509Certificate> Certificates { get; set; }
public bool AllowUntrustedCertificates { get; set; }
@@ -16,7 +16,7 @@ namespace MQTTnet.Client.Options
public bool AllowUntrustedCertificates { get; set; }
public List<byte[]> Certificates { get; set; }
public List<X509Certificate> Certificates { get; set; }
public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12;
@@ -214,7 +214,7 @@ namespace MQTTnet.Implementations
foreach (var certificate in _options.TlsOptions.Certificates)
{
certificates.Add(new X509Certificate2(certificate));
certificates.Add(certificate);
}
return certificates;
@@ -84,7 +84,7 @@ namespace MQTTnet.Implementations
clientWebSocket.Options.ClientCertificates = new X509CertificateCollection();
foreach (var certificate in _options.TlsOptions.Certificates)
{
clientWebSocket.Options.ClientCertificates.Add(new X509Certificate(certificate));
clientWebSocket.Options.ClientCertificates.Add(certificate);
}
}