Skip to content

Commit fcbcfa0

Browse files
WindowsAPIWindowsAPI
authored
Merge pull request #33 from micREsoft/fix-obfuscation
Fix broken obfuscation paths
2 parents eba1a29 + 565c665 commit fcbcfa0

4 files changed

Lines changed: 38 additions & 63 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -436,22 +436,6 @@ jobs:
436436
437437
Copy-Item "../Build/Bind/Release/*" "release-package\" -Recurse
438438
439-
# Create README
440-
$version = "v1.3.2"
441-
$readmeText = "# SysCaller: Bind - v1.3.2`n`n"
442-
$readmeText += "Build Date: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss UTC')`n"
443-
$readmeText += "Commit: ${{ github.sha }}`n"
444-
$readmeText += "Platform: Windows x64 (64-bit)`n"
445-
$readmeText += "Version: $version`n`n"
446-
$readmeText += "## Installation`n"
447-
$readmeText += "1. Download Bind.exe`n"
448-
$readmeText += "2. Run the executable`n`n"
449-
$readmeText += "## Requirements`n"
450-
$readmeText += "- Windows 10 or later`n"
451-
$readmeText += "- Visual C++ Redistributable (if not already installed)`n"
452-
$readmeText += "- Qt5 runtime libraries (if not already installed)"
453-
$readmeText | Out-File -FilePath "release-package\README.txt" -Encoding UTF8
454-
455439
# Create the zip file
456440
Compress-Archive -Path "release-package\*" -DestinationPath $zipName -Force
457441
@@ -474,24 +458,14 @@ jobs:
474458
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
475459
with:
476460
tag_name: v1.3.2
477-
release_name: "SysCaller: Bind - v1.3.2"
461+
release_name: "SysCaller: Bind v1.3.2"
478462
body: |
479-
## SysCaller: Bind - v1.3.2
463+
## SysCaller: Bind v1.3.2
480464
481465
**Build Date:** ${{ github.event.head_commit.timestamp }}
482466
**Commit:** ${{ github.sha }}
483467
**Platform:** Windows x64 (64-bit)
484468
485-
## Installation
486-
1. Download Bind.zip
487-
2. Replace the downloaded Bind directory with the one in SysCaller
488-
3. Extract the zip & run the Bind.exe
489-
490-
## Requirements
491-
- Windows 10 or later
492-
- Visual C++ Redistributable (if not already installed)
493-
- Qt5 runtime libraries (if not already installed)
494-
495469
- name: Upload Release Asset
496470
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
497471
uses: actions/upload-release-asset@v1

