Skip to content

Commit 97a9a91

Browse files
committed
Merge branch 'bypassuac_redo' of github.com:Meatballs1/metasploit-framework into bypassuac_redo
2 parents e0fa1d5 + 3ef43b0 commit 97a9a91

File tree

3 files changed

+10
-83
lines changed

3 files changed

+10
-83
lines changed

external/source/exploits/bypassuac_injection/bypassuac_injection.sln

100644100755
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Express 2012 for Windows Desktop
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bypassuac", "dll\reflective_dll.vcxproj", "{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}"
57
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8-
Debug|ARM = Debug|ARM
910
Debug|Win32 = Debug|Win32
1011
Debug|x64 = Debug|x64
11-
Release|ARM = Release|ARM
1212
Release|Win32 = Release|Win32
1313
Release|x64 = Release|x64
1414
EndGlobalSection
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Debug|ARM.ActiveCfg = Debug|Win32
1716
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Debug|Win32.ActiveCfg = Release|Win32
1817
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Debug|Win32.Build.0 = Release|Win32
1918
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Debug|x64.ActiveCfg = Release|x64
2019
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Debug|x64.Build.0 = Release|x64
21-
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Release|ARM.ActiveCfg = Release|Win32
2220
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Release|Win32.ActiveCfg = Release|Win32
2321
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Release|Win32.Build.0 = Release|Win32
2422
{3A371EBD-EEE1-4B2A-88B9-93E7BABE0949}.Release|x64.ActiveCfg = Release|x64

