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

Add OS X support 

diff
source:https://docs.google.com/file/d/0B3tHnfnS08GyVUNSNFl5bHdEN1k/edit
This commit is contained in:
alex-chan 2015-07-03 01:20:42 +08:00
parent 6012c9800d
commit 7c6c67b445
7 changed files with 180 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/80211.c
View File

@ -39,8 +39,20 @@ const u_char *next_packet(struct pcap_pkthdr *header)
const u_char *packet = NULL;
/* Loop until we get a valid packet, or until we run out of packets */
#ifdef __APPLE__
struct pcap_pkthdr *pkt_header = NULL;
int status = 1;
while ((status = pcap_next_ex(get_handle(), &pkt_header, &packet)) == 1 || status == 0) // status == 0 indicates timeout
#else
while((packet = pcap_next(get_handle(), header)) != NULL)
#endif
{
#ifdef __APPLE__
if (status == 0) continue;
memcpy(header, pkt_header, sizeof(*header));
#endif
if(get_validate_fcs())
{
if(check_fcs(packet, header->len))
@ -49,7 +61,9 @@ const u_char *next_packet(struct pcap_pkthdr *header)
}
else
{
#ifndef __APPLE__
cprintf(INFO, "[!] Found packet with bad FCS, skipping...\n");
#endif
}
}
else
@ -609,6 +623,70 @@ int check_fcs(const u_char *packet, size_t len)
if(has_rt_header())
{
rt_header = (struct radio_tap_header *) packet;
#ifdef __APPLE__
unsigned char *body = (unsigned char*) (rt_header+1);
uint32_t present = rt_header->flags;
uint8_t rflags = 0;
int i;
for (i = IEEE80211_RADIOTAP_TSFT; i <= IEEE80211_RADIOTAP_EXT; i++) {
if (!(present & (1 << i))) continue;
switch (i) {
case IEEE80211_RADIOTAP_TSFT:
body += sizeof(uint64_t);
break;
case IEEE80211_RADIOTAP_FLAGS:
rflags = *((uint8_t*)body);
/* fall through */
case IEEE80211_RADIOTAP_RATE:
body += sizeof(uint8_t);
break;
case IEEE80211_RADIOTAP_CHANNEL:
body += sizeof(uint16_t)*2;
break;
case IEEE80211_RADIOTAP_RX_FLAGS:
case IEEE80211_RADIOTAP_FHSS:
body += sizeof(uint16_t);
break;
case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
case IEEE80211_RADIOTAP_DBM_ANTNOISE:
case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
case IEEE80211_RADIOTAP_DB_ANTNOISE:
case IEEE80211_RADIOTAP_ANTENNA:
body++;
break;
case 18: // IEEE80211_RADIOTAP_XCHANNEL
body += sizeof(uint32_t);
body += sizeof(uint16_t);
body += sizeof(uint8_t);
body += sizeof(uint8_t);
break;
case 19: // IEEE80211_RADIOTAP_MCS
body += 3*sizeof(uint8_t);
break;
default:
i = IEEE80211_RADIOTAP_EXT+1;
break;
}
}
#define IEEE80211_RADIOTAP_F_BADFCS 0x40
if (rflags & IEEE80211_RADIOTAP_F_BADFCS) {
// bad FCS, ignore
return 0;
}
if (!(rflags & IEEE80211_RADIOTAP_F_FCS)) {
// fcs not always present
return 1;
}
#endif
offset += rt_header->len;
}

4
src/80211.h
View File

@ -43,6 +43,10 @@
#include "crc.h"
#include "wps.h"
#ifdef __APPLE__
#include "utils/radiotap.h"
#endif
#define AUTH_OK 1
#define ASSOCIATE_OK 2

12
src/Makefile.in
View File

