Minor fixes

Fixed the SupportedEncryptionTypes registry key.
Fixed the SupportedEncryptionTypes warning message test.
Fixed an incorrect filed name in the Contrained Delegation SPNs report.

Author: Malcolm-Stewart

SQLCheck/SQLCheck/Collectors.cs

@@ -678,13 +678,15 @@ public static void CollectSecurity(DataSet ds)
             // Kerbeos enabled encryption methods
             //
 
-            string kerbEncrypt = Utility.GetRegistryValueAsString(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\LSA\Kerberos\Parameters", "SupportedEncryptionTypes", RegistryValueKind.DWord, "");
+            // string kerbEncrypt = Utility.GetRegistryValueAsString(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\LSA\Kerberos\Parameters", "SupportedEncryptionTypes", RegistryValueKind.DWord, "");
+            string kerbEncrypt = Utility.GetRegistryValueAsString(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Kerberos\Parameters", "SupportedEncryptionTypes", RegistryValueKind.DWord, "");
+
             if (kerbEncrypt == "") kerbEncrypt = "Not Specified"; 
             int encrypt = kerbEncrypt == "Not Specified" ? 28 : kerbEncrypt.ToInt();  // 0x1C = 28 decimal = RC4 + AES128 + AES256
             if (encrypt == 0) encrypt = 4; // RC4
             string encryptNames = Utility.KerbEncryptNames(encrypt);
             Security["KerberosLocalEncryption"] = $"{kerbEncrypt} ({encryptNames})";
-            if (encrypt != 0 && encrypt != 4) Security.LogWarning("RC4 encryption for Kerberos has been disabled.");
+            if (encrypt != 0 && (((byte)encrypt & 4) != 4)) Security.LogWarning("RC4 encryption for Kerberos has been disabled.");
 
             //
             // Warn if change in cryptography providers (default is rsaenh.dll) in:

SQLCheck/SQLCheck/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation - SQL Server Customer Support")]
 [assembly: AssemblyProduct("SQLCheck")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2021, 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1193.0")]
-[assembly: AssemblyFileVersion("1.0.1193.0")]
+[assembly: AssemblyVersion("1.0.1196.0")]
+[assembly: AssemblyFileVersion("1.0.1196.0")]

SQLCheck/SQLCheck/TextReport.cs

@@ -569,7 +569,7 @@ static void ReportService(DataSet ds, TextWriter s)  // outputs computer and dom
                 s.WriteLine();
                 rf = new ReportFormatter();
                 rf.SetColumnNames("Account:L", "SPN:L");
-                foreach (DataRow ConstrainedDelegationSPN in dtConstrainedDelegationSPN.Select("","Account,SPN"))
+                foreach (DataRow ConstrainedDelegationSPN in dtConstrainedDelegationSPN.Select("","ServiceAccount,SPN"))
                 {
                     rf.SetcolumnData(ConstrainedDelegationSPN.GetString("ServiceAccount"),
                                      ConstrainedDelegationSPN.GetString("SPN"));
@@ -909,11 +909,11 @@ static void ReportMessages(DataSet ds, TextWriter s, string tableName, int table
             DataView dv = null;
             if (tableRow == -1)  // Messages for all rows
             {
-                dv = new DataView(ds.Tables["Message"], $"TableName='{tableName}'", "Severity desc", DataViewRowState.CurrentRows);
+                dv = new DataView(ds.Tables["Message"], $"TableName='{tableName}'", "Severity desc, Message asc", DataViewRowState.CurrentRows);
             }
             else
             {
-                dv = new DataView(ds.Tables["Message"], $"TableName='{tableName}' AND TableRow={tableRow}", "Severity desc", DataViewRowState.CurrentRows);
+                dv = new DataView(ds.Tables["Message"], $"TableName='{tableName}' AND TableRow={tableRow}", "Severity desc, Message asc", DataViewRowState.CurrentRows);
             }
 
             if (dv.Count == 0)