[fix] don't ask me why, but fixing previous SVN commit

NIKJOO · Apr 23, 2018 · a0f243b · a0f243b
1 parent 2f66115
commit a0f243b
Show file tree

Hide file tree

Showing 19 changed files with 290 additions and 474 deletions.
diff --git a/mimikatz.sln b/mimikatz.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "inc", "inc", "{282B4B77-BFF
 		inc\DbgHelp.h = inc\DbgHelp.h
 		inc\DhcpSSdk.h = inc\DhcpSSdk.h
 		inc\DsGetDC.h = inc\DsGetDC.h
+		inc\Fci.h = inc\Fci.h
 		inc\fltUser.h = inc\fltUser.h
 		inc\fltUserStructures.h = inc\fltUserStructures.h
 		inc\globals.h = inc\globals.h

diff --git a/mimikatz/mimikatz.c b/mimikatz/mimikatz.c
@@ -29,6 +29,7 @@ const KUHL_M * mimikatz_modules[] = {
 	&kuhl_m_sid,
 	&kuhl_m_iis,
 	&kuhl_m_rpc,
+	&kuhl_m_sr98,
 };
 
 int wmain(int argc, wchar_t * argv[])

diff --git a/mimikatz/mimikatz.h b/mimikatz/mimikatz.h
@@ -30,6 +30,7 @@
 #include "modules/kuhl_m_sid.h"
 #include "modules/kuhl_m_iis.h"
 #include "modules/kuhl_m_rpc.h"
+#include "modules/kuhl_m_sr98.h"
 
 #include <io.h>
 #include <fcntl.h>

diff --git a/mimikatz/mimikatz.rc b/mimikatz/mimikatz.rc
@@ -21,7 +21,7 @@ BLOCK "StringFileInfo"
 			VALUE "FileDescription", "mimikatz for Windows"
 			VALUE "FileVersion", "2.1.1.0"
 			VALUE "InternalName", "mimikatz"
-			VALUE "LegalCopyright", "Copyright (c) 2007 - 2017 gentilkiwi (Benjamin DELPY)"
+			VALUE "LegalCopyright", "Copyright (c) 2007 - 2018 gentilkiwi (Benjamin DELPY)"
 			VALUE "OriginalFilename", "mimikatz.exe"
 			VALUE "PrivateBuild", "Build with love for POC only"
 			VALUE "SpecialBuild", "kiwi flavor !"

diff --git a/mimikatz/mimikatz.vcxproj b/mimikatz/mimikatz.vcxproj
@@ -141,6 +141,7 @@
     <ClCompile Include="mimikatz.c" />
     <ClCompile Include="modules\crypto\kuhl_m_crypto_extractor.c" />
     <ClCompile Include="modules\crypto\kuhl_m_crypto_patch.c" />
+    <ClCompile Include="modules\crypto\kuhl_m_crypto_sc.c" />
     <ClCompile Include="modules\dpapi\kuhl_m_dpapi.c" />
     <ClCompile Include="modules\dpapi\kuhl_m_dpapi_oe.c" />
     <ClCompile Include="modules\dpapi\packages\kuhl_m_dpapi_chrome.c" />
@@ -163,6 +164,7 @@
     <ClCompile Include="modules\kuhl_m_net.c" />
     <ClCompile Include="modules\kuhl_m_privilege.c" />
     <ClCompile Include="modules\kuhl_m_process.c" />
+    <ClCompile Include="modules\kuhl_m_sr98.c" />
     <ClCompile Include="modules\kuhl_m_rpc.c" />
     <ClCompile Include="modules\kuhl_m_service.c" />
     <ClCompile Include="modules\kuhl_m_service_remote.c" />
@@ -230,6 +232,7 @@
     <ClInclude Include="mimikatz.h" />
     <ClInclude Include="modules\crypto\kuhl_m_crypto_extractor.h" />
     <ClInclude Include="modules\crypto\kuhl_m_crypto_patch.h" />
+    <ClInclude Include="modules\crypto\kuhl_m_crypto_sc.h" />
     <ClInclude Include="modules\dpapi\kuhl_m_dpapi.h" />
     <ClInclude Include="modules\dpapi\kuhl_m_dpapi_oe.h" />
     <ClInclude Include="modules\dpapi\packages\kuhl_m_dpapi_chrome.h" />
