Merge pull request #16 from eByte23/bugifx/6.9_netstandard_fix_ssl_auth_error

Bugifx/6.9 netstandard fix ssl auth error

Author: SapientGuardian

Diff for: Source/MySql.Data/Authentication/AuthenticationManager.cs

@@ -36,17 +36,19 @@ static AuthenticationPluginManager()
       {
         plugins["mysql_native_password"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.MySqlNativePasswordPlugin");
         plugins["sha256_password"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.Sha256AuthenticationPlugin");
-#if !CF && !RT && !NETSTANDARD1_3
+#if !CF && !RT
         plugins["authentication_windows_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.MySqlWindowsAuthenticationPlugin");
+#if !NETSTANDARD1_3
         if (MySqlConfiguration.Settings != null && MySqlConfiguration.Settings.AuthenticationPlugins != null)
         {
           foreach (AuthenticationPluginConfigurationElement e in MySqlConfiguration.Settings.AuthenticationPlugins)
             plugins[e.Name] = new PluginInfo(e.Type);
         }
 #endif
-      }
+#endif
+        }
 
-      public static MySqlAuthenticationPlugin GetPlugin(string method)
+        public static MySqlAuthenticationPlugin GetPlugin(string method)
       {
         if (!plugins.ContainsKey(method))
           throw new MySqlException(String.Format(Resources.AuthenticationMethodNotSupported, method));

Diff for: Source/MySql.Data/Authentication/WindowsAuthenticationPlugin.cs

@@ -47,11 +47,10 @@ internal class MySqlWindowsAuthenticationPlugin : MySqlAuthenticationPlugin
     protected override void CheckConstraints()
     {
       string platform = String.Empty;
-#if !RT && !NETSTANDARD1_3
-      int p = (int)Environment.OSVersion.Platform;
-      if ((p == 4) || (p == 128))
+#if !RT
+     if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         platform = "Unix";
-      else if (Environment.OSVersion.Platform == PlatformID.MacOSX) 
+      else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) 
         platform = "Mac OS/X";
 
       if (!String.IsNullOrEmpty(platform))

Diff for: Source/MySql.Data/NativeDriver.cs

@@ -31,6 +31,9 @@
 using MySql.Data.MySqlClient.Authentication;
 using System.Reflection;
 using System.ComponentModel;
+using System.Security.Cryptography.X509Certificates;
+using System.Net.Security;
+using System.Security.Authentication;
 #if RT || NETSTANDARD1_3
 using System.Linq;
 #endif
@@ -195,16 +198,16 @@ public async void Open()
       try
       {
 #if NETSTANDARD1_3
-         baseStream = StreamCreator.GetStream(Settings).Result;
+            baseStream = StreamCreator.GetStream(Settings).Result;
 #else
-         baseStream = await StreamCreator.GetStream(Settings);
+            baseStream = await StreamCreator.GetStream(Settings);
 #endif
 #if !CF && !RT && !NETSTANDARD1_3
          if (Settings.IncludeSecurityAsserts)
             MySqlSecurityPermission.CreatePermissionSet(false).Assert();
 #endif
-      }
-      catch (System.Security.SecurityException)
+            }
+            catch (System.Security.SecurityException)
       {
         throw;
       }
@@ -277,7 +280,7 @@ public async void Open()
       packet.WriteByte(33); //character set utf-8
       packet.Write(new byte[23]);
 
-#if !CF && !RT && !NETSTANDARD1_3
+#if !CF && !RT
       if ((serverCaps & ClientFlags.SSL) == 0)
       {
         if ((Settings.SslMode != MySqlSslMode.None)
@@ -322,7 +325,7 @@ public async void Open()
       stream.MaxBlockSize = maxSinglePacket;
     }
 
-#if !CF && !RT && !NETSTANDARD1_3
+#if !CF && !RT
 
 #region SSL
 

Diff for: Source/MySql.Data/extensions/RT/ExtensionMethods.cs

@@ -24,7 +24,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Security;
 using System.Reflection;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -81,5 +84,13 @@ public static PropertyInfo[] GetProperties(this Type type)
     {
       return type.GetRuntimeProperties().ToArray();
     }
-  }
+
+#if NETSTANDARD1_3
+    public static void AuthenticateAsClient(this SslStream ss, string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, bool checkCertificateRevocation)
+    {
+        ss.AuthenticateAsClientAsync(targetHost, clientCertificates, enabledSslProtocols, checkCertificateRevocation).Wait();
+    }
+
+#endif
+    }
 }

Diff for: Source/MySql.Data/project.json

@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "Microsoft.CSharp": "4.0.1-rc2-24027",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
     "System.Collections": "4.0.11-rc2-24027",
     "System.Collections.Specialized": "4.0.1-rc2-24027",
     "System.Console": "4.0.0-rc2-24027",
@@ -49,7 +50,9 @@
     "System.Net.Sockets": "4.1.0-rc2-24027",
     "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
     "System.Collections.NonGeneric": "4.0.1-rc2-24027",
-    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
+    "System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
+    "System.Net.Security": "4.0.0-rc2-24027"
   },
   "frameworks": {
     "netstandard1.3": {