external/source/exploits/bypassuac_injection/dll/reflective_dll.vcxproj

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|ARM">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|Win32">
95
<Configuration>Debug</Configuration>
106
<Platform>Win32</Platform>
@@ -13,10 +9,6 @@
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Release|ARM">
17-
<Configuration>Release</Configuration>
18-
<Platform>ARM</Platform>
19-
</ProjectConfiguration>
2012
<ProjectConfiguration Include="Release|Win32">
2113
<Configuration>Release</Configuration>
2214
<Platform>Win32</Platform>
@@ -39,22 +31,11 @@
3931
<CharacterSet>MultiByte</CharacterSet>
4032
<WholeProgramOptimization>false</WholeProgramOptimization>
4133
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
43-
<ConfigurationType>DynamicLibrary</ConfigurationType>
44-
<PlatformToolset>v120</PlatformToolset>
45-
<CharacterSet>MultiByte</CharacterSet>
46-
<WholeProgramOptimization>true</WholeProgramOptimization>
47-
</PropertyGroup>
4834
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4935
<ConfigurationType>DynamicLibrary</ConfigurationType>
5036
<PlatformToolset>v120</PlatformToolset>
5137
<CharacterSet>Unicode</CharacterSet>
5238
</PropertyGroup>
53-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
54-
<ConfigurationType>DynamicLibrary</ConfigurationType>
55-
<PlatformToolset>v120</PlatformToolset>
56-
<CharacterSet>Unicode</CharacterSet>
57-
</PropertyGroup>
5839
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5940
<ConfigurationType>DynamicLibrary</ConfigurationType>
6041
<CharacterSet>MultiByte</CharacterSet>
@@ -72,15 +53,9 @@
7253
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
7354
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7455
</ImportGroup>
75-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
76-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
77-
</ImportGroup>
7856
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
7957
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8058
</ImportGroup>
81-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
82-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
83-
</ImportGroup>
8459
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
8560
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8661
</ImportGroup>
@@ -96,9 +71,6 @@
9671
<IntDir>$(Configuration)\</IntDir>
9772
<LinkIncremental>true</LinkIncremental>
9873
</PropertyGroup>
99-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
100-
<LinkIncremental>true</LinkIncremental>
101-
</PropertyGroup>
10274
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10375
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
10476
<IntDir>$(Platform)\$(Configuration)\</IntDir>
@@ -111,9 +83,6 @@
11183
<TargetName>$(ProjectName)-x86</TargetName>
11284
<IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);..\..\..\ReflectiveDLLInjection\common\;..\..\..\ReflectiveDLLInjection\dll\src\</IncludePath>
11385
</PropertyGroup>
114-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
115-
<LinkIncremental>false</LinkIncremental>
116-
</PropertyGroup>
11786
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
11887
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
11988
<IntDir>$(Configuration)\</IntDir>
@@ -138,23 +107,6 @@
138107
<TargetMachine>MachineX86</TargetMachine>
139108
</Link>
140109
</ItemDefinitionGroup>
141-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
142-
<ClCompile>
143-
<Optimization>Disabled</Optimization>
144-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;REFLECTIVE_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145-
<MinimalRebuild>true</MinimalRebuild>
146-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
147-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
148-
<PrecompiledHeader>
149-
</PrecompiledHeader>
150-
<WarningLevel>Level3</WarningLevel>
151-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
152-
</ClCompile>
153-
<Link>
154-
<GenerateDebugInformation>true</GenerateDebugInformation>
155-
<SubSystem>Windows</SubSystem>
156-
</Link>
157-
</ItemDefinitionGroup>
158110
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
159111
<Midl>
160112
<TargetEnvironment>X64</TargetEnvironment>
@@ -199,36 +151,6 @@
199151
IF EXIST "..\..\..\..\..\data\post\" GOTO COPY
200152
mkdir "..\..\..\..\..\data\post\"
201153
:COPY
202-
copy /y "$(TargetDir)$(TargetFileName)" "..\..\..\..\..\data\post\"</Command>
203-
</PostBuildEvent>
204-
</ItemDefinitionGroup>
205-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
206-
<ClCompile>
207-
<Optimization>MinSpace</Optimization>
208-
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
209-
<IntrinsicFunctions>true</IntrinsicFunctions>
210-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN_ARM;REFLECTIVE_DLL_EXPORTS;REFLECTIVEDLLINJECTION_VIA_LOADREMOTELIBRARYR;REFLECTIVEDLLINJECTION_CUSTOM_DLLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
212-
<FunctionLevelLinking>true</FunctionLevelLinking>
213-
<PrecompiledHeader>
214-
</PrecompiledHeader>
215-
<WarningLevel>Level3</WarningLevel>
216-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
217-
<BufferSecurityCheck>true</BufferSecurityCheck>
218-
<CompileAs>Default</CompileAs>
219-
</ClCompile>
220-
<Link>
221-
<GenerateDebugInformation>true</GenerateDebugInformation>
222-
<SubSystem>Windows</SubSystem>
223-
<OptimizeReferences>true</OptimizeReferences>
224-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
225-
<OutputFile>$(OutDir)$(ProjectName).arm.dll</OutputFile>
226-
</Link>
227-
<PostBuildEvent>
228-
<Command>
229-
IF EXIST "..\..\..\..\..\data\post\" GOTO COPY
230-
mkdir "..\..\..\..\..\data\post\"
231-
:COPY
232154
copy /y "$(TargetDir)$(TargetFileName)" "..\..\..\..\..\data\post\"</Command>
233155
</PostBuildEvent>
234156
</ItemDefinitionGroup>

external/source/exploits/make.bat

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ IF "%ERRORLEVEL%"=="0" (
4747
POPD
4848
)
4949

50+
IF "%ERRORLEVEL%"=="0" (
51+
ECHO "Building bypassuac_injection"
52+
PUSHD bypassuac_injection
53+
msbuild.exe make.msbuild /target:%PLAT%
54+
POPD
55+
)
56+
5057
FOR /F "usebackq tokens=1,2 delims==" %%i IN (`wmic os get LocalDateTime /VALUE 2^>NUL`) DO IF '.%%i.'=='.LocalDateTime.' SET LDT=%%j
5158
SET LDT=%LDT:~0,4%-%LDT:~4,2%-%LDT:~6,2% %LDT:~8,2%:%LDT:~10,2%:%LDT:~12,6%
5259
echo Finished %ldt%

0 commit comments

Comments
 (0)