Fix wrong ci configs. Restore ServerRsaPublicKeyFile for caching_sha2_password.

Author: Drake103

.travis.yml

@@ -8,13 +8,13 @@ env:
     FEATURES=StoredProcedures
   - IMAGE=mysql:5.7
     NAME=mysql
-    FEATURES=Json,StoredProcedures,Sha256Password,LargePackets,CachingSha2Password
+    FEATURES=Json,StoredProcedures,Sha256Password,LargePackets
   - IMAGE=mysql:8.0
     NAME=mysql
     FEATURES=Json,StoredProcedures,Sha256Password,LargePackets,CachingSha2Password
   - IMAGE=percona:5.7
     NAME=percona
-    FEATURES=Json,StoredProcedures,Sha256Password,OpenSsl,LargePackets,CachingSha2Password
+    FEATURES=Json,StoredProcedures,Sha256Password,OpenSsl,LargePackets
   - IMAGE=mariadb:10.2
     NAME=mariadb
     FEATURES=StoredProcedures,OpenSsl,LargePackets

appveyor.yml

@@ -7,7 +7,6 @@ before_test:
 - cmd: |-
     "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql
     "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql
-    "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_caching_sha2.sql
 test_script:
 - ps: .\.ci\test.ps1
 after_test:

src/MySqlConnector/Serialization/MySqlSession.cs

@@ -461,6 +461,19 @@ private async Task<string> GetRsaPublicKeyForCachingSha2PasswordAsync(
 			IOBehavior ioBehavior,
 			CancellationToken cancellationToken)
 		{
+			if (!string.IsNullOrEmpty(cs.ServerRsaPublicKeyFile))
+			{
+				try
+				{
+					return File.ReadAllText(cs.ServerRsaPublicKeyFile);
+				}
+				catch (IOException ex)
+				{
+					throw new MySqlException(
+						"Couldn't load server's RSA public key from '{0}'".FormatInvariant(cs.ServerRsaPublicKeyFile), ex);
+				}
+			}
+
 			if (cs.AllowPublicKeyRetrieval)
 			{
 				// request the RSA public key

tests/SideBySide/ConnectAsync.cs

@@ -257,8 +257,8 @@ public async Task Sha256WithoutSecureConnection()
 #endif
 			using (var connection = new MySqlConnection(csb.ConnectionString))
 			{
-#if BASELINE || NET45
-				await Assert.ThrowsAsync<MySqlException>(() => connection.OpenAsync());
+#if BASELINE
+				await Assert.ThrowsAsync<NotImplementedException>(() => connection.OpenAsync());
 #else
 				if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.OpenSsl))
 					await connection.OpenAsync();
@@ -281,14 +281,13 @@ public async Task CachingSha2WithoutSecureConnection()
 		{
 			var csb = AppConfig.CreateCachingSha2ConnectionStringBuilder();
 			csb.SslMode = MySqlSslMode.None;
-			//csb.ServerRsaPublicKeyFile = @"C:\NewCerts\public_key.pem";
 #if !BASELINE
 			csb.AllowPublicKeyRetrieval = true;
 #endif
 			using (var connection = new MySqlConnection(csb.ConnectionString))
 			{
-#if BASELINE || NET45
-				await Assert.ThrowsAsync<MySqlException>(() => connection.OpenAsync());
+#if BASELINE
+				await Assert.ThrowsAsync<NotImplementedException>(() => connection.OpenAsync());
 #else
 				await connection.OpenAsync();
 #endif