From 5db05f186f4356b9b821697b18c70d60bf17d476 Mon Sep 17 00:00:00 2001
From: Anton Yaroshenko <kpakadijl@hotmail.com>
Date: Sun, 17 Nov 2019 19:42:23 +0200
Subject: [PATCH] Revert "replace raw byte with x509 certificate to allow
 specify passwords"

This reverts commit a38623cb5a7a9bacc751929b162caa9c852901e0.
---
 .../WebSocket4NetMqttChannel.cs                                 | 2 +-
 Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs       | 2 +-
 .../Client/Options/MqttClientOptionsBuilderTlsParameters.cs     | 2 +-
 Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs           | 2 +-
 Source/MQTTnet/Implementations/MqttTcpChannel.cs                | 2 +-
 Source/MQTTnet/Implementations/MqttWebSocketChannel.cs          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs b/Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs
index 1bbc65c8..68b12ef4 100644
--- a/Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs
+++ b/Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs
@@ -85,7 +85,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
             {
                 foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
                 {
-                    certificates.Add(certificate);
+                    certificates.Add(new X509Certificate(certificate));
                 }
             }
 
diff --git a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs
index e9ab3df3..65a1ec99 100644
--- a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs
+++ b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs
@@ -256,7 +256,7 @@ namespace MQTTnet.Client.Options
                         UseTls = true,
                         SslProtocol = _tlsParameters.SslProtocol,
                         AllowUntrustedCertificates = _tlsParameters.AllowUntrustedCertificates,
-                        Certificates = _tlsParameters.Certificates?.ToList(),
+                        Certificates = _tlsParameters.Certificates?.Select(c => c.ToArray()).ToList(),
                         CertificateValidationCallback = _tlsParameters.CertificateValidationCallback,
                         IgnoreCertificateChainErrors = _tlsParameters.IgnoreCertificateChainErrors,
                         IgnoreCertificateRevocationErrors = _tlsParameters.IgnoreCertificateRevocationErrors
diff --git a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs
index 79be24a5..ea36baa9 100644
--- a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs
+++ b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs
@@ -18,7 +18,7 @@ namespace MQTTnet.Client.Options
 
         public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12;
 
-        public IEnumerable<X509Certificate> Certificates { get; set; }
+        public IEnumerable<IEnumerable<byte>> Certificates { get; set; }
 
         public bool AllowUntrustedCertificates { get; set; }
 
diff --git a/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs b/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs
index cf04646d..db4077da 100644
--- a/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs
+++ b/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs
@@ -16,7 +16,7 @@ namespace MQTTnet.Client.Options
 
         public bool AllowUntrustedCertificates { get; set; }
 
-        public List<X509Certificate> Certificates { get; set; }
+        public List<byte[]> Certificates { get; set; }
 
         public SslProtocols SslProtocol { get; set; } = SslProtocols.Tls12;
 
diff --git a/Source/MQTTnet/Implementations/MqttTcpChannel.cs b/Source/MQTTnet/Implementations/MqttTcpChannel.cs
index 8f012cbf..d7943ad5 100644
--- a/Source/MQTTnet/Implementations/MqttTcpChannel.cs
+++ b/Source/MQTTnet/Implementations/MqttTcpChannel.cs
@@ -214,7 +214,7 @@ namespace MQTTnet.Implementations
 
             foreach (var certificate in _options.TlsOptions.Certificates)
             {
-                certificates.Add(certificate);
+                certificates.Add(new X509Certificate2(certificate));
             }
 
             return certificates;
diff --git a/Source/MQTTnet/Implementations/MqttWebSocketChannel.cs b/Source/MQTTnet/Implementations/MqttWebSocketChannel.cs
index c53a1313..38e43422 100644
--- a/Source/MQTTnet/Implementations/MqttWebSocketChannel.cs
+++ b/Source/MQTTnet/Implementations/MqttWebSocketChannel.cs
@@ -84,7 +84,7 @@ namespace MQTTnet.Implementations
                 clientWebSocket.Options.ClientCertificates = new X509CertificateCollection();
                 foreach (var certificate in _options.TlsOptions.Certificates)
                 {
-                    clientWebSocket.Options.ClientCertificates.Add(certificate);
+                    clientWebSocket.Options.ClientCertificates.Add(new X509Certificate(certificate));
                 }
             }