Commit e3ebfb9f authored by Devon Kearns's avatar Devon Kearns

Merge tag 'upstream/1.2-beta1'

Upstream version 1.2-beta1
parents 0c96dbec 18b86ccc
language: c
compiler:
- gcc
script: make sqlite=true unstable=true && make check sqlite=true unstable=true && make clean && make sqlite=true unstable=true gcrypt=true && make check sqlite=true unstable=true gcrypt=true
Version 1.2-beta1 (changes from aircrack-ng 1.1) - Released 25 May 2013:
* Airmon-ng: Added chipset information for ar9170usb, wl, rt2800usb, ar9271, wl12xx, RT3070STA, ath9k_htc, r871x_usb_drv, ath5k, carl9170 and various Intel drivers.
* Airmon-ng: Fixed chipset information ipw2200.
* Airmon-ng: Fixed output for r8187 driver.
* Airmon-ng: Improved chipset information for a few drivers.
* Airmon-ng: Support for displaying information about ath9k.
* Airmon-ng: Added 'check kill' to automatically kill services that could interfere.
* Airmon-ng: Fixed issues with Intel chipsets detection.
* Airmon-ng: Updated iw download link.
* Airmon-ng: Better mac80211 handling
* Airmon-ng: Added detection for WiLink TI driver, rtl819xU, iwlwifi.
* Airmon-zc: Improved version of Airmon-ng with more detailled information.
* Airdecap-ng: Fixed decoding QoS frames (Closes: #667 and #858).
* Airgraph-ng: Use Aircrack-ng Makefile instead of its own.
* Airbase-ng: Fixed bug using clients list.
* Airbase-ng: Fixed issue with QoS (ticket #760).
* Airbase-ng: Fixed sending beacons with null SSID.
* Airbase-ng: Allow non ASCII ESSID
* Airodump-ng: Fixed buffer overflow (ticket #728).
* Airodump-ng: Fixed channel parsing.
* Airodump-ng: Fixed FreeBSD battery reading.
* Airodump-ng: Renamed "Packets" column to "Frames" ("Packets" was not correct).
* Airodump-ng: Fixed XML bugs when outputting NetXML: ESSID containing '&' or chinese characters, when multiple encryption are used.
* Airodump-ng: Add alternative paths for Airodump-ng OUI file.
* Airodump-ng: Added GPSd 2.92+ support (JSON).
* Airodump-ng: Add option --manufacturer to display manufacturer column on airodump-ng.
* Airodump-ng: Add feature to show APs uptime (--uptime) based on the timestamp.
* Airodump-ng-OUI-update: Fixed OUI URL and allow CURL redirect (ticket #829).
* Airdrop-ng: removed .py from file names.
* Airdrop-ng: Fixed bug in installer.
* Airdrop-ng: Fixed OUI lookup.
* Airdrop-ng: Fixed bug when several BSSID have the same ESSID.
* Airdrop-ng: Doesn't constantly parse anymore, wait 5 seconds each time it parses.
* Airdrop-ng: Fixed crash when failing to get channel or when rules file didn't exist.
* Airdrop-ng: Fixed to use lorcon.py/lorcon2 libs.
* Airdrop-ng: Updated README.
* Airdrop-ng: Fixed error preventing update to work.
* Versuck-ng: New script to do the same thing as the kismet autowep plugin from the CLI.
* Aircrack-ng: Fixed counter display error when cracking WPA.
* Aircrack-ng: Added output of the WPA handshake to EWSA project file.
* Aircrack-ng: Added output of the WPA handshake to oclhashcat+ project file.
* Aircrack-ng: Added benchmark option, -S.
* Aircrack-ng: Fixed -u option.
* Aircrack-ng: PIC fix for hardened systems from Francisco Blas Izquierdo Riera (klondike)
* Aircrack-ng: Allow dictionaries larger than 2Gb.
* Aircrack-ng: Give a better message when there's an error with the dictionary.
* Aircrack-ng: Prevent a buffer overflow from happening (Wojciech Waga).
* Aireplay-ng: Added migration mode attack from Leandro Meiners and Diego Sor from Core Security (BlackHat Las Vegas 2010)
* Aireplay-ng, Airodump-ng: Added option to ignore issue with -1 channel.
* Airserv-ng: Fixed crash when clients disconnect.
* Besside-ng-crawler: Added EAPOL Crawler.
* Airdecloak-ng: Fixed bug when using pcap files with PPI headers.
* dcrack: Distributed cracking server/client
* wifi-detect.sh: reference script for testing wifi card detection using iwconfig vs ls /sys/class/net
* WPA Clean: Tool to merge and clean WPA capture files.
* Wireless Panda: C# Library to parse Airodump-ng output files (and added example project).
* OSdep (Linux): Setting fixed bitrates on mac80211 2.6.31 and up.
* OSdep (Linux): Added support for nl80211 thanks to impulse32. Use 'make libnl=true' to add netlink support (Ticket #1004).
* Manpages: Improvement and fixes for Airgraph-ng, Airodump-ng, packetforge-ng, Aircrack-ng
* Manpages: Fixed various spelling issues and single quote issues.
* Makefiles: Added tests for the different tools.
* Makefiles: Various fixes and improvements.
* Makefiles: Added support for libgrypt instead of OpenSSL via parameter.
* Patches: Added a few patches.
* Removed useless script: patchchk.
* Finally fixed licensing issues.
* Fixed endianness issues in most of the tools.
* Fixed cppcheck errors (Ticket #957).
* Fixed various compilation issues on Linux and Cygwin, GNU/Hurd, Darwin (OSX) and Sparc.
* Fixed compilation on recent gcc versions on Linux, Cygwin.
* Added instructions for Travis CI: Free Hosted Continuous Integration Platform for the Open Source Community.
* Added Readme.Md for GitHub. Aircrack-ng subversion repository is synced on GitHub: http://github.com/aircrack-ng/aircrack-ng
* Various other small bug fixes.
Version 1.1 (changes from aircrack-ng 1.0) - Released 24 April 2010:
* airdrop-ng: New tool by TheX1le.
* airodump-ng, aircrack-ng, airdecap-ng, airbase-ng: Fixed buffer overflow in airodump-ng due to forged eapol frame.
......
......@@ -89,12 +89,15 @@ Aircrack-ng
Problem: On windows, it doesn't display a list of adapters like the old 0.X
Solution: It requires you to develop your own DLL.
Aircrack-ng
-----------
Problem: Aircrack-ng can't use dictionnaries/wordlists bigger than 2GB
Solution: Split your files. Cleaning can also help because WPA only use passphrases of 8 to 63 characters.
Cygwin
------
Problem: Aircrack-ng doesn't build on Cygwin64
Solution: None at this time. Build it using 32 bit cygwin.
Problem: Aircrack-ng doesn't build with gcc 4.5
Solution: Use an older version of gcc such as 4.3 for now (will be fixed in stable release).
Sample files
============
......
# Aircrack-ng
Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that can recover
keys once enough data packets have been captured. It implements the standard FMS
attack along with some optimizations like KoreK attacks, as well as the
all-new PTW attack, thus making the attack much faster compared to other WEP
cracking tools.
It can attack WPA1/2 networks with some advanced methods or simply by brute force.
It can also fully use a multiprocessor system to its full power in order
to speed up the cracking process.
[![Build Status](https://api.travis-ci.org/aircrack-ng/aircrack-ng.png)](https://travis-ci.org/aircrack-ng/aircrack-ng)
# Building
## Requirements
* OpenSSL development package or libgcrypt development package
* If you want to use `airolib-ng` and `-r` option in aircrack-ng,
SQLite development package `>= 3.3.17` (3.6.X version or better is recommended):
`libsqlite3-devel`
* On windows, cygwin has to be used and it also requires w32api and gcc-4 package.
* If you want to use Airpcap, the 'developer' directory from the CD is required.
## Compilating
* Compilation:
`make`
* Strip debugging symbols:
`make strip`
* Installing:
`make install`
* Uninstall:
`make uninstall`
### Makefile flags
When compile and installing, the following flags can be used and combined
to compile and install the suite:
* **sqlite**: needed to compile `airolib-ng` and add support for `airolib-ng`
databases in aircrack-ng.
On cygwin: SQLite has to be compiled manually. See next section.
* **airpcap**: needed for supporting airpcap devices on windows (cygwin only)
REQUIREMENT: Copy 'developers' directory from Airpcap CD one
level below this INSTALLING file
Note: Not working yet.
* **unstable**: needed to compile `tkiptun-ng`, `easside-ng` (and `buddy-ng`) and
`wesside-ng`
* **ext_scripts**: needed to build `airoscript-ng`, `versuck-ng`, `airgraph-ng` and
`airdrop-ng`.
Note: Experimental. Each script has its own dependences.
Note: It's only required in install phase.
* **gcrypt**: Use libgcrypt crypto library instead of the default OpenSSL.
And also use internal fast sha1 implementation (borrowed from GIT)
* **libnl**: Add support for netlink (nl80211). Linux only.
- Requires `libnl1` OR `libnl3`.
- Dependencies (debian):
+ LibNL 1: `libnl-dev`
+ LibNL 3: `libnl-3-dev` and `libnl-genl-3-dev`.
#### Examples:
* Compiling with sqlite and enabling unstable:
`make sqlite=true unstable=true`
* Installing:
`make sqlite=true unstable=true install`
* Installing, with external scripts:
`make sqlite=true unstable=true ext_scripts=true`
* Compiling with gcrypt:
`make gcrypt=true`
# Using precompiled binaries
Linux/BSD:
* Use your package manager to download aircrack-ng
* In most cases, they have an old version.
Windows:
* Install the appropriate "monitor" driver for your card (standard drivers doesn't work for capturing data).
* aircrack-ng suite is command line tools. So, you have to open a commandline
`Start menu -> Run... -> cmd.exe` then use them
* Run the executables without any parameters to have help
# Documentation
Documentation, tutorials, ... can be found on http://www.aircrack-ng.org
See also manpages and the forum.
For further information check the [README](README) file
1.1
\ No newline at end of file
1.2-beta1
\ No newline at end of file
......@@ -47,24 +47,24 @@ else ifeq ($(libnl), true)
endif
endif
endif
ifeq ($(NL1FOUND),Y)
NLLIBNAME = libnl-1
endif
ifeq ($(NL3xFOUND),Y)
COMMON_CFLAGS += -DCONFIG_LIBNL30
LIBS += -lnl-genl-3
NLLIBNAME = libnl-3.0
endif
ifeq ($(NL3FOUND),Y)
COMMON_CFLAGS += -DCONFIG_LIBNL30
LIBS += -lnl-genl
NLLIBNAME = libnl-3.0
endif
# nl-3.1 has a broken libnl-gnl-3.1.pc file
# as show by pkg-config --debug --libs --cflags --exact-version=3.1 libnl-genl-3.1;echo $?
ifeq ($(NL31FOUND),Y)
......@@ -72,29 +72,38 @@ else ifeq ($(libnl), true)
LIBS += -lnl-genl
NLLIBNAME = libnl-3.1
endif
ifeq ($(NLLIBNAME),)
$(error Cannot find development files for any supported version of libnl. install either libnl1 or libnl3.)
endif
LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
COMMON_CFLAGS += -DCONFIG_LIBNL $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
endif
ifeq ($(subst TRUE,true,$(filter TRUE true,$(airpcap) $(AIRPCAP))),true)
LIBAIRPCAP = -DHAVE_AIRPCAP -I$(AC_ROOT)/../developers/Airpcap_Devpack/include
endif
ifeq ($(OSNAME), cygwin)
CC = $(TOOL_PREFIX)gcc-4
else
CC = $(TOOL_PREFIX)gcc
ifneq ($(origin CC),environment)
ifeq ($(OSNAME), cygwin)
ARCHITECTURE = $(shell uname -m)
ifeq ($(ARCHITECTURE), i686)
CC = $(TOOL_PREFIX)gcc-4
else
CC = $(TOOL_PREFIX)gcc
endif
else
CC = $(TOOL_PREFIX)gcc
endif
endif
RANLIB = $(TOOL_PREFIX)ranlib
AR = $(TOOL_PREFIX)ar
RANLIB ?= $(TOOL_PREFIX)ranlib
ifneq ($(origin AR),environment)
AR = $(TOOL_PREFIX)ar
endif
REVISION = $(shell $(AC_ROOT)/evalrev)
REVISION = $(shell $(AC_ROOT)/evalrev $(AC_ROOT))
REVFLAGS ?= -D_REVISION=$(REVISION)
OPTFLAGS = -D_FILE_OFFSET_BITS=64
......@@ -112,6 +121,10 @@ libdir = $(prefix)/lib
etcdir = $(prefix)/etc/aircrack-ng
GCC_OVER45 = $(shell expr 45 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
ifeq ($(GCC_OVER45), 0)
GCC_OVER45 = $(shell expr 4.5 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
endif
ifeq ($(GCC_OVER45), 1)
CFLAGS += -Wno-unused-but-set-variable -Wno-array-bounds
CFLAGS += -Wno-unused-but-set-variable -Wno-array-bounds
endif
#!/bin/sh
if [ ! -d ".svn/" ]
DIR=$1
if [ x$DIR = "x" ]
then
DIR="."
fi
if [ ! -d "${DIR}/.svn/" ]
then
echo "0"
exit ;
fi
REVISION="`svnversion 2> /dev/null | sed 's/[^0-9]*//g'`"
REVISION="`svnversion $DIR 2> /dev/null | sed 's/[^0-9]*//g'`"
if [ x$REVISION = "x" ]
then
REVISION="`svn info 2> /dev/null | grep -i revision | sed 's/[^0-9]*//g'`"
REVISION="`svn info $DIR 2> /dev/null | grep -i revision | sed 's/[^0-9]*//g'`"
fi
if [ x$REVISION = "x" ]
then
if [ -f ".svn/entries" ]
if [ -f "${DIR}/.svn/entries" ]
then
REVISION="`cat .svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g'`"
REVISION="`cat ${DIR}/.svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g'`"
fi
fi
......
.TH AIRBASE-NG 8 "April 2010" "Version 1.1"
.TH AIRBASE-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airbase-ng - multi-purpose tool aimed at attacking clients as opposed to the Access Point (AP) itself
......
.TH AIRCRACK-NG 1 "April 2010" "Version 1.1"
.TH AIRCRACK-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
aircrack-ng - a 802.11 WEP / WPA-PSK key cracker
......
.TH AIRDECAP-NG 1 "April 2010" "Version 1.1"
.TH AIRDECAP-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
airdecap-ng - decrypt a WEP/WPA crypted pcap file
......
.TH AIRDECLOAK-NG 1 "April 2010" "Version 1.1"
.TH AIRDECLOAK-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
airuncloak-ng - Removes wep cloaked framed from a pcap file.
......
.TH AIRDRIVER-NG 8 "April 2010" "Version 1.1"
.TH AIRDRIVER-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airdriver-ng - automatically install/uninstall and patch drivers and 802.11 stacks
......
.TH AIREPLAY-NG 8 "April 2010" "Version 1.1"
.TH AIREPLAY-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
aireplay-ng - inject packets into a wireless network to generate traffic
......
.TH AIRMON-NG 8 "April 2010" "Version 1.1"
.TH AIRMON-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airmon-ng - bash script designed to turn wireless cards into monitor mode.
......
.TH AIRMON-ZC 8 "February 2012" "Version 1.1"
.TH AIRMON-ZC 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airmon-zc - bash script designed to turn wireless cards into monitor mode, Zero_Chaos version
......
.TH AIRODUMP-NG-OUI-UPDATE 8 "February 2012" "Version 1.1"
.TH AIRODUMP-NG-OUI-UPDATE 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airodump-ng-oui-updater - IEEE oui list updater for airodump-ng
......
.TH AIRODUMP-NG 8 "April 2010" "Version 1.1"
.TH AIRODUMP-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airodump-ng - a wireless packet capture tool for aircrack-ng
......@@ -56,6 +56,9 @@ Active Scanning Simulation (send probe requests and parse the probe responses).
.I -M, --manufacturer
Display a manufacturer column with the information obtained from the IEEE OUI list. See airodump-ng-oui-update(8)
.TP
.I -U, --uptime
Display APs uptime obtained from its beacon timestamp.
.TP
.I --output-format <formats>
Define the formats to use (separated by a comma). Possible values are: pcap, ivs, csv, gps, kismet, netxml. The default values are: pcap, csv, kismet, kismet-newcore.
\(aqpcap\(aq is for recording a capture in pcap format, \(aqivs\(aq is for ivs format (it is a shortcut for --ivs). \(aqcsv\(aq will create an airodump-ng CSV file, \(aqkismet\(aq will create a kismet csv file and \(aqkismet-newcore\(aq will create the kismet netxml file. \(aqgps\(aq is a shortcut for --gps.
......
.TH AIROLIB-NG 1 "April 2010" "Version 1.1"
.TH AIROLIB-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
airolib-ng - manage and create a WPA/WPA2 pre-computed hashes tables
......
.TH AIRSERV-NG 8 "April 2010" "Version 1.1"
.TH AIRSERV-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airserv-ng - a wireless card server
......
.TH AIRTUN-NG 8 "April 2010" "Version 1.1"
.TH AIRTUN-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
airtun-ng - a virtual tunnel interface creator for aircrack-ng
......
.TH BESSIDE-NG-CRAWLER 1 "February 2012" "Version 1.1"
.TH BESSIDE-NG-CRAWLER 1 "May 2013" "Version 1.2-beta1"
.SH NAME
besside-ng-crawler - filter EAPOL frames from a directory of capture files.
......
.TH BESSIDE-NG 8 "February 2012" "Version 1.1"
.TH BESSIDE-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
besside-ng - crack a WEP or WPA key without user intervention and collaborate with WPA cracking statistics
......
.TH BUDDY-NG 1 "April 2010" "Version 1.1"
.TH BUDDY-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
buddy-ng - a tool to work with easside-ng
......
.TH EASSIDE-NG 8 "April 2010" "Version 1.1"
.TH EASSIDE-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
easside-ng - an auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key
......
.TH IVSTOOLS 1 "April 2010" "Version 1.1"
.TH IVSTOOLS 1 "May 2013" "Version 1.2-beta1"
.SH NAME
ivstools - extract IVs from a pcap file or merges several .ivs files into one
......
.TH KSTATS 1 "April 2010" "Version 1.1"
.TH KSTATS 1 "May 2013" "Version 1.2-beta1"
.SH NAME
kstats - show statistical FMS algorithm votes for an ivs dump and a specified WEP key
......
.TH MAKEIVS-NG 1 "April 2010" "Version 1.1"
.TH MAKEIVS-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
makeivs - generate a dummy IVS dump file with a specific WEP key
......
.TH PACKETFORGE-NG 1 "April 2010" "Version 1.1"
.TH PACKETFORGE-NG 1 "May 2013" "Version 1.2-beta1"
.SH NAME
packetforge-ng - forge packets: ARP, UDP, ICMP or custom packets.
......
.TH TKIPTUN-NG 8 "April 2010" "Version 1.1"
.TH TKIPTUN-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
tkiptun-ng - inject a few frames into a WPA TKIP network with QoS
......
.TH WESSIDE-NG 8 "April 2010" "Version 1.1"
.TH WESSIDE-NG 8 "May 2013" "Version 1.2-beta1"
.SH NAME
wesside-ng - crack a WEP key of an open network without user intervention
......
.TH WPACLEAN 1 "February 2012" "Version 1.1"
.TH WPACLEAN 1 "May 2013" "Version 1.2-beta1"
.SH NAME
wpaclean - clean wpa capture files
......
#! /bin/sh
PATCH=`which patch 2>/dev/null`
FGREP1="^--- "
FGREP2="^+++ "
PREDIR="`pwd`"
if [ x"`echo "$1" | grep "^/"`" = x ]
then
WHOLEPATCH="`pwd`/$1"
else
WHOLEPATCH="$1"
fi
if [ ! -f $WHOLEPATCH ]
then
echo "Patch \"$1\" doesn't exist."
exit
fi
if [ x"$PATCH" = x ]
then
echo "You need to install \"patch\" prior to patching anything."
exit
fi
if [ x"$1" = x ]
then
echo "Usage: \"$0 foo.patch\""
exit
fi
if [ x"`grep "$FGREP1" "$WHOLEPATCH" | awk '{print $2}'`" = x ]
then
echo "No valid patch file, you need to "
fi
fcount1=`grep "$FGREP1" "$WHOLEPATCH" | awk '{print $2}' | wc -l`
fcount2=`grep "$FGREP2" "$WHOLEPATCH" | awk '{print $2}' | wc -l`
if [ $fcount1 -ne $fcount2 ]
then
echo "Different number of Files: add($fcount2) vs. sub($fcount1). Broken file?"
exit
fi
echo "Trying to find correct path and arguments..."
cdr=1
hits=0
maxhits=0
lastfiles=$fcount1
value=0
godown=0
actdown=0
maxcutglobaldirs=`pwd | sed 's/[^\/]//g' | wc -c`
j=0
down=0
while [ $j -lt $maxcutglobaldirs ]
do
fcurnum=`grep "$FGREP1" "$WHOLEPATCH" | awk '{print $2}' | cut -d/ -f$cdr- | grep -v "^$" | wc -l`
if [ $fcurnum -lt $fcount1 ]
then
#too many dirs cut, lost some files
down=1
fi
hits=0
i=1
while [ $i -lt $fcurnum ]
do
filename1=`grep "$FGREP1" "$WHOLEPATCH" | awk '{print $2}' | cut -d/ -f$cdr- | grep -v "^$" | head -n $i | tail -n 1`
filename2=`grep "$FGREP2" "$WHOLEPATCH" | awk '{print $2}' | cut -d/ -f$cdr- | grep -v "^$" | head -n $i | tail -n 1`
if [ -f $PREDIR/$filename1 -o -f $PREDIR/$filename2 ]
then
hits=$(($hits+1))
fi
i=$(($i+1))
done
if [ $hits -gt $maxhits ]
then
maxhits=$hits
value=$(($cdr-1))
actdown=$godown
fi
cdr=$(($cdr+1))
if [ $down -eq 1 ]
then
down=0
if [ $maxhits -eq $fcount1 ]
then
break
fi
godown=$(($godown+1))
PREDIR=`echo $PREDIR | cut -d/ -f1-$(($maxcutglobaldirs-$godown))`
j=$(($j+1))
cdr=0
fi
done
change="cd ./"
i=0
while [ $i -lt $actdown ]
do
change="$change../"
i=$(($i+1))
done
$change
if [ x"`$PATCH -f --dry-run -Np$value -i "$WHOLEPATCH" | grep "ignored\|ERROR"`" != x ]
then
echo "Found problems with applying "$WHOLEPATCH" from this location."
exit
fi
if [ $maxhits -eq 0 ]
then
echo "Found no files at all."
exit
fi
if [ $maxhits -lt $fcount1 ]
then
#echo "I didn't found all files, which should be patched."
#echo "Just got $maxhits hits out of $fcount1 proposed"
if [ $actdown -gt 0 ]
then
echo "You may run:"
echo "\"($change; patch --dry-run -Np$value -i "$WHOLEPATCH")\""
else
echo "You may run:"
echo "\"patch --dry-run -Np$value -i $1\""
fi
echo "and in case you got no errors, just omit \"--dry-run\"."
else
if [ $actdown -gt 0 ]
then
echo "You need to run \"($change; patch -Np$value -i "$WHOLEPATCH")\""
else
echo "You need to run \"patch -Np$value -i $1\""
fi
fi
......@@ -44,7 +44,7 @@ class macOUI_lookup:
self.OUI_PATH = ["/etc/aircrack-ng/airodump-ng-oui.txt",
"/usr/local/etc/aircrack-ng/airodump-ng-oui.txt",
"/usr/share/aircrack-ng/airodump-ng-oui.txt",
"/var/lib/misc/oui.txt",
"/usr/share/misc/oui.txt",
"/etc/manuf/oui.txt",
"/usr/share/wireshark/wireshark/manuf/oui.txt",
"/usr/share/wireshark/manuf/oui.txt"]
......
......@@ -8,7 +8,7 @@ IFACE_FOUND="false"
MADWIFI=0
MAC80211=0
USE_IW=0
IW_SOURCE="http://www.kernel.org//pub/software/network/iw/iw-3.8.tar.bz2"
IW_SOURCE="https://www.kernel.org/pub/software/network/iw/iw-3.10.tar.bz2"
IW_ERROR=""
UDEV_ISSUE=0
......
......@@ -378,7 +378,8 @@ getChipset() {
then
BUSINFO=$(cat /sys/class/net/$1/device/modalias | cut -d ":" -f 2 | cut -b 1-10 | sed 's/^.//;s/p/:/')
CHIPSET=$(lsusb | grep -i "$BUSINFO" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')
elif [ "$BUS" = "pci" ]
#yes the below line looks insane, but broadcom appears to define all the internal buses so we have to detect them here
elif [ "${BUS}" = "pci" ] || [ "${BUS}" = "ssb" ] || [ "${BUS}"= "bcma" ] || [ "${BUS}" = "pcmcia" ]
then
if [ -f /sys/class/net/$1/device/vendor -a -f /sys/class/net/$1/device/device ]
then
......@@ -406,7 +407,6 @@ getChipset() {
CHIPSET=$(lsusb | grep -i "$DEVICEID" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')
else
CHIPSET="non-mac80211 device? (report this!)"
#this seems to somehow trigger on b43's 4318 chip.... but it really shouldn't.
fi
if [ "$DEBUG" = "1" ]
......
......@@ -71,7 +71,7 @@ if [ ${CURL} ] || [ ${WGET} ]; then
fi
# Parse it
grep "(hex)" ${OUI_IEEE} > ${AIRODUMP_NG_OUI}
grep "(hex)" ${OUI_IEEE} | sed 's/^[ \t]*//g;s/[ \t]*$//g' > ${AIRODUMP_NG_OUI}
if [ "${?}" -ne 0 ]; then
echo "[*] Error: Failed to parse OUI, aborting..."
exit 1
......@@ -84,7 +84,7 @@ if [ ${CURL} ] || [ ${WGET} ]; then
else
if [ -f "${OUI}" ]; then
echo "[*] Please install curl or wget to update OUI list"
else
else
echo "[*] Please install curl or wget to install OUI list"
fi
exit 1
......
......@@ -34,6 +34,7 @@ installdirs:
$(mandir)/man1 $(locale) \
$(datadir)/themes $(picdir) $(appdir) \
$(datadir)/plugins \
$(datadir)/extras \
$(datadir)/templates
install-config:
......@@ -53,6 +54,9 @@ install-binary:
@$(INSTALLDATA) $(srcdir)/themes/*.theme $(datadir)/themes
@echo "Installing plugins"
@$(INSTALLDATA) $(srcdir)/plugins/* $(datadir)/plugins
@echo "Installing extras"
@cp -r $(srcdir)/extras/* $(datadir)/extras
@cp -r $(srcdir)/extras/completions/* $(datadir)/extras/completions
install-docs:
@echo "Installing documentation"
......
......@@ -45,8 +45,6 @@ if [ "$UID" != 0 ]; then echo -e "You Must be root to use airoscript"; exit 1; f
}