CryptKey connection string handling fix (DNET-794).

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionStringBuilder.cs

@@ -353,23 +353,22 @@ private bool GetBoolean(string keyword, bool defaultValue)
 
 		private byte[] GetBytes(string keyword, byte[] defaultValue)
 		{
-			if (!TryGetValue(GetKey(keyword), out var value))
-				return defaultValue;
-
-			switch (value)
-			{
-				case byte[] bytes:
-					return bytes;
-				case string s:
-					return Convert.FromBase64String(s);
-				default:
-					return defaultValue;
-			}
+			return TryGetValue(GetKey(keyword), out var value)
+				? Convert.FromBase64String(value as string)
+				: defaultValue;
 		}
 
 		private void SetValue<T>(string keyword, T value)
 		{
-			this[GetKey(keyword)] = value;
+			var index = GetKey(keyword);
+			if (typeof(T) == typeof(byte[]))
+			{
+				this[index] = Convert.ToBase64String(value as byte[]);
+			}
+			else
+			{
+				this[index] = value;
+			}
 		}
 
 		private string GetKey(string keyword)

Provider/src/FirebirdSql.Data.UnitTests/FbConnectionStringBuilderTests.cs

@@ -21,6 +21,7 @@
 using System.Data;
 using System.Globalization;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using FirebirdSql.Data.FirebirdClient;
 using NUnit.Framework;
@@ -43,5 +44,20 @@ public void NoValueProvidedReturnsDefault()
 			var b = new FbConnectionStringBuilder();
 			Assert.AreEqual(b.MaxPoolSize, FbConnectionString.DefaultValueMaxPoolSize);
 		}
+
+		[Test]
+		public void CryptKeyValueSetter()
+		{
+			var b = new FbConnectionStringBuilder();
+			b.CryptKey = Encoding.ASCII.GetBytes("test");
+			Assert.AreEqual("crypt key=\"dGVzdA==\"", b.ToString());
+		}
+
+		[Test]
+		public void CryptKeyValueGetter()
+		{
+			var b = new FbConnectionStringBuilder("CryptKey=dGVzdA==");
+			Assert.AreEqual("test", Encoding.ASCII.GetString(b.CryptKey));
+		}
 	}
 }