@@ -253,6 +256,7 @@
     <ClInclude Include="modules\kuhl_m_net.h" />
     <ClInclude Include="modules\kuhl_m_privilege.h" />
     <ClInclude Include="modules\kuhl_m_process.h" />
+    <ClInclude Include="modules\kuhl_m_sr98.h" />
     <ClInclude Include="modules\kuhl_m_rpc.h" />
     <ClInclude Include="modules\kuhl_m_service.h" />
     <ClInclude Include="modules\kuhl_m_service_remote.h" />

diff --git a/mimikatz/mimikatz.vcxproj.filters b/mimikatz/mimikatz.vcxproj.filters
@@ -248,6 +248,12 @@
     <ClCompile Include="modules\crypto\kuhl_m_crypto_patch.c">
       <Filter>local modules\crypto</Filter>
     </ClCompile>
+    <ClCompile Include="modules\kuhl_m_sr98.c">
+      <Filter>local modules</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\crypto\kuhl_m_crypto_sc.c">
+      <Filter>local modules\crypto</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="mimikatz.h" />
@@ -515,6 +521,12 @@
     <ClInclude Include="modules\crypto\kuhl_m_crypto_patch.h">
       <Filter>local modules\crypto</Filter>
     </ClInclude>
+    <ClInclude Include="modules\kuhl_m_sr98.h">
+      <Filter>local modules</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\crypto\kuhl_m_crypto_sc.h">
+      <Filter>local modules\crypto</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="local modules">

diff --git a/mimikatz/modules/kerberos/kuhl_m_kerberos.c b/mimikatz/modules/kerberos/kuhl_m_kerberos.c
diff --git a/mimikatz/modules/kerberos/kuhl_m_kerberos.h b/mimikatz/modules/kerberos/kuhl_m_kerberos.h
@@ -42,5 +42,5 @@ NTSTATUS kuhl_m_kerberos_test(int argc, wchar_t * argv[]);
 NTSTATUS kuhl_m_kerberos_hash_data(LONG keyType, PCUNICODE_STRING pString, PCUNICODE_STRING pSalt, DWORD count);
 wchar_t * kuhl_m_kerberos_generateFileName(const DWORD index, PKERB_TICKET_CACHE_INFO_EX ticket, LPCWSTR ext);
 wchar_t * kuhl_m_kerberos_generateFileName_short(PKIWI_KERBEROS_TICKET ticket, LPCWSTR ext);
-PBERVAL kuhl_m_kerberos_golden_data(LPCWSTR username, LPCWSTR domainname, LPCWSTR LogonDomainName, LPCWSTR servicename, LPCWSTR targetname, PKUHL_M_KERBEROS_LIFETIME_DATA lifetime, PISID sid, LPCBYTE key, DWORD keySize, DWORD keyType, DWORD userid, PGROUP_MEMBERSHIP groups, DWORD cbGroups, PKERB_SID_AND_ATTRIBUTES sids, DWORD cbSids, DWORD rodc, PCLAIMS_SET pClaimsSet);
+PBERVAL kuhl_m_kerberos_golden_data(LPCWSTR username, LPCWSTR domainname, LPCWSTR servicename, LPCWSTR targetname, PKUHL_M_KERBEROS_LIFETIME_DATA lifetime, LPCBYTE key, DWORD keySize, DWORD keyType, PISID sid, LPCWSTR LogonDomainName, DWORD userid, PGROUP_MEMBERSHIP groups, DWORD cbGroups, PKERB_SID_AND_ATTRIBUTES sids, DWORD cbSids, DWORD rodc, PCLAIMS_SET pClaimsSet);
 NTSTATUS kuhl_m_kerberos_encrypt(ULONG eType, ULONG keyUsage, LPCVOID key, DWORD keySize, LPCVOID data, DWORD dataSize, LPVOID *output, DWORD *outputSize, BOOL encrypt);
diff --git a/mimikatz/modules/kerberos/kuhl_m_kerberos_ccache.c b/mimikatz/modules/kerberos/kuhl_m_kerberos_ccache.c
@@ -5,7 +5,7 @@
 */
 #include "kuhl_m_kerberos_ccache.h"
 
-const UNICODE_STRING usXCACHECONF = {24, 26, L"X-CACHECONF:"};
+DECLARE_CONST_UNICODE_STRING(usXCACHECONF, L"X-CACHECONF:");
 NTSTATUS kuhl_m_kerberos_ccache_enum(int argc, wchar_t * argv[], BOOL isInject, BOOL isSave)
 {
 	PBYTE file, data;