Skip to content

Commit cf29817

Browse files
author
Jake Hildreth
committed
All fixes requested by @SamErde
1 parent b43fc3e commit cf29817

7 files changed

+12
-12
lines changed

Invoke-Locksmith.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ function Find-ESC11 {
288288
Name = $_.Name
289289
DistinguishedName = $_.DistinguishedName
290290
Technique = 'ESC11'
291-
Issue = $_.AuditFilter
291+
Issue = $_.InterfaceFlag
292292
Fix = 'N/A'
293293
Revert = 'N/A'
294294
}
@@ -861,7 +861,7 @@ function Find-ESC6 {
861861
Name = $_.Name
862862
DistinguishedName = $_.DistinguishedName
863863
Technique = 'ESC6'
864-
Issue = $_.AuditFilter
864+
Issue = $_.SANFlag
865865
Fix = 'N/A'
866866
Revert = 'N/A'
867867
}
@@ -2798,7 +2798,7 @@ function Invoke-Locksmith {
27982798
[System.Management.Automation.PSCredential]$Credential
27992799
)
28002800

2801-
$Version = '2024.10'
2801+
$Version = '2024.11'
28022802
$LogoPart1 = @"
28032803
_ _____ _______ _ _ _______ _______ _____ _______ _ _
28042804
| | | | |____/ |______ | | | | | |_____|

Locksmith.psd1

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Description = 'A small tool to find and fix common misconfigurations in Active Directory Certificate Services.'
88
FunctionsToExport = @('*')
99
GUID = 'b1325b42-8dc4-4f17-aa1f-dcb5984ca14a'
10-
ModuleVersion = '2024.10'
10+
ModuleVersion = '2024.11'
1111
PowerShellVersion = '5.1'
1212
PrivateData = @{
1313
PSData = @{

Private/Find-ESC11.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
Name = $_.Name
3737
DistinguishedName = $_.DistinguishedName
3838
Technique = 'ESC11'
39-
Issue = $_.AuditFilter
39+
Issue = $_.InterfaceFlag
4040
Fix = 'N/A'
4141
Revert = 'N/A'
4242
}

Private/Find-ESC6.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
Name = $_.Name
3737
DistinguishedName = $_.DistinguishedName
3838
Technique = 'ESC6'
39-
Issue = $_.AuditFilter
39+
Issue = $_.SANFlag
4040
Fix = 'N/A'
4141
Revert = 'N/A'
4242
}

Private/Invoke-Remediation.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function Invoke-Remediation {
2727
.PARAMETER ESC6
2828
A PS Object containing all necessary information about ESC6 issues.
2929
30-
.PARAMETER ESC6
30+
.PARAMETER ESC11
3131
A PS Object containing all necessary information about ESC11 issues.
3232
3333
.INPUTS

Private/Invoke-Scans.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Invoke-Scans {
2323
2424
.NOTES
2525
- The script requires the following functions to be defined: Find-AuditingIssue, Find-ESC1, Find-ESC2, Find-ESC3Condition1,
26-
Find-ESC3Condition2, Find-ESC4, Find-ESC5, Find-ESC6, Find-ESC8, Find-ESC8.
26+
Find-ESC3Condition2, Find-ESC4, Find-ESC5, Find-ESC6, Find-ESC8, Find-ESC11.
2727
- The script uses Out-GridView or Out-ConsoleGridView for interactive selection when the 'PromptMe' scan option is chosen.
2828
- The script returns a hash table containing the results of the scans.
2929
@@ -113,9 +113,9 @@ function Invoke-Scans {
113113
Write-Host 'Identifying HTTP-based certificate enrollment interfaces (ESC8)...'
114114
[array]$ESC8 = Find-ESC8 -ADCSObjects $ADCSObjects
115115
}
116-
ESC6 {
116+
ESC11 {
117117
Write-Host 'Identifying Issuing CAs with IF_ENFORCEENCRYPTICERTREQUEST disabled (ESC11)...'
118-
[array]$ESC6 = Find-ESC6 -ADCSObjects $ADCSObjects
118+
[array]$ESC11 = Find-ESC11 -ADCSObjects $ADCSObjects
119119
}
120120
All {
121121
Write-Host 'Identifying auditing issues...'
@@ -144,7 +144,7 @@ function Invoke-Scans {
144144
[array]$AllIssues = $AuditingIssues + $ESC1 + $ESC2 + $ESC3 + $ESC4 + $ESC5 + $ESC6 + $ESC8 + $ESC11
145145

146146
# If these are all empty = no issues found, exit
147-
if ((!$AuditingIssues) -and (!$ESC1) -and (!$ESC2) -and (!$ESC3) -and (!$ESC4) -and (!$ESC5) -and (!$ESC6) -and (!$ESC8) -and ($ESC11) ) {
147+
if ((!$AuditingIssues) -and (!$ESC1) -and (!$ESC2) -and (!$ESC3) -and (!$ESC4) -and (!$ESC5) -and (!$ESC6) -and (!$ESC8) -and (!$ESC11) ) {
148148
Write-Host "`n$(Get-Date) : No ADCS issues were found." -ForegroundColor Green
149149
break
150150
}

Private/New-Dictionary.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ descriptions, code used to find, code used to fix, and reference URLs. This is i
2121

2222
function New-Dictionary {
2323
class VulnerableConfigurationItem {
24-
static [string] $Version = '2023.10.01.000'
24+
static [string] $Version = '2024.11.03.000'
2525
[string]$Name
2626
[ValidateSet('Escalation Path','Server Configuration','GPO Setting')][string]$Category
2727
[string]$Subcategory

0 commit comments

Comments
 (0)