infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #299 - corrects the win32 build environment and source to build properly again 

git-svn-id: file:///home/svn/framework3/trunk@6987 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2009-08-30 01:57:25 +00:00
parent e0e72f39b2
commit 87ea275a17
13 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
external/source/meterpreter/source/client/remote_dispatch.c vendored
View File

@ -1,39 +1,5 @@
#include "metcli.h"
/*
* Process a request to print one or more strings
*/
DWORD remote_request_core_console_write(Remote *remote, Packet *packet)
{
DWORD res = ERROR_NOT_FOUND;
DWORD index;
Tlv tlv;
console_write_output("\n");
do
{
for (index = 0;
packet_enum_tlv(packet, index, TLV_TYPE_STRING, &tlv)
== ERROR_SUCCESS;
index++)
console_write_output("%s", (PCHAR)tlv.buffer);
res = ERROR_SUCCESS;
} while (0);
fflush(stdout);
console_write_prompt();
return res;
}
DWORD remote_response_core_console_write(Remote *remote, Packet *packet)
{
return ERROR_SUCCESS;
}
/*
* Extension callback for printing out notifications for channels opening

3
external/source/meterpreter/source/common/arch/win/i386/base_dispatch.c vendored
View File

@ -1,8 +1,5 @@
#include "common.h"
// include the PolarSSL library
#pragma comment(lib,"polarssl.lib")
/*
* core_migrate

9
external/source/meterpreter/source/server/server_setup.c vendored
View File

@ -12,10 +12,10 @@
int exceptionfilter(unsigned int code, struct _EXCEPTION_POINTERS *ep)
{
return EXCEPTION_EXECUTE_HANDLER;
}^M
}
#define InitAppInstance() do { \
if( hAppInstance == NULL )^M \
if( hAppInstance == NULL ) \
hAppInstance = GetModuleHandle( NULL ); \
} while (0)
@ -107,7 +107,7 @@ DWORD server_setup(SOCKET fd)
// Flush all pending data on the connected socket before doing SSL
static void flush_socket(Remote *remote) {
fd_set fdread, fdother ;
fd_set fdread;
DWORD ret;
SOCKET fd;
unsigned char buff[4096];
@ -140,7 +140,6 @@ static DWORD negotiate_ssl(Remote *remote)
DWORD hres = ERROR_SUCCESS;
SOCKET fd = remote_get_fd(remote);
DWORD ret;
int serr;
SSL_load_error_strings();
SSL_library_init();
@ -158,7 +157,7 @@ static DWORD negotiate_ssl(Remote *remote)
}
if ((serr = SSL_connect(remote->ssl)) != 1) {
if ((ret = SSL_connect(remote->ssl)) != 1) {
printf("connect failed %d\n", SSL_get_error(remote->ssl, ret));
exit(1);
}

5
external/source/meterpreter/workspace/common/common.vcproj vendored
View File

@ -43,6 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\openssl\include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;USE_DLL;METERPRETER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -238,6 +239,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\source\common\base_dispatch_common.c"
>
</File>
<File
RelativePath="..\..\source\common\arch\win\buffer.c"
>

2
external/source/meterpreter/workspace/ext_server_boiler/ext_server_boiler.vcproj vendored
View File

@ -141,7 +141,7 @@
AdditionalDependencies="metsrv.lib"
OutputFile=".\Release/ext_server_boiler.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\metsrv\Release"
AdditionalLibraryDirectories="..\metsrv\Release; ;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
GenerateDebugInformation="false"

2
external/source/meterpreter/workspace/ext_server_espia/ext_server_espia.vcproj vendored
View File

@ -142,7 +142,7 @@
AdditionalDependencies="Netapi32.lib Mpr.lib metsrv.lib"
OutputFile=".\Release/ext_server_espia.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\metsrv\Release"
AdditionalLibraryDirectories="..\metsrv\Release;;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
GenerateDebugInformation="false"

2
external/source/meterpreter/workspace/ext_server_incognito/ext_server_incognito.vcproj vendored
View File

@ -142,7 +142,7 @@
AdditionalDependencies="Netapi32.lib Mpr.lib metsrv.lib"
OutputFile=".\Release/ext_server_incognito.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\metsrv\Release"
AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
GenerateDebugInformation="false"

4
external/source/meterpreter/workspace/ext_server_priv/ext_server_priv.vcproj vendored
View File

@ -81,7 +81,7 @@
OutputFile=".\Release/ext_server_priv.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\metsrv\Release"
AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
ProgramDatabaseFile=".\Release/ext_server_priv.pdb"
@ -149,7 +149,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\extensions\priv\server"
AdditionalIncludeDirectories="..\..\source\extensions\priv\server;..\..\source\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_PRIV_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"

3
external/source/meterpreter/workspace/ext_server_sniffer/ext_server_sniffer.vcproj vendored
View File

@ -41,6 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_INCOGNITO_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -143,7 +144,7 @@
AdditionalDependencies="Netapi32.lib Mpr.lib ws2_32.lib metsrv.lib .\pssdk\pssdk.lib"
OutputFile=".\Release/ext_server_sniffer.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\metsrv\Release;.\pssdk\"
AdditionalLibraryDirectories="..\metsrv\Release;.\pssdk\;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
GenerateDebugInformation="false"

5
external/source/meterpreter/workspace/ext_server_stdapi/ext_server_stdapi.vcproj vendored
View File

@ -4,6 +4,7 @@
Version="9.00"
Name="ext_server_stdapi"
ProjectGUID="{405245AB-0071-4CB9-BFBE-ED4E2A987EFF}"
RootNamespace="ext_server_stdapi"
TargetFrameworkVersion="131072"
>
<Platforms>
@ -48,7 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server"
AdditionalIncludeDirectories="..\..\source\extensions\stdapi\server;..\..\source\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EXT_SERVER_SYS_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -180,7 +181,7 @@
OutputFile=".\Release/ext_server_stdapi.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\metsrv\Release"
AdditionalLibraryDirectories="..\metsrv\Release;..\..\source\openssl\lib\win"
GenerateManifest="false"
DelayLoadDLLs="metsrv.dll"
GenerateMapFile="true"

3
external/source/meterpreter/workspace/metcli/metcli.vcproj vendored
View File

@ -4,6 +4,7 @@
Version="9.00"
Name="metcli"
ProjectGUID="{4DECF649-2B11-47A2-908E-031105D706F8}"
RootNamespace="metcli"
TargetFrameworkVersion="131072"
>
<Platforms>
@ -172,7 +173,7 @@
OutputFile=".\Release/metcli.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\common\Release; ..\..\source\openssl\lib"
AdditionalLibraryDirectories="..\common\Release; ..\..\source\openssl\lib\win"
ModuleDefinitionFile="..\..\source\client\metcli.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/metcli.pdb"

16
external/source/meterpreter/workspace/metsrv/metsrv.vcproj vendored
View File

@ -4,6 +4,7 @@
Version="9.00"
Name="metsrv"
ProjectGUID="{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}"
RootNamespace="metsrv"
TargetFrameworkVersion="131072"
>
<Platforms>
@ -48,6 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\server;..\..\source\openssl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METSRV_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -79,7 +81,7 @@
OutputFile=".\Debug/metsrv.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\common\Debug"
AdditionalLibraryDirectories="..\common\Release; ..\..\source\openssl\lib\win\"
ModuleDefinitionFile="..\..\source\server\win\metsrv.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/metsrv.pdb"
@ -149,7 +151,7 @@
Optimization="1"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="..\..\source\openssl\include"
AdditionalIncludeDirectories="..\..\source\openssl\include;..\..\source\server"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METSRV_EXPORTS;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@ -177,7 +179,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="common.lib ws2_32.lib odbc32.lib odbccp32.lib"
AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
OutputFile=".\Release/metsrv.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -291,6 +293,14 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\source\server\remote_dispatch_common.c"
>
</File>
<File
RelativePath="..\..\source\server\server_setup.c"
>
</File>
</Filter>
<Filter
Name="Headers"