‎Bind/Bind.vcxproj‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -157,35 +157,36 @@
157157
<ClCompile Include="src\GUI\Threads\CompatibilityThread.cpp" />
158158
<ClCompile Include="src\GUI\Threads\ObfuscationThread.cpp" />
159159
<ClCompile Include="src\GUI\Threads\ValidatorThread.cpp" />
160-
<ClCompile Include="GeneratedFiles\moc_MainWindow.cpp" />
161-
<ClCompile Include="GeneratedFiles\moc_ProgressBar.cpp" />
162-
<ClCompile Include="GeneratedFiles\moc_StatusBar.cpp" />
163-
<ClCompile Include="GeneratedFiles\moc_TitleBar.cpp" />
164-
<ClCompile Include="GeneratedFiles\moc_SettingsTitleBar.cpp" />
165-
<ClCompile Include="GeneratedFiles\moc_BindButton.cpp" />
166-
<ClCompile Include="GeneratedFiles\moc_LeftPanel.cpp" />
167-
<ClCompile Include="GeneratedFiles\moc_OutputPanel.cpp" />
168-
<ClCompile Include="GeneratedFiles\moc_RightPanel.cpp" />
169-
<ClCompile Include="GeneratedFiles\moc_ChangelogDialog.cpp" />
170-
<ClCompile Include="GeneratedFiles\moc_HashCompareDialog.cpp" />
171-
<ClCompile Include="GeneratedFiles\moc_ObfuscationSelectionDialog.cpp" />
172-
<ClCompile Include="GeneratedFiles\moc_StubMapperDialog.cpp" />
173-
<ClCompile Include="GeneratedFiles\moc_SettingsDialog.cpp" />
174-
<ClCompile Include="GeneratedFiles\moc_ConfirmationDialog.cpp" />
175-
<ClCompile Include="GeneratedFiles\moc_GeneralTab.cpp" />
176-
<ClCompile Include="GeneratedFiles\moc_ObfuscationTab.cpp" />
177-
<ClCompile Include="GeneratedFiles\moc_IntegrityTab.cpp" />
178-
<ClCompile Include="GeneratedFiles\moc_ProfileTab.cpp" />
179-
<ClCompile Include="GeneratedFiles\moc_IndirectObfuscationTab.cpp" />
180-
<ClCompile Include="GeneratedFiles\moc_InlineObfuscationTab.cpp" />
181-
<ClCompile Include="GeneratedFiles\moc_ValidatorThread.cpp" />
182-
<ClCompile Include="GeneratedFiles\moc_CompatibilityThread.cpp" />
183-
<ClCompile Include="GeneratedFiles\moc_VerificationThread.cpp" />
184-
<ClCompile Include="GeneratedFiles\moc_ObfuscationThread.cpp" />
185-
<ClCompile Include="GeneratedFiles\moc_Compatibility.cpp" />
186-
<ClCompile Include="GeneratedFiles\moc_Validator.cpp" />
187-
<ClCompile Include="GeneratedFiles\moc_Verification.cpp" />
188-
<ClCompile Include="GeneratedFiles\qrc_resources.cpp" />
160+
<!-- MOC and RCC files, QtMsBuild should add these automatically, but we include them explicitly for CI compatibility -->
161+
<ClCompile Include="GeneratedFiles\moc_MainWindow.cpp" Condition="Exists('GeneratedFiles\moc_MainWindow.cpp')" />
162+
<ClCompile Include="GeneratedFiles\moc_ProgressBar.cpp" Condition="Exists('GeneratedFiles\moc_ProgressBar.cpp')" />
163+
<ClCompile Include="GeneratedFiles\moc_StatusBar.cpp" Condition="Exists('GeneratedFiles\moc_StatusBar.cpp')" />
164+
<ClCompile Include="GeneratedFiles\moc_TitleBar.cpp" Condition="Exists('GeneratedFiles\moc_TitleBar.cpp')" />
165+
<ClCompile Include="GeneratedFiles\moc_SettingsTitleBar.cpp" Condition="Exists('GeneratedFiles\moc_SettingsTitleBar.cpp')" />
166+
<ClCompile Include="GeneratedFiles\moc_BindButton.cpp" Condition="Exists('GeneratedFiles\moc_BindButton.cpp')" />
167+
<ClCompile Include="GeneratedFiles\moc_LeftPanel.cpp" Condition="Exists('GeneratedFiles\moc_LeftPanel.cpp')" />
168+
<ClCompile Include="GeneratedFiles\moc_OutputPanel.cpp" Condition="Exists('GeneratedFiles\moc_OutputPanel.cpp')" />
169+
<ClCompile Include="GeneratedFiles\moc_RightPanel.cpp" Condition="Exists('GeneratedFiles\moc_RightPanel.cpp')" />
170+
<ClCompile Include="GeneratedFiles\moc_ChangelogDialog.cpp" Condition="Exists('GeneratedFiles\moc_ChangelogDialog.cpp')" />
171+
<ClCompile Include="GeneratedFiles\moc_HashCompareDialog.cpp" Condition="Exists('GeneratedFiles\moc_HashCompareDialog.cpp')" />
172+
<ClCompile Include="GeneratedFiles\moc_ObfuscationSelectionDialog.cpp" Condition="Exists('GeneratedFiles\moc_ObfuscationSelectionDialog.cpp')" />
173+
<ClCompile Include="GeneratedFiles\moc_StubMapperDialog.cpp" Condition="Exists('GeneratedFiles\moc_StubMapperDialog.cpp')" />
174+
<ClCompile Include="GeneratedFiles\moc_SettingsDialog.cpp" Condition="Exists('GeneratedFiles\moc_SettingsDialog.cpp')" />
175+
<ClCompile Include="GeneratedFiles\moc_ConfirmationDialog.cpp" Condition="Exists('GeneratedFiles\moc_ConfirmationDialog.cpp')" />
176+
<ClCompile Include="GeneratedFiles\moc_GeneralTab.cpp" Condition="Exists('GeneratedFiles\moc_GeneralTab.cpp')" />
177+
<ClCompile Include="GeneratedFiles\moc_ObfuscationTab.cpp" Condition="Exists('GeneratedFiles\moc_ObfuscationTab.cpp')" />
178+
<ClCompile Include="GeneratedFiles\moc_IntegrityTab.cpp" Condition="Exists('GeneratedFiles\moc_IntegrityTab.cpp')" />
179+
<ClCompile Include="GeneratedFiles\moc_ProfileTab.cpp" Condition="Exists('GeneratedFiles\moc_ProfileTab.cpp')" />
180+
<ClCompile Include="GeneratedFiles\moc_IndirectObfuscationTab.cpp" Condition="Exists('GeneratedFiles\moc_IndirectObfuscationTab.cpp')" />
181+
<ClCompile Include="GeneratedFiles\moc_InlineObfuscationTab.cpp" Condition="Exists('GeneratedFiles\moc_InlineObfuscationTab.cpp')" />
182+
<ClCompile Include="GeneratedFiles\moc_ValidatorThread.cpp" Condition="Exists('GeneratedFiles\moc_ValidatorThread.cpp')" />
183+
<ClCompile Include="GeneratedFiles\moc_CompatibilityThread.cpp" Condition="Exists('GeneratedFiles\moc_CompatibilityThread.cpp')" />
184+
<ClCompile Include="GeneratedFiles\moc_VerificationThread.cpp" Condition="Exists('GeneratedFiles\moc_VerificationThread.cpp')" />
185+
<ClCompile Include="GeneratedFiles\moc_ObfuscationThread.cpp" Condition="Exists('GeneratedFiles\moc_ObfuscationThread.cpp')" />
186+
<ClCompile Include="GeneratedFiles\moc_Compatibility.cpp" Condition="Exists('GeneratedFiles\moc_Compatibility.cpp')" />
187+
<ClCompile Include="GeneratedFiles\moc_Validator.cpp" Condition="Exists('GeneratedFiles\moc_Validator.cpp')" />
188+
<ClCompile Include="GeneratedFiles\moc_Verification.cpp" Condition="Exists('GeneratedFiles\moc_Verification.cpp')" />
189+
<ClCompile Include="GeneratedFiles\qrc_resources.cpp" Condition="Exists('GeneratedFiles\qrc_resources.cpp')" />
189190
</ItemGroup>
190191
<ItemGroup>
191192
<QtMoc Include="include\Core\Integrity\Compatibility\Compatibility.h">

