diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs index 273728b8b8..56c60be92d 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs @@ -426,18 +426,6 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G } } - if (_encrypt == SqlConnectionEncryptOption.Optional) - { // Support legacy registry encryption settings - const string folder = "Software\\Microsoft\\MSSQLServer\\Client\\SuperSocketNetLib"; - const string value = "Encrypt"; - - object obj = ADP.LocalMachineRegistryValue(folder, value); - if ((obj is int iObj) && (iObj == 1)) - { // If the registry key exists - _encrypt = SqlConnectionEncryptOption.Mandatory; - } - } - if (null != _networkLibrary) { // MDAC 83525 string networkLibrary = _networkLibrary.Trim().ToLower(CultureInfo.InvariantCulture); @@ -454,6 +442,18 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G } #endif // NETFRAMEWORK + if (_encrypt == SqlConnectionEncryptOption.Optional) + { // Support legacy registry encryption settings + const string folder = "Software\\Microsoft\\MSSQLServer\\Client\\SuperSocketNetLib"; + const string value = "Encrypt"; + + object obj = ADP.LocalMachineRegistryValue(folder, value); + if ((obj is int iObj) && (iObj == 1)) + { // If the registry key exists + _encrypt = SqlConnectionEncryptOption.Mandatory; + } + } + ValidateValueLength(_applicationName, TdsEnums.MAXLEN_APPNAME, KEY.Application_Name); ValidateValueLength(_currentLanguage, TdsEnums.MAXLEN_LANGUAGE, KEY.Current_Language); ValidateValueLength(_dataSource, TdsEnums.MAXLEN_SERVERNAME, KEY.Data_Source);