Support SuperSocketNetLib registry option for Encrypt on NetCore Wind…

…ows (#2047)
dotnet · Jul 7, 2023 · 3cb9730 · 3cb9730
1 parent 1aa9af6
commit 3cb9730
Showing 1 changed file with 12 additions and 12 deletions.
diff --git 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);