‎Bind/src/Core/Obfuscation/IndirectObfuscation.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ bool IndirectObfuscationManager::generateIndirectObfuscation()
4444
PathUtils::getSysCallerPath() + "/Wrapper/src/SysCaller.asm";
4545

4646
QString headerPath = isKernel ?
47-
PathUtils::getSysCallerKPath() + "/Wrapper/SysK/SysKFunctions.h" :
48-
PathUtils::getSysCallerPath() + "/Wrapper/Sys/SysFunctions.h";
47+
PathUtils::getSysCallerKPath() + "/Wrapper/include/SysK/SysKFunctions.h" :
48+
PathUtils::getSysCallerPath() + "/Wrapper/include/Sys/SysFunctions.h";
4949

5050
return processIndirectAssemblyFile(asmPath, headerPath);
5151
}
@@ -609,4 +609,4 @@ bool IndirectObfuscationManager::updateDefFile(const QString& defPath,
609609

610610
defFile.close();
611611
return true;
612-
}
612+
}

‎Bind/src/Core/Obfuscation/Obfuscation.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ QString Obfuscation::getHeaderFilePath(bool isKernelMode)
6262
{
6363
if (isKernelMode)
6464
{
65-
return PathUtils::getSysCallerKPath() + "/Wrapper/SysK/SysKFunctions.h";
65+
return PathUtils::getSysCallerKPath() + "/Wrapper/include/SysK/SysKFunctions.h";
6666
}
6767
else
6868
{
69-
return PathUtils::getSysCallerPath() + "/Wrapper/Sys/SysFunctions.h";
69+
return PathUtils::getSysCallerPath() + "/Wrapper/include/Sys/SysFunctions.h";
7070
}
7171
}
7272

@@ -876,4 +876,4 @@ bool Obfuscation::updateDefFile(const QString& defPath, const QStringList& obfus
876876

877877
defFile.close();
878878
return true;
879-
}
879+
}

0 commit comments

Comments
 (0)