Merge pull request #913 from lauxjpn/fix/sslkey

Extract key from between PEM header/footer, instead of just removing the PEM header/footer.

Author: bgrainger

.ci/server/certs/ssl-client-key-null.pem

@@ -85,22 +85,39 @@ public static unsafe void Convert(this Encoder encoder, ReadOnlySpan<char> chars
 		/// <returns>An RSA key.</returns>
 		public static RSAParameters GetRsaParameters(string key)
 		{
+			const string beginRsaPrivateKey = "-----BEGIN RSA PRIVATE KEY-----";
+			const string endRsaPrivateKey = "-----END RSA PRIVATE KEY-----";
+			const string beginPublicKey = "-----BEGIN PUBLIC KEY-----";
+			const string endPublicKey = "-----END PUBLIC KEY-----";
+
+			int keyStartIndex;
+			string pemFooter;
 			bool isPrivate;
-			if (key.StartsWith("-----BEGIN RSA PRIVATE KEY-----", StringComparison.Ordinal))
+
+			if ((keyStartIndex = key.IndexOf(beginRsaPrivateKey, StringComparison.Ordinal)) > -1)
 			{
-				key = key.Replace("-----BEGIN RSA PRIVATE KEY-----", "").Replace("-----END RSA PRIVATE KEY-----", "");
+				keyStartIndex += beginRsaPrivateKey.Length;
+				pemFooter = endRsaPrivateKey;
 				isPrivate = true;
 			}
-			else if (key.StartsWith("-----BEGIN PUBLIC KEY-----", StringComparison.Ordinal))
+			else if ((keyStartIndex = key.IndexOf(beginPublicKey, StringComparison.Ordinal)) > -1)
 			{
-				key = key.Replace("-----BEGIN PUBLIC KEY-----", "").Replace("-----END PUBLIC KEY-----", "");
+				keyStartIndex += beginPublicKey.Length;
+				pemFooter = endPublicKey;
 				isPrivate = false;
 			}
 			else
 			{
 				throw new FormatException("Unrecognized PEM header: " + key.Substring(0, Math.Min(key.Length, 80)));
 			}
 
+			var keyEndIndex = key.IndexOf(pemFooter, keyStartIndex, StringComparison.Ordinal);
+
+			if (keyEndIndex <= -1)
+				throw new FormatException($"Missing expected '{pemFooter}' PEM footer: " + key.Substring(Math.Max(key.Length - 80, 0)));
+
+			key = key.Substring(keyStartIndex, keyEndIndex - keyStartIndex);
+
 			return GetRsaParameters(System.Convert.FromBase64String(key), isPrivate);
 		}
 

src/MySqlConnector/Utilities/Utility.cs

@@ -64,8 +64,10 @@ public async Task ConnectSslClientCertificate(string certFile, string certFilePa
 #if !NETCOREAPP1_1_2
 		[SkippableTheory(ConfigSettings.RequiresSsl | ConfigSettings.KnownClientCertificate)]
 		[InlineData("ssl-client-cert.pem", "ssl-client-key.pem", null)]
+		[InlineData("ssl-client-cert.pem", "ssl-client-key-null.pem", null)]
 #if !BASELINE
 		[InlineData("ssl-client-cert.pem", "ssl-client-key.pem", "ssl-ca-cert.pem")] // https://bugs.mysql.com/bug.php?id=95436
+		[InlineData("ssl-client-cert.pem", "ssl-client-key-null.pem", "ssl-ca-cert.pem")] // https://bugs.mysql.com/bug.php?id=95436
 #endif
 		public async Task ConnectSslClientCertificatePem(string certFile, string keyFile, string caCertFile)
 		{