tyler.durden
/
reaver-wps-fork-t6x
mirror of https://github.com/t6x/reaver-wps-fork-t6x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wash: get rid of the checksum of bssid's cached 

this is no longer needed, as the 3 interesting states (see prev
commit) are now modeled as flags in the seen_list.
This commit is contained in:
feitoi 2022-01-30 21:25:42 -03:00 committed by rofl0r
parent 0cbb0fb38f
commit a2002d7add
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libwps/libwps.c
View File

@ -14,7 +14,6 @@
#include "libwps.h"
#include "../utils/common.h"
#include "../cprintf.h"
#include "../crc.h"
#include <assert.h>
static char* append(char* s1, char *s2) {
@ -235,8 +234,6 @@ static int parse_wps_tags(const u_char *tags, size_t len,
if(wps_ie_data)
{
wps->checksum = crc32(wps_ie_data, wps_data_len);
for(i=0; i<sizeof(elements)/sizeof(elements[0]); i++)
{
/* Search for each WPS element inside the WPS IE data blob */

1
src/libwps/libwps.h
View File

@ -35,7 +35,6 @@ struct libwps_data
uint8_t version;
uint8_t state;
uint8_t locked;
uint32_t checksum;
char manufacturer[LIBWPS_MAX_STR_LEN];
char model_name[LIBWPS_MAX_STR_LEN];
char model_number[LIBWPS_MAX_STR_LEN];

13
src/wpsmon.c
View File

@ -52,7 +52,6 @@ static struct mac {
unsigned char vendor_oui[1+3];
unsigned char probes;
unsigned char flags;
uint32_t checksum;
} seen_list[MAX_APS];
enum seen_flags {
SEEN_FLAG_PRINTED = 1,
@ -112,18 +111,10 @@ static void mark_ap_complete(char *bssid) {
int x = list_insert(bssid);
if(x >= 0 && x < MAX_APS) seen_list[x].flags |= SEEN_FLAG_COMPLETE;
}
static int is_done(char *bssid, struct libwps_data *wps, int is_probe_resp) {
static int is_done(char *bssid, struct libwps_data *wps) {
int x = list_insert(bssid);
if(x >= 0 && x < MAX_APS) {
if(wps) {
if(seen_list[x].checksum == 0)
seen_list[x].checksum = wps->checksum;
if(wps->checksum != seen_list[x].checksum) {
seen_list[x].checksum = wps->checksum;
if (is_probe_resp) {
seen_list[x].flags &= ~SEEN_FLAG_COMPLETE;
}
}
set_flag_wps(x, is_pbc(wps), SEEN_FLAG_PBC);
set_flag_wps(x, wps->locked == WPSLOCKED, SEEN_FLAG_LOCKED);
set_flag_wps(x, 1, SEEN_FLAG_WPS_ACTIVE);
@ -487,7 +478,7 @@ void parse_wps_settings(const u_char *packet, struct pcap_pkthdr *header, char *
wps_parsed = parse_wps_parameters(packet, header->len, wps);
if(is_beacon || !get_ap_vendor(bssid)) set_ap_vendor(bssid);
}
if((get_channel() == channel || source == PCAP_FILE) && !is_done(bssid, wps_parsed ? wps : 0, is_probe_resp))
if((get_channel() == channel || source == PCAP_FILE) && !is_done(bssid, wps_parsed ? wps : 0))
{
if(is_beacon &&
mode == SCAN &&