@ -5,14 +5,22 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
CONFDIR=@sysconfdir@/@target@
CFLAGS=-DCONF_DIR='"$(CONFDIR)"' -DREAVER_DATABASE='"$(CONFDIR)/reaver.db"' @CFLAGS@
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
LDFLAGS=$(LIBWPS_DIR)/*.o wps/*.o tls/bignum.o tls/libtls.a utils/libutils.a crypto/libcrypto.a lwe/libiw.a @LDFLAGS@
LIBIWNAME=libiw
endif
ifeq ($(UNAME), Darwin)
LIBIWNAME=
LDFLAGS=$(LIBWPS_DIR)/*.o wps/*.o tls/bignum.o tls/libtls.a utils/libutils.a crypto/libcrypto.a @LDFLAGS@
endif
all: wash reaver
wash: wps libiw libwps.o argsparser.o globule.o init.o misc.o 80211.o iface.o
wash: wps $(LIBIWNAME) libwps.o argsparser.o globule.o init.o misc.o 80211.o iface.o
$(CC) $(CFLAGS) $(INC) wpsmon.c *.o $(LDFLAGS) -o wash
reaver: wps libiw libwps.o argsparser.o globule.o init.o sigint.o sigalrm.o misc.o cracker.o
reaver: wps $(LIBIWNAME) libwps.o argsparser.o globule.o init.o sigint.o sigalrm.o misc.o cracker.o
$(CC) $(CFLAGS) $(INC) wpscrack.c *.o $(LDFLAGS) -o reaver
libwps.o:

43
src/iface.c
View File

@ -34,6 +34,28 @@
#include "iface.h"
/* Populates globule->mac with the MAC address of the interface globule->iface */
#ifdef __APPLE__
int read_iface_mac() {
struct ifaddrs* iflist;
int found = 0;
if (getifaddrs(&iflist) == 0) {
struct ifaddrs* cur;
for (cur = iflist; cur; cur = cur->ifa_next) {
if ((cur->ifa_addr->sa_family == AF_LINK) &&
(strcmp(cur->ifa_name, get_iface()) == 0) &&
cur->ifa_addr) {
struct sockaddr_dl* sdl = (struct sockaddr_dl*)cur->ifa_addr;
set_mac(LLADDR(sdl));
found = 1;
break;
}
}
freeifaddrs(iflist);
}
return found;
}
#else
int read_iface_mac()
{
struct ifreq ifr;
@ -68,7 +90,7 @@ int read_iface_mac()
return ret_val;
}
#endif
/*
* Goes to the next 802.11 channel.
* This is mostly required for APs that hop channels, which usually hop between channels 1, 6, and 11.
@ -112,6 +134,24 @@ int next_channel()
}
/* Sets the 802.11 channel for the selected interface */
#ifdef __APPLE__
int change_channel(int channel)
{
cprintf(VERBOSE, "[+] Switching %s to channel %d\n", get_iface(), channel);
// Unfortunately, there is no API to change the channel
pid_t pid = fork();
if (!pid) {
char chan_arg[32];
sprintf(chan_arg, "-c%d", channel);
char* argv[] = {"/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport", chan_arg, NULL};
execve("/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport", argv, NULL);
}
int status;
waitpid(pid,&status,0);
set_channel(channel);
return 0;
}
#else
int change_channel(int channel)
{
int skfd = 0, ret_val = 0;
@ -146,3 +186,4 @@ int change_channel(int channel)
return ret_val;
}
#endif

9
src/iface.h
View File

@ -35,9 +35,18 @@
#define IFACE_H
#include <sys/ioctl.h>
#ifdef __APPLE__
#include <sys/socket.h>
#include <net/ethernet.h>
#include <ifaddrs.h>
#include <net/if_dl.h>
#endif
#include <net/if.h>
#include <netinet/in.h>
#ifndef __APPLE__
#include "lwe/iwlib.h"
#endif
#include "defs.h"
#include "globule.h"

25
src/init.c
View File

@ -121,7 +121,30 @@ pcap_t *capture_init(char *capture_source)
pcap_t *handle = NULL;
char errbuf[PCAP_ERRBUF_SIZE] = { 0 };
handle = pcap_open_live(capture_source, BUFSIZ, 1, 0, errbuf);
#ifdef __APPLE__
// must disassociate from any current AP. This is the only way.
pid_t pid = fork();
if (!pid) {
char* argv[] = {"/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport", "-z", NULL};
execve("/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport", argv, NULL);
}
int status;
waitpid(pid,&status,0);
handle = pcap_create(capture_source,errbuf);
if (handle) {
pcap_set_snaplen(handle, BUFSIZ);
pcap_set_timeout(handle, 50);
pcap_set_rfmon(handle, 1);
pcap_set_promisc(handle, 1);
int status = pcap_activate(handle);
if (status)
cprintf(CRITICAL, "pcap_activate status %d\n", status);
}
#else
handle = pcap_open_live(capture_source, BUFSIZ, 1, 0, errbuf);
#endif
if(!handle)
{
handle = pcap_open_offline(capture_source, errbuf);

15
src/wpsmon.c
View File

@ -66,7 +66,11 @@ int main(int argc, char *argv[])
globule_init();
sql_init();
// sql_init();
if (!sql_init()) {
fprintf(stderr, "[X] ERROR: sql_init failed\n");
goto end;
}
create_ap_table();
set_auto_channel_select(0);
set_wifi_band(BG_BAND);
@ -295,7 +299,9 @@ void monitor(char *bssid, int passive, int source, int channel, int mode)
while((packet = next_packet(&header)))
{
parse_wps_settings(packet, &header, bssid, passive, mode, source);
#ifndef __APPLE__
memset((void *) packet, 0, header.len);
#endif
}
return;
@ -368,7 +374,12 @@ void parse_wps_settings(const u_char *packet, struct pcap_pkthdr *header, char *
if(frame_header->fc.sub_type == SUBTYPE_BEACON &&
mode == SCAN &&
!passive &&
should_probe(bssid))
// should_probe(bssid))
should_probe(bssid)
#ifdef __APPLE__
&& 0
#endif
)
{
send_probe_request(get_bssid(), get_ssid());
probe_sent = 1;