Merge branch 'testing' into add-esc16

Author: SamErde

Invoke-Locksmith.ps1

@@ -1598,7 +1598,8 @@ function Find-ESC7 {
                 }
                 if ($UnsafeCAAdministrators) {
                     $Issue.Issue = $Issue.Issue + @"
-Unexpected prinicipals ($($UnsafeCAAdministrators -join ', ')) are granted "CA Administrator" rights on this Certification Authority.
+Unexpected principals are granted "CA Administrator" rights on this Certification Authority.
+Unsafe CA Administrators: $($UnsafeCAAdministrators -join ', ').
 
 "@
                     $Issue.Fix = $Issue.Fix + @"
@@ -1612,15 +1613,16 @@ Reinstate CA Administrator rights for $($UnsafeCAAdministrators -join ', ')
                 }
                 if ($UnsafeCertificateManagers) {
                     $Issue.Issue = $Issue.Issue + @"
-Unexpected prinicipals ($($UnsafeCertificateManagers -join ', ')) are granted "Certificate Manager" rights on this Certification Authority.
+Unexpected principals are granted "Certificate Manager" rights on this Certification Authority.
+Unexpected Principals: $($UnsafeCertificateManagers -join ', ')
 
 "@
                     $Issue.Fix = $Issue.Fix + @"
-Revoke CA Administrator rights from $($UnsafeCertificateManagers -join ', ')
+Revoke Certificate Manager rights from $($UnsafeCertificateManagers -join ', ')
 
 "@
                     $Issue.Revert = $Issue.Revert + @"
-Reinstate CA Administrator rights for $($UnsafeCertificateManagers -join ', ')
+Reinstate Certificate Manager rights for $($UnsafeCertificateManagers -join ', ')
 
 "@
                 }
@@ -4653,7 +4655,7 @@ function Invoke-Locksmith {
         [System.Management.Automation.PSCredential]$Credential
     )
 
-    $Version = '2025.5.17'
+    $Version = '2025.5.18'
     $LogoPart1 = @'
     _       _____  _______ _     _ _______ _______ _____ _______ _     _
     |      |     | |       |____/  |______ |  |  |   |      |    |_____|

Locksmith.psd1

@@ -8,7 +8,7 @@
     FunctionsToExport    = 'Invoke-Locksmith'
     GUID                 = 'b1325b42-8dc4-4f17-aa1f-dcb5984ca14a'
     HelpInfoURI          = 'https://raw.githubusercontent.com/jakehildreth/Locksmith/main/en-US/'
-    ModuleVersion        = '2025.5.17'
+    ModuleVersion        = '2025.5.18'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{

Private/Find-ESC7.ps1

@@ -64,7 +64,8 @@
                 }
                 if ($UnsafeCAAdministrators) {
                     $Issue.Issue = $Issue.Issue + @"
-Unexpected prinicipals ($($UnsafeCAAdministrators -join ', ')) are granted "CA Administrator" rights on this Certification Authority.
+Unexpected principals are granted "CA Administrator" rights on this Certification Authority.
+Unsafe CA Administrators: $($UnsafeCAAdministrators -join ', ').
 
 "@
                     $Issue.Fix = $Issue.Fix + @"
@@ -78,15 +79,16 @@ Reinstate CA Administrator rights for $($UnsafeCAAdministrators -join ', ')
                 }
                 if ($UnsafeCertificateManagers) {
                     $Issue.Issue = $Issue.Issue + @"
-Unexpected prinicipals ($($UnsafeCertificateManagers -join ', ')) are granted "Certificate Manager" rights on this Certification Authority.
+Unexpected principals are granted "Certificate Manager" rights on this Certification Authority.
+Unexpected Principals: $($UnsafeCertificateManagers -join ', ')
 
 "@
                     $Issue.Fix = $Issue.Fix + @"
-Revoke CA Administrator rights from $($UnsafeCertificateManagers -join ', ')
+Revoke Certificate Manager rights from $($UnsafeCertificateManagers -join ', ')
 
 "@
                     $Issue.Revert = $Issue.Revert + @"
-Reinstate CA Administrator rights for $($UnsafeCertificateManagers -join ', ')
+Reinstate Certificate Manager rights for $($UnsafeCertificateManagers -join ', ')
 
 "@
                 }