From 5afc05e122a3cbc4f8035bbfa57886aebb5e1f66 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 22 Jun 2015 15:02:47 -0500 Subject: [PATCH] Adjust submodule and pssdk paths --- c/meterpreter/.gitmodules => .gitmodules | 4 ++-- c/meterpreter/make.bat | 6 +++--- .../ext_server_sniffer.vcxproj | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) rename c/meterpreter/.gitmodules => .gitmodules (68%) diff --git a/c/meterpreter/.gitmodules b/.gitmodules similarity index 68% rename from c/meterpreter/.gitmodules rename to .gitmodules index 2caa5af5..90a4fa19 100644 --- a/c/meterpreter/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "source/ReflectiveDLLInjection"] - path = source/ReflectiveDLLInjection + path = c/meterpreter/source/ReflectiveDLLInjection url = https://github.com/rapid7/ReflectiveDLLInjection.git [submodule "deps"] - path = deps + path = c/meterpreter/deps url = https://github.com/rapid7/meterpreter-deps diff --git a/c/meterpreter/make.bat b/c/meterpreter/make.bat index 0c9f4554..3b6ce738 100644 --- a/c/meterpreter/make.bat +++ b/c/meterpreter/make.bat @@ -12,7 +12,7 @@ IF NOT EXIST "source\ReflectiveDLLInjection\.git" ( SET PSSDK_VER=12 SET PREF= -IF EXIST "..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" SET PREF=r7_ +IF EXIST "..\..\..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" SET PREF=r7_ IF "%1"=="x86" GOTO BUILD_X86 IF "%1"=="X86" GOTO BUILD_X86 @@ -39,13 +39,13 @@ msbuild.exe make.msbuild /target:%PREF%%PLAT% POPD IF "%ERRORLEVEL%" == "0" ( - IF NOT EXIST "..\pssdk\" ( + IF NOT EXIST "..\..\..\pssdk\" ( ECHO Unable to build ext_server_sniffer: ECHO PSSDK directory not found. ECHO This is normal if you do not expect to have access to Rapid7 proprietary ECHO sniffer source. Meterpreter will still function normally without this. ) else ( - IF NOT EXIST "..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" ( + IF NOT EXIST "..\..\..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" ( ECHO Unable to build ext_server_sniffer: ECHO PSSDK lib version 'vc%PSSDK_VER%' not found. ECHO This is normal if you do not expect to have access to Rapid7 proprietary diff --git a/c/meterpreter/workspace/ext_server_sniffer/ext_server_sniffer.vcxproj b/c/meterpreter/workspace/ext_server_sniffer/ext_server_sniffer.vcxproj index f96b8fe5..52b9c8a6 100644 --- a/c/meterpreter/workspace/ext_server_sniffer/ext_server_sniffer.vcxproj +++ b/c/meterpreter/workspace/ext_server_sniffer/ext_server_sniffer.vcxproj @@ -94,7 +94,7 @@ MinSpace OnlyExplicitInline - ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) + ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SNIFFER_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -118,7 +118,7 @@ backcompat.lib;pssdk_$(PssdkVersion)_mt.lib;ws2_32.lib;metsrv.lib;%(AdditionalDependencies) - ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs;%(AdditionalLibraryDirectories) + ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs;%(AdditionalLibraryDirectories) true metsrv.dll;%(DelayLoadDLLs) $(OutDir)\ext_server_sniffer.pdb @@ -156,7 +156,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho MaxSpeed OnlyExplicitInline - ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) + ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SNIFFER_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -180,7 +180,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho backcompat.lib;pssdk_$(PssdkVersion)_mt.lib;ws2_32.lib;metsrv.lib;%(AdditionalDependencies) true - ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs64;%(AdditionalLibraryDirectories) + ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs64;%(AdditionalLibraryDirectories) metsrv.dll;%(DelayLoadDLLs) $(OutDir)\ext_server_sniffer.pdb false @@ -216,7 +216,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho Disabled - ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) + ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SNIFFER_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -238,7 +238,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho backcompat.lib;pssdk_$(PssdkVersion)_mtd.lib;ws2_32.lib;metsrv.lib;%(AdditionalDependencies) - ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs;%(AdditionalLibraryDirectories) + ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs;%(AdditionalLibraryDirectories) true true .\Debug\ext_server_sniffer.pdb @@ -275,7 +275,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho Disabled - ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) + ..\..\source\ReflectiveDLLInjection\common;..\..\source\extensions\sniffer;..\..\deps\openssl\include;..\..\..\..\..\pssdk\_include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SNIFFER_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -299,7 +299,7 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho backcompat.lib;pssdk_$(PssdkVersion)_mtd.lib;ws2_32.lib;metsrv.lib;%(AdditionalDependencies) true - ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs64;%(AdditionalLibraryDirectories) + ..\backcompat\$(Configuration);..\metsrv\$(Configuration)\$(Platform);..\..\deps\openssl\lib\win;..\..\..\..\..\pssdk\PSSDK_$(PssdkVersion)_LIB\_Libs64;%(AdditionalLibraryDirectories) metsrv.dll;%(DelayLoadDLLs) true .\Debug\ext_server_sniffer.pdb