mirror of
https://github.com/rapid7/metasploit-payloads
synced 2025-01-14 17:37:27 +01:00
Merge branch 'rapid7:master' into python-process
This commit is contained in:
commit
39bd2b2581
@ -1,6 +1,6 @@
|
||||
# -*- coding:binary -*-
|
||||
module MetasploitPayloads
|
||||
VERSION = '2.0.112'
|
||||
VERSION = '2.0.113'
|
||||
|
||||
def self.version
|
||||
VERSION
|
||||
|
@ -1872,7 +1872,7 @@ def stdapi_net_config_get_arp_table(request, response):
|
||||
result = GetIpNetTable(ipnet_table, size, False)
|
||||
|
||||
if result == ERROR_INSUFFICIENT_BUFFER:
|
||||
ipnet_table = ctypes.cast(ctypes.create_string_buffer(b'', size.value), ctypes.c_void_p)
|
||||
ipnet_table = ctypes.cast(ctypes.create_string_buffer(bytes(), size.value), ctypes.c_void_p)
|
||||
|
||||
elif result != ERROR_SUCCESS and result != ERROR_NO_DATA:
|
||||
return error_result_windows(result), response
|
||||
|
@ -361,18 +361,19 @@ if DEBUGGING:
|
||||
file_handler.setLevel(logging.DEBUG)
|
||||
logging.getLogger().addHandler(file_handler)
|
||||
|
||||
class SYSTEM_INFO(ctypes.Structure):
|
||||
_fields_ = [("wProcessorArchitecture", ctypes.c_uint16),
|
||||
("wReserved", ctypes.c_uint16),
|
||||
("dwPageSize", ctypes.c_uint32),
|
||||
("lpMinimumApplicationAddress", ctypes.c_void_p),
|
||||
("lpMaximumApplicationAddress", ctypes.c_void_p),
|
||||
("dwActiveProcessorMask", ctypes.c_uint32),
|
||||
("dwNumberOfProcessors", ctypes.c_uint32),
|
||||
("dwProcessorType", ctypes.c_uint32),
|
||||
("dwAllocationGranularity", ctypes.c_uint32),
|
||||
("wProcessorLevel", ctypes.c_uint16),
|
||||
("wProcessorRevision", ctypes.c_uint16)]
|
||||
if has_windll:
|
||||
class SYSTEM_INFO(ctypes.Structure):
|
||||
_fields_ = [("wProcessorArchitecture", ctypes.c_uint16),
|
||||
("wReserved", ctypes.c_uint16),
|
||||
("dwPageSize", ctypes.c_uint32),
|
||||
("lpMinimumApplicationAddress", ctypes.c_void_p),
|
||||
("lpMaximumApplicationAddress", ctypes.c_void_p),
|
||||
("dwActiveProcessorMask", ctypes.c_uint32),
|
||||
("dwNumberOfProcessors", ctypes.c_uint32),
|
||||
("dwProcessorType", ctypes.c_uint32),
|
||||
("dwAllocationGranularity", ctypes.c_uint32),
|
||||
("wProcessorLevel", ctypes.c_uint16),
|
||||
("wProcessorRevision", ctypes.c_uint16)]
|
||||
|
||||
def rand_bytes(n):
|
||||
return os.urandom(n)
|
||||
|
Loading…
Reference in New Issue